Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/77520/?format=api
{ "id": 77520, "url": "http://patches.dpdk.org/api/patches/77520/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1599855987-25976-15-git-send-email-timothy.mcdaniel@intel.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1599855987-25976-15-git-send-email-timothy.mcdaniel@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1599855987-25976-15-git-send-email-timothy.mcdaniel@intel.com", "date": "2020-09-11T20:26:19", "name": "[14/22] event/dlb2: add eventdev start", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "34f94a0f364d9b70d04d028775fb316acc6f7255", "submitter": { "id": 826, "url": "http://patches.dpdk.org/api/people/826/?format=api", "name": "Timothy McDaniel", "email": "timothy.mcdaniel@intel.com" }, "delegate": { "id": 310, "url": "http://patches.dpdk.org/api/users/310/?format=api", "username": "jerin", "first_name": "Jerin", "last_name": "Jacob", "email": "jerinj@marvell.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1599855987-25976-15-git-send-email-timothy.mcdaniel@intel.com/mbox/", "series": [ { "id": 12164, "url": "http://patches.dpdk.org/api/series/12164/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=12164", "date": "2020-09-11T20:26:05", "name": "Add DLB2 PMD", "version": 1, "mbox": "http://patches.dpdk.org/series/12164/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/77520/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/77520/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 5B489A04C1;\n\tFri, 11 Sep 2020 22:32:37 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 947B21C21C;\n\tFri, 11 Sep 2020 22:30:36 +0200 (CEST)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n by dpdk.org (Postfix) with ESMTP id 646361C1A0\n for <dev@dpdk.org>; Fri, 11 Sep 2020 22:30:04 +0200 (CEST)", "from orsmga005.jf.intel.com ([10.7.209.41])\n by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 11 Sep 2020 13:30:04 -0700", "from txasoft-yocto.an.intel.com ([10.123.72.192])\n by orsmga005.jf.intel.com with ESMTP; 11 Sep 2020 13:30:03 -0700" ], "IronPort-SDR": [ "\n DS6LouLbB1eEn+kqGGbssNW+bLpPUwPHVfrz5IRA5Nw2E9pdcJHS7NvP6+xbX1dEhwXLorRsjP\n jkVsHJHhLuAg==", "\n f+IuKmbT9rSOC5g5OLDwkfN1ICkotvPM1uOJOkSskMf7+IF9+r9AawtnnAuaH2d1en1BjQEnPw\n 4i92p/3KtmtQ==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6000,8403,9741\"; a=\"156244381\"", "E=Sophos;i=\"5.76,417,1592895600\"; d=\"scan'208\";a=\"156244381\"", "E=Sophos;i=\"5.76,417,1592895600\"; d=\"scan'208\";a=\"481453627\"" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "From": "Timothy McDaniel <timothy.mcdaniel@intel.com>", "To": "", "Cc": "dev@dpdk.org, erik.g.carrillo@intel.com, gage.eads@intel.com,\n harry.van.haaren@intel.com, jerinj@marvell.com", "Date": "Fri, 11 Sep 2020 15:26:19 -0500", "Message-Id": "<1599855987-25976-15-git-send-email-timothy.mcdaniel@intel.com>", "X-Mailer": "git-send-email 1.7.10", "In-Reply-To": "<1599855987-25976-1-git-send-email-timothy.mcdaniel@intel.com>", "References": "<1599855987-25976-1-git-send-email-timothy.mcdaniel@intel.com>", "Subject": "[dpdk-dev] [PATCH 14/22] event/dlb2: add eventdev start", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Add support for the eventdev start entry point.\n\nSigned-off-by: Timothy McDaniel <timothy.mcdaniel@intel.com>\n---\n drivers/event/dlb2/dlb2.c | 133 +++++++++++++++++++++++++++++\n drivers/event/dlb2/dlb2_iface.c | 3 +\n drivers/event/dlb2/dlb2_iface.h | 3 +\n drivers/event/dlb2/pf/base/dlb2_resource.c | 123 ++++++++++++++++++++++++++\n drivers/event/dlb2/pf/dlb2_main.c | 10 +++\n drivers/event/dlb2/pf/dlb2_pf.c | 25 ++++++\n 6 files changed, 297 insertions(+)", "diff": "diff --git a/drivers/event/dlb2/dlb2.c b/drivers/event/dlb2/dlb2.c\nindex 7ac47d9..ef23def 100644\n--- a/drivers/event/dlb2/dlb2.c\n+++ b/drivers/event/dlb2/dlb2.c\n@@ -2033,6 +2033,138 @@ dlb2_eventdev_port_unlinks_in_progress(struct rte_eventdev *dev,\n \treturn cfg.response.id;\n }\n \n+static int\n+dlb2_eventdev_reapply_configuration(struct rte_eventdev *dev)\n+{\n+\tstruct dlb2_eventdev *dlb2 = dlb2_pmd_priv(dev);\n+\tint ret, i;\n+\n+\t/* If an event queue or port was previously configured, but hasn't been\n+\t * reconfigured, reapply its original configuration.\n+\t */\n+\tfor (i = 0; i < dlb2->num_queues; i++) {\n+\t\tstruct dlb2_eventdev_queue *ev_queue;\n+\n+\t\tev_queue = &dlb2->ev_queues[i];\n+\n+\t\tif (ev_queue->qm_queue.config_state != DLB2_PREV_CONFIGURED)\n+\t\t\tcontinue;\n+\n+\t\tret = dlb2_eventdev_queue_setup(dev, i, &ev_queue->conf);\n+\t\tif (ret < 0) {\n+\t\t\tDLB2_LOG_ERR(\"dlb2: failed to reconfigure queue %d\", i);\n+\t\t\treturn ret;\n+\t\t}\n+\t}\n+\n+\tfor (i = 0; i < dlb2->num_ports; i++) {\n+\t\tstruct dlb2_eventdev_port *ev_port = &dlb2->ev_ports[i];\n+\n+\t\tif (ev_port->qm_port.config_state != DLB2_PREV_CONFIGURED)\n+\t\t\tcontinue;\n+\n+\t\tret = dlb2_eventdev_port_setup(dev, i, &ev_port->conf);\n+\t\tif (ret < 0) {\n+\t\t\tDLB2_LOG_ERR(\"dlb2: failed to reconfigure ev_port %d\",\n+\t\t\t\t i);\n+\t\t\treturn ret;\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+dlb2_eventdev_apply_port_links(struct rte_eventdev *dev)\n+{\n+\tstruct dlb2_eventdev *dlb2 = dlb2_pmd_priv(dev);\n+\tint i;\n+\n+\t/* Perform requested port->queue links */\n+\tfor (i = 0; i < dlb2->num_ports; i++) {\n+\t\tstruct dlb2_eventdev_port *ev_port = &dlb2->ev_ports[i];\n+\t\tint j;\n+\n+\t\tfor (j = 0; j < DLB2_MAX_NUM_QIDS_PER_LDB_CQ; j++) {\n+\t\t\tstruct dlb2_eventdev_queue *ev_queue;\n+\t\t\tuint8_t prio, queue_id;\n+\n+\t\t\tif (!ev_port->link[j].valid)\n+\t\t\t\tcontinue;\n+\n+\t\t\tprio = ev_port->link[j].priority;\n+\t\t\tqueue_id = ev_port->link[j].queue_id;\n+\n+\t\t\tif (dlb2_validate_port_link(ev_port, queue_id, true, j))\n+\t\t\t\treturn -EINVAL;\n+\n+\t\t\tev_queue = &dlb2->ev_queues[queue_id];\n+\n+\t\t\tif (dlb2_do_port_link(dev, ev_queue, ev_port, prio))\n+\t\t\t\treturn -EINVAL;\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+dlb2_eventdev_start(struct rte_eventdev *dev)\n+{\n+\tstruct dlb2_eventdev *dlb2 = dlb2_pmd_priv(dev);\n+\tstruct dlb2_hw_dev *handle = &dlb2->qm_instance;\n+\tstruct dlb2_start_domain_args cfg;\n+\tint ret, i;\n+\n+\trte_spinlock_lock(&dlb2->qm_instance.resource_lock);\n+\tif (dlb2->run_state != DLB2_RUN_STATE_STOPPED) {\n+\t\tDLB2_LOG_ERR(\"bad state %d for dev_start\\n\",\n+\t\t\t (int)dlb2->run_state);\n+\t\trte_spinlock_unlock(&dlb2->qm_instance.resource_lock);\n+\t\treturn -EINVAL;\n+\t}\n+\tdlb2->run_state\t= DLB2_RUN_STATE_STARTING;\n+\trte_spinlock_unlock(&dlb2->qm_instance.resource_lock);\n+\n+\t/* If the device was configured more than once, some event ports and/or\n+\t * queues may need to be reconfigured.\n+\t */\n+\tret = dlb2_eventdev_reapply_configuration(dev);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\t/* The DLB PMD delays port links until the device is started. */\n+\tret = dlb2_eventdev_apply_port_links(dev);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tfor (i = 0; i < dlb2->num_ports; i++) {\n+\t\tif (!dlb2->ev_ports[i].setup_done) {\n+\t\t\tDLB2_LOG_ERR(\"dlb2: port %d not setup\", i);\n+\t\t\treturn -ESTALE;\n+\t\t}\n+\t}\n+\n+\tfor (i = 0; i < dlb2->num_queues; i++) {\n+\t\tif (dlb2->ev_queues[i].num_links == 0) {\n+\t\t\tDLB2_LOG_ERR(\"dlb2: queue %d is not linked\", i);\n+\t\t\treturn -ENOLINK;\n+\t\t}\n+\t}\n+\n+\tret = dlb2_iface_sched_domain_start(handle, &cfg);\n+\tif (ret < 0) {\n+\t\tDLB2_LOG_ERR(\"dlb2: sched_domain_start ret=%d (driver status: %s)\\n\",\n+\t\t\t ret, dlb2_error_strings[cfg.response.status]);\n+\t\treturn ret;\n+\t}\n+\n+\tdlb2->run_state = DLB2_RUN_STATE_STARTED;\n+\tDLB2_LOG_DBG(\"dlb2: sched_domain_start completed OK\\n\");\n+\n+\treturn 0;\n+}\n+\n static void\n dlb2_entry_points_init(struct rte_eventdev *dev)\n {\n@@ -2040,6 +2172,7 @@ dlb2_entry_points_init(struct rte_eventdev *dev)\n \tstatic struct rte_eventdev_ops dlb2_eventdev_entry_ops = {\n \t\t.dev_infos_get = dlb2_eventdev_info_get,\n \t\t.dev_configure = dlb2_eventdev_configure,\n+\t\t.dev_start = dlb2_eventdev_start,\n \t\t.queue_def_conf = dlb2_eventdev_queue_default_conf_get,\n \t\t.queue_setup = dlb2_eventdev_queue_setup,\n \t\t.port_def_conf = dlb2_eventdev_port_default_conf_get,\ndiff --git a/drivers/event/dlb2/dlb2_iface.c b/drivers/event/dlb2/dlb2_iface.c\nindex 8034165..8228bb3 100644\n--- a/drivers/event/dlb2/dlb2_iface.c\n+++ b/drivers/event/dlb2/dlb2_iface.c\n@@ -77,3 +77,6 @@ int (*dlb2_iface_unmap_qid)(struct dlb2_hw_dev *handle,\n \n int (*dlb2_iface_pending_port_unmaps)(struct dlb2_hw_dev *handle,\n \t\t\t\tstruct dlb2_pending_port_unmaps_args *args);\n+\n+int (*dlb2_iface_sched_domain_start)(struct dlb2_hw_dev *handle,\n+\t\t\t\t struct dlb2_start_domain_args *cfg);\ndiff --git a/drivers/event/dlb2/dlb2_iface.h b/drivers/event/dlb2/dlb2_iface.h\nindex 182a5bf..d5bb6be 100644\n--- a/drivers/event/dlb2/dlb2_iface.h\n+++ b/drivers/event/dlb2/dlb2_iface.h\n@@ -63,4 +63,7 @@ extern int (*dlb2_iface_unmap_qid)(struct dlb2_hw_dev *handle,\n extern int (*dlb2_iface_pending_port_unmaps)(struct dlb2_hw_dev *handle,\n \t\t\t\tstruct dlb2_pending_port_unmaps_args *args);\n \n+extern int (*dlb2_iface_sched_domain_start)(struct dlb2_hw_dev *handle,\n+\t\t\t\tstruct dlb2_start_domain_args *cfg);\n+\n #endif /* _DLB2_IFACE_H_ */\ndiff --git a/drivers/event/dlb2/pf/base/dlb2_resource.c b/drivers/event/dlb2/pf/base/dlb2_resource.c\nindex a5b2be1..4c4c0b4 100644\n--- a/drivers/event/dlb2/pf/base/dlb2_resource.c\n+++ b/drivers/event/dlb2/pf/base/dlb2_resource.c\n@@ -5807,3 +5807,126 @@ int dlb2_hw_pending_port_unmaps(struct dlb2_hw *hw,\n \n \treturn 0;\n }\n+\n+static int dlb2_verify_start_domain_args(struct dlb2_hw *hw,\n+\t\t\t\t\t u32 domain_id,\n+\t\t\t\t\t struct dlb2_cmd_response *resp,\n+\t\t\t\t\t bool vdev_req,\n+\t\t\t\t\t unsigned int vdev_id)\n+{\n+\tstruct dlb2_hw_domain *domain;\n+\n+\tdomain = dlb2_get_domain_from_id(hw, domain_id, vdev_req, vdev_id);\n+\n+\tif (!domain) {\n+\t\tresp->status = DLB2_ST_INVALID_DOMAIN_ID;\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tif (!domain->configured) {\n+\t\tresp->status = DLB2_ST_DOMAIN_NOT_CONFIGURED;\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tif (domain->started) {\n+\t\tresp->status = DLB2_ST_DOMAIN_STARTED;\n+\t\treturn -EINVAL;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static void dlb2_log_start_domain(struct dlb2_hw *hw,\n+\t\t\t\t u32 domain_id,\n+\t\t\t\t bool vdev_req,\n+\t\t\t\t unsigned int vdev_id)\n+{\n+\tDLB2_HW_DBG(hw, \"DLB2 start domain arguments:\\n\");\n+\tif (vdev_req)\n+\t\tDLB2_HW_DBG(hw, \"(Request from vdev %d)\\n\", vdev_id);\n+\tDLB2_HW_DBG(hw, \"\\tDomain ID: %d\\n\", domain_id);\n+}\n+\n+/**\n+ * dlb2_hw_start_domain() - Lock the domain configuration\n+ * @hw:\tContains the current state of the DLB2 hardware.\n+ * @domain_id: Domain ID\n+ * @arg: User-provided arguments (unused, here for ioctl callback template).\n+ * @resp: Response to user.\n+ * @vdev_req: Request came from a virtual device.\n+ * @vdev_id: If vdev_req is true, this contains the virtual device's ID.\n+ *\n+ * Return: returns < 0 on error, 0 otherwise. If the driver is unable to\n+ * satisfy a request, resp->status will be set accordingly.\n+ */\n+int\n+dlb2_hw_start_domain(struct dlb2_hw *hw,\n+\t\t u32 domain_id,\n+\t\t __attribute((unused)) struct dlb2_start_domain_args *arg,\n+\t\t struct dlb2_cmd_response *resp,\n+\t\t bool vdev_req,\n+\t\t unsigned int vdev_id)\n+{\n+\tstruct dlb2_list_entry *iter;\n+\tstruct dlb2_dir_pq_pair *dir_queue;\n+\tstruct dlb2_ldb_queue *ldb_queue;\n+\tstruct dlb2_hw_domain *domain;\n+\tint ret;\n+\tRTE_SET_USED(arg);\n+\tRTE_SET_USED(iter);\n+\n+\tdlb2_log_start_domain(hw, domain_id, vdev_req, vdev_id);\n+\n+\tret = dlb2_verify_start_domain_args(hw,\n+\t\t\t\t\t domain_id,\n+\t\t\t\t\t resp,\n+\t\t\t\t\t vdev_req,\n+\t\t\t\t\t vdev_id);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tdomain = dlb2_get_domain_from_id(hw, domain_id, vdev_req, vdev_id);\n+\tif (!domain) {\n+\t\tDLB2_HW_ERR(hw,\n+\t\t\t \"[%s():%d] Internal error: domain not found\\n\",\n+\t\t\t __func__, __LINE__);\n+\t\treturn -EFAULT;\n+\t}\n+\n+\t/*\n+\t * Enable load-balanced and directed queue write permissions for the\n+\t * queues this domain owns. Without this, the DLB2 will drop all\n+\t * incoming traffic to those queues.\n+\t */\n+\tDLB2_DOM_LIST_FOR(domain->used_ldb_queues, ldb_queue, iter) {\n+\t\tunion dlb2_sys_ldb_vasqid_v r0 = { {0} };\n+\t\tunsigned int offs;\n+\n+\t\tr0.field.vasqid_v = 1;\n+\n+\t\toffs = domain->id.phys_id * DLB2_MAX_NUM_LDB_QUEUES +\n+\t\t\tldb_queue->id.phys_id;\n+\n+\t\tDLB2_CSR_WR(hw, DLB2_SYS_LDB_VASQID_V(offs), r0.val);\n+\t}\n+\n+\tDLB2_DOM_LIST_FOR(domain->used_dir_pq_pairs, dir_queue, iter) {\n+\t\tunion dlb2_sys_dir_vasqid_v r0 = { {0} };\n+\t\tunsigned int offs;\n+\n+\t\tr0.field.vasqid_v = 1;\n+\n+\t\toffs = domain->id.phys_id * DLB2_MAX_NUM_DIR_PORTS +\n+\t\t\tdir_queue->id.phys_id;\n+\n+\t\tDLB2_CSR_WR(hw, DLB2_SYS_DIR_VASQID_V(offs), r0.val);\n+\t}\n+\n+\tdlb2_flush_csr(hw);\n+\n+\tdomain->started = true;\n+\n+\tresp->status = 0;\n+\n+\treturn 0;\n+}\ndiff --git a/drivers/event/dlb2/pf/dlb2_main.c b/drivers/event/dlb2/pf/dlb2_main.c\nindex efa7c1c..ba1c95c 100644\n--- a/drivers/event/dlb2/pf/dlb2_main.c\n+++ b/drivers/event/dlb2/pf/dlb2_main.c\n@@ -680,3 +680,13 @@ dlb2_pf_create_dir_queue(struct dlb2_hw *hw,\n \treturn dlb2_hw_create_dir_queue(hw, id, args, resp, NOT_VF_REQ,\n \t\t\t\t\tPF_ID_ZERO);\n }\n+\n+int\n+dlb2_pf_start_domain(struct dlb2_hw *hw,\n+\t\t u32 id,\n+\t\t struct dlb2_start_domain_args *args,\n+\t\t struct dlb2_cmd_response *resp)\n+{\n+\treturn dlb2_hw_start_domain(hw, id, args, resp, NOT_VF_REQ,\n+\t\t\t\t PF_ID_ZERO);\n+}\ndiff --git a/drivers/event/dlb2/pf/dlb2_pf.c b/drivers/event/dlb2/pf/dlb2_pf.c\nindex a3ee198..084ba64 100644\n--- a/drivers/event/dlb2/pf/dlb2_pf.c\n+++ b/drivers/event/dlb2/pf/dlb2_pf.c\n@@ -508,6 +508,30 @@ dlb2_pf_pending_port_unmaps(struct dlb2_hw_dev *handle,\n \n \treturn ret;\n }\n+\n+static int\n+dlb2_pf_sched_domain_start(struct dlb2_hw_dev *handle,\n+\t\t\t struct dlb2_start_domain_args *cfg)\n+{\n+\tstruct dlb2_dev *dlb2_dev = (struct dlb2_dev *)handle->pf_dev;\n+\tstruct dlb2_cmd_response response = {0};\n+\tint ret;\n+\n+\tDLB2_INFO(dev->dlb2_device, \"Entering %s()\\n\", __func__);\n+\n+\tret = dlb2_pf_start_domain(&dlb2_dev->hw,\n+\t\t\t\t handle->domain_id,\n+\t\t\t\t cfg,\n+\t\t\t\t &response);\n+\n+\tcfg->response = response;\n+\n+\tDLB2_INFO(dev->dlb2_device, \"Exiting %s() with ret=%d\\n\",\n+\t\t __func__, ret);\n+\n+\treturn ret;\n+}\n+\n static void\n dlb2_pf_iface_fn_ptrs_init(void)\n {\n@@ -526,6 +550,7 @@ dlb2_pf_iface_fn_ptrs_init(void)\n \tdlb2_iface_dir_port_create = dlb2_pf_dir_port_create;\n \tdlb2_iface_map_qid = dlb2_pf_map_qid;\n \tdlb2_iface_unmap_qid = dlb2_pf_unmap_qid;\n+\tdlb2_iface_sched_domain_start = dlb2_pf_sched_domain_start;\n \tdlb2_iface_pending_port_unmaps = dlb2_pf_pending_port_unmaps;\n \tdlb2_iface_get_sn_allocation = dlb2_pf_get_sn_allocation;\n \tdlb2_iface_set_sn_allocation = dlb2_pf_set_sn_allocation;\n", "prefixes": [ "14/22" ] }