Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/82819/?format=api
{ "id": 82819, "url": "https://patches.dpdk.org/api/patches/82819/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1603985122-19888-16-git-send-email-timothy.mcdaniel@intel.com/", "project": { "id": 1, "url": "https://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": "<1603985122-19888-16-git-send-email-timothy.mcdaniel@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1603985122-19888-16-git-send-email-timothy.mcdaniel@intel.com", "date": "2020-10-29T15:25:09", "name": "[v4,15/23] event/dlb2: add port unlink and port unlinks in progress", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "6c05134244d5afce3bffb470cb18e37641614fcc", "submitter": { "id": 826, "url": "https://patches.dpdk.org/api/people/826/?format=api", "name": "Timothy McDaniel", "email": "timothy.mcdaniel@intel.com" }, "delegate": { "id": 310, "url": "https://patches.dpdk.org/api/users/310/?format=api", "username": "jerin", "first_name": "Jerin", "last_name": "Jacob", "email": "jerinj@marvell.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1603985122-19888-16-git-send-email-timothy.mcdaniel@intel.com/mbox/", "series": [ { "id": 13469, "url": "https://patches.dpdk.org/api/series/13469/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=13469", "date": "2020-10-29T15:24:54", "name": "Add DLB2 PMD", "version": 4, "mbox": "https://patches.dpdk.org/series/13469/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/82819/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/82819/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 4E8D9A04B5;\n\tThu, 29 Oct 2020 16:30:02 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 70AC8D14C;\n\tThu, 29 Oct 2020 16:24:18 +0100 (CET)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n by dpdk.org (Postfix) with ESMTP id 491D6CFFB\n for <dev@dpdk.org>; Thu, 29 Oct 2020 16:23:53 +0100 (CET)", "from fmsmga005.fm.intel.com ([10.253.24.32])\n by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 29 Oct 2020 08:23:50 -0700", "from txasoft-yocto.an.intel.com ([10.123.72.192])\n by fmsmga005.fm.intel.com with ESMTP; 29 Oct 2020 08:23:49 -0700" ], "IronPort-SDR": [ "\n msdW2fs5x7A5cLHg5xv9qsxgxBmbO9QRYOEvvyKn8vl+OWy26uBUMPbmlN7zWtRb5ayWRnIPBX\n SioS/17sLlqA==", "\n LX7GuPwfuvM5SxPeT02b26XxAHulUCUFtkgMVfWEoJ+rwOOg2NYQ7aOjNp0Gh54QXoFddRl0qT\n xM9EixzHO7PQ==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6000,8403,9788\"; a=\"167669193\"", "E=Sophos;i=\"5.77,430,1596524400\"; d=\"scan'208\";a=\"167669193\"", "E=Sophos;i=\"5.77,430,1596524400\"; d=\"scan'208\";a=\"526769431\"" ], "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, thomas@monjalon.net", "Date": "Thu, 29 Oct 2020 10:25:09 -0500", "Message-Id": "<1603985122-19888-16-git-send-email-timothy.mcdaniel@intel.com>", "X-Mailer": "git-send-email 1.7.10", "In-Reply-To": "<1603985122-19888-1-git-send-email-timothy.mcdaniel@intel.com>", "References": "<1599855987-25976-2-git-send-email-timothy.mcdaniel@intel.com>\n <1603985122-19888-1-git-send-email-timothy.mcdaniel@intel.com>", "Subject": "[dpdk-dev] [PATCH v4 15/23] event/dlb2: add port unlink and port\n\tunlinks in progress", "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 supports for the port unlink(s) eventdev entry points.\nThe unlink operation is an asynchronous operation executed by\na control thread, and the unlinks-in-progress function reads\na counter shared with the control thread.\n\nSigned-off-by: Timothy McDaniel <timothy.mcdaniel@intel.com>\nReviewed-by: Gage Eads <gage.eads@intel.com>\n---\n drivers/event/dlb2/dlb2.c | 163 +++++++++++++++++\n drivers/event/dlb2/dlb2_iface.c | 6 +\n drivers/event/dlb2/dlb2_iface.h | 6 +\n drivers/event/dlb2/pf/base/dlb2_resource.c | 283 +++++++++++++++++++++++++++++\n drivers/event/dlb2/pf/dlb2_pf.c | 51 ++++++\n 5 files changed, 509 insertions(+)", "diff": "diff --git a/drivers/event/dlb2/dlb2.c b/drivers/event/dlb2/dlb2.c\nindex c6593c7..4ef7b6d 100644\n--- a/drivers/event/dlb2/dlb2.c\n+++ b/drivers/event/dlb2/dlb2.c\n@@ -1797,6 +1797,166 @@ dlb2_eventdev_port_link(struct rte_eventdev *dev, void *event_port,\n \treturn i;\n }\n \n+static int16_t\n+dlb2_hw_unmap_ldb_qid_from_port(struct dlb2_hw_dev *handle,\n+\t\t\t\tuint32_t qm_port_id,\n+\t\t\t\tuint16_t qm_qid)\n+{\n+\tstruct dlb2_unmap_qid_args cfg;\n+\tint32_t ret;\n+\n+\tif (handle == NULL)\n+\t\treturn -EINVAL;\n+\n+\tcfg.port_id = qm_port_id;\n+\tcfg.qid = qm_qid;\n+\n+\tret = dlb2_iface_unmap_qid(handle, &cfg);\n+\tif (ret < 0)\n+\t\tDLB2_LOG_ERR(\"dlb2: unmap qid error, ret=%d (driver status: %s)\\n\",\n+\t\t\t ret, dlb2_error_strings[cfg.response.status]);\n+\n+\treturn ret;\n+}\n+\n+static int\n+dlb2_event_queue_detach_ldb(struct dlb2_eventdev *dlb2,\n+\t\t\t struct dlb2_eventdev_port *ev_port,\n+\t\t\t struct dlb2_eventdev_queue *ev_queue)\n+{\n+\tint ret, i;\n+\n+\t/* Don't unlink until start time. */\n+\tif (dlb2->run_state == DLB2_RUN_STATE_STOPPED)\n+\t\treturn 0;\n+\n+\tfor (i = 0; i < DLB2_MAX_NUM_QIDS_PER_LDB_CQ; i++) {\n+\t\tif (ev_port->link[i].valid &&\n+\t\t ev_port->link[i].queue_id == ev_queue->id)\n+\t\t\tbreak; /* found */\n+\t}\n+\n+\t/* This is expected with eventdev API!\n+\t * It blindly attemmpts to unmap all queues.\n+\t */\n+\tif (i == DLB2_MAX_NUM_QIDS_PER_LDB_CQ) {\n+\t\tDLB2_LOG_DBG(\"dlb2: ignoring LB QID %d not mapped for qm_port %d.\\n\",\n+\t\t\t ev_queue->qm_queue.id,\n+\t\t\t ev_port->qm_port.id);\n+\t\treturn 0;\n+\t}\n+\n+\tret = dlb2_hw_unmap_ldb_qid_from_port(&dlb2->qm_instance,\n+\t\t\t\t\t ev_port->qm_port.id,\n+\t\t\t\t\t ev_queue->qm_queue.id);\n+\tif (!ret)\n+\t\tev_port->link[i].mapped = false;\n+\n+\treturn ret;\n+}\n+\n+static int\n+dlb2_eventdev_port_unlink(struct rte_eventdev *dev, void *event_port,\n+\t\t\t uint8_t queues[], uint16_t nb_unlinks)\n+{\n+\tstruct dlb2_eventdev_port *ev_port = event_port;\n+\tstruct dlb2_eventdev *dlb2;\n+\tint i;\n+\n+\tRTE_SET_USED(dev);\n+\n+\tif (!ev_port->setup_done) {\n+\t\tDLB2_LOG_ERR(\"dlb2: evport %d is not configured\\n\",\n+\t\t\t ev_port->id);\n+\t\trte_errno = -EINVAL;\n+\t\treturn 0;\n+\t}\n+\n+\tif (queues == NULL || nb_unlinks == 0) {\n+\t\tDLB2_LOG_DBG(\"dlb2: queues is NULL or nb_unlinks is 0\\n\");\n+\t\treturn 0; /* Ignore and return success */\n+\t}\n+\n+\t/* FIXME: How to handle unlink on a directed port? */\n+\tif (ev_port->qm_port.is_directed) {\n+\t\tDLB2_LOG_DBG(\"dlb2: ignore unlink from dir port %d\\n\",\n+\t\t\t ev_port->id);\n+\t\trte_errno = 0;\n+\t\treturn nb_unlinks; /* as if success */\n+\t}\n+\n+\tdlb2 = ev_port->dlb2;\n+\n+\tfor (i = 0; i < nb_unlinks; i++) {\n+\t\tstruct dlb2_eventdev_queue *ev_queue;\n+\t\tint ret, j;\n+\n+\t\tif (queues[i] >= dlb2->num_queues) {\n+\t\t\tDLB2_LOG_ERR(\"dlb2: invalid queue id %d\\n\", queues[i]);\n+\t\t\trte_errno = -EINVAL;\n+\t\t\treturn i; /* return index of offending queue */\n+\t\t}\n+\n+\t\tev_queue = &dlb2->ev_queues[queues[i]];\n+\n+\t\t/* Does a link exist? */\n+\t\tfor (j = 0; j < DLB2_MAX_NUM_QIDS_PER_LDB_CQ; j++)\n+\t\t\tif (ev_port->link[j].queue_id == queues[i] &&\n+\t\t\t ev_port->link[j].valid)\n+\t\t\t\tbreak;\n+\n+\t\tif (j == DLB2_MAX_NUM_QIDS_PER_LDB_CQ)\n+\t\t\tcontinue;\n+\n+\t\tret = dlb2_event_queue_detach_ldb(dlb2, ev_port, ev_queue);\n+\t\tif (ret) {\n+\t\t\tDLB2_LOG_ERR(\"unlink err=%d for port %d queue %d\\n\",\n+\t\t\t\t ret, ev_port->id, queues[i]);\n+\t\t\trte_errno = -ENOENT;\n+\t\t\treturn i; /* return index of offending queue */\n+\t\t}\n+\n+\t\tev_port->link[j].valid = false;\n+\t\tev_port->num_links--;\n+\t\tev_queue->num_links--;\n+\t}\n+\n+\treturn nb_unlinks;\n+}\n+\n+static int\n+dlb2_eventdev_port_unlinks_in_progress(struct rte_eventdev *dev,\n+\t\t\t\t void *event_port)\n+{\n+\tstruct dlb2_eventdev_port *ev_port = event_port;\n+\tstruct dlb2_eventdev *dlb2;\n+\tstruct dlb2_hw_dev *handle;\n+\tstruct dlb2_pending_port_unmaps_args cfg;\n+\tint ret;\n+\n+\tRTE_SET_USED(dev);\n+\n+\tif (!ev_port->setup_done) {\n+\t\tDLB2_LOG_ERR(\"dlb2: evport %d is not configured\\n\",\n+\t\t\t ev_port->id);\n+\t\trte_errno = -EINVAL;\n+\t\treturn 0;\n+\t}\n+\n+\tcfg.port_id = ev_port->qm_port.id;\n+\tdlb2 = ev_port->dlb2;\n+\thandle = &dlb2->qm_instance;\n+\tret = dlb2_iface_pending_port_unmaps(handle, &cfg);\n+\n+\tif (ret < 0) {\n+\t\tDLB2_LOG_ERR(\"dlb2: num_unlinks_in_progress 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+\treturn cfg.response.id;\n+}\n+\n static void\n dlb2_entry_points_init(struct rte_eventdev *dev)\n {\n@@ -1809,6 +1969,9 @@ dlb2_entry_points_init(struct rte_eventdev *dev)\n \t\t.port_def_conf = dlb2_eventdev_port_default_conf_get,\n \t\t.port_setup = dlb2_eventdev_port_setup,\n \t\t.port_link = dlb2_eventdev_port_link,\n+\t\t.port_unlink = dlb2_eventdev_port_unlink,\n+\t\t.port_unlinks_in_progress =\n+\t\t\t\t dlb2_eventdev_port_unlinks_in_progress,\n \t\t.dump = dlb2_eventdev_dump,\n \t\t.xstats_get = dlb2_eventdev_xstats_get,\n \t\t.xstats_get_names = dlb2_eventdev_xstats_get_names,\ndiff --git a/drivers/event/dlb2/dlb2_iface.c b/drivers/event/dlb2/dlb2_iface.c\nindex 7d1ba73..bd241f3 100644\n--- a/drivers/event/dlb2/dlb2_iface.c\n+++ b/drivers/event/dlb2/dlb2_iface.c\n@@ -57,3 +57,9 @@ int (*dlb2_iface_dir_queue_create)(struct dlb2_hw_dev *handle,\n \n int (*dlb2_iface_map_qid)(struct dlb2_hw_dev *handle,\n \t\t\t struct dlb2_map_qid_args *cfg);\n+\n+int (*dlb2_iface_unmap_qid)(struct dlb2_hw_dev *handle,\n+\t\t\t struct dlb2_unmap_qid_args *cfg);\n+\n+int (*dlb2_iface_pending_port_unmaps)(struct dlb2_hw_dev *handle,\n+\t\t\t\tstruct dlb2_pending_port_unmaps_args *args);\ndiff --git a/drivers/event/dlb2/dlb2_iface.h b/drivers/event/dlb2/dlb2_iface.h\nindex 4eddd14..e892036 100644\n--- a/drivers/event/dlb2/dlb2_iface.h\n+++ b/drivers/event/dlb2/dlb2_iface.h\n@@ -56,4 +56,10 @@ extern int (*dlb2_iface_dir_queue_create)(struct dlb2_hw_dev *handle,\n \n extern int (*dlb2_iface_map_qid)(struct dlb2_hw_dev *handle,\n \t\t\t\t struct dlb2_map_qid_args *cfg);\n+\n+extern int (*dlb2_iface_unmap_qid)(struct dlb2_hw_dev *handle,\n+\t\t\t\t struct dlb2_unmap_qid_args *cfg);\n+\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 #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 14ad262..4a3d96d 100644\n--- a/drivers/event/dlb2/pf/base/dlb2_resource.c\n+++ b/drivers/event/dlb2/pf/base/dlb2_resource.c\n@@ -5528,3 +5528,286 @@ int dlb2_hw_map_qid(struct dlb2_hw *hw,\n \n \treturn 0;\n }\n+\n+static void dlb2_log_unmap_qid(struct dlb2_hw *hw,\n+\t\t\t u32 domain_id,\n+\t\t\t struct dlb2_unmap_qid_args *args,\n+\t\t\t bool vdev_req,\n+\t\t\t unsigned int vdev_id)\n+{\n+\tDLB2_HW_DBG(hw, \"DLB2 unmap QID 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\",\n+\t\t domain_id);\n+\tDLB2_HW_DBG(hw, \"\\tPort ID: %d\\n\",\n+\t\t args->port_id);\n+\tDLB2_HW_DBG(hw, \"\\tQueue ID: %d\\n\",\n+\t\t args->qid);\n+\tif (args->qid < DLB2_MAX_NUM_LDB_QUEUES)\n+\t\tDLB2_HW_DBG(hw, \"\\tQueue's num mappings: %d\\n\",\n+\t\t\t hw->rsrcs.ldb_queues[args->qid].num_mappings);\n+}\n+\n+static int dlb2_verify_unmap_qid_args(struct dlb2_hw *hw,\n+\t\t\t\t u32 domain_id,\n+\t\t\t\t struct dlb2_unmap_qid_args *args,\n+\t\t\t\t struct dlb2_cmd_response *resp,\n+\t\t\t\t bool vdev_req,\n+\t\t\t\t unsigned int vdev_id)\n+{\n+\tenum dlb2_qid_map_state state;\n+\tstruct dlb2_hw_domain *domain;\n+\tstruct dlb2_ldb_queue *queue;\n+\tstruct dlb2_ldb_port *port;\n+\tint slot;\n+\tint id;\n+\n+\tdomain = dlb2_get_domain_from_id(hw, domain_id, vdev_req, vdev_id);\n+\n+\tif (domain == NULL) {\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+\tid = args->port_id;\n+\n+\tport = dlb2_get_domain_used_ldb_port(id, vdev_req, domain);\n+\n+\tif (port == NULL || !port->configured) {\n+\t\tresp->status = DLB2_ST_INVALID_PORT_ID;\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tif (port->domain_id.phys_id != domain->id.phys_id) {\n+\t\tresp->status = DLB2_ST_INVALID_PORT_ID;\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tqueue = dlb2_get_domain_ldb_queue(args->qid, vdev_req, domain);\n+\n+\tif (queue == NULL || !queue->configured) {\n+\t\tDLB2_HW_ERR(hw, \"[%s()] Can't unmap unconfigured queue %d\\n\",\n+\t\t\t __func__, args->qid);\n+\t\tresp->status = DLB2_ST_INVALID_QID;\n+\t\treturn -EINVAL;\n+\t}\n+\n+\t/*\n+\t * Verify that the port has the queue mapped. From the application's\n+\t * perspective a queue is mapped if it is actually mapped, the map is\n+\t * in progress, or the map is blocked pending an unmap.\n+\t */\n+\tstate = DLB2_QUEUE_MAPPED;\n+\tif (dlb2_port_find_slot_queue(port, state, queue, &slot))\n+\t\treturn 0;\n+\n+\tstate = DLB2_QUEUE_MAP_IN_PROG;\n+\tif (dlb2_port_find_slot_queue(port, state, queue, &slot))\n+\t\treturn 0;\n+\n+\tif (dlb2_port_find_slot_with_pending_map_queue(port, queue, &slot))\n+\t\treturn 0;\n+\n+\tresp->status = DLB2_ST_INVALID_QID;\n+\treturn -EINVAL;\n+}\n+\n+int dlb2_hw_unmap_qid(struct dlb2_hw *hw,\n+\t\t u32 domain_id,\n+\t\t struct dlb2_unmap_qid_args *args,\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_hw_domain *domain;\n+\tstruct dlb2_ldb_queue *queue;\n+\tenum dlb2_qid_map_state st;\n+\tstruct dlb2_ldb_port *port;\n+\tbool unmap_complete;\n+\tint i, ret, id;\n+\n+\tdlb2_log_unmap_qid(hw, domain_id, args, vdev_req, vdev_id);\n+\n+\t/*\n+\t * Verify that hardware resources are available before attempting to\n+\t * satisfy the request. This simplifies the error unwinding code.\n+\t */\n+\tret = dlb2_verify_unmap_qid_args(hw,\n+\t\t\t\t\t domain_id,\n+\t\t\t\t\t args,\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 == NULL) {\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+\tid = args->port_id;\n+\n+\tport = dlb2_get_domain_used_ldb_port(id, vdev_req, domain);\n+\tif (port == NULL) {\n+\t\tDLB2_HW_ERR(hw,\n+\t\t\t \"[%s():%d] Internal error: port not found\\n\",\n+\t\t\t __func__, __LINE__);\n+\t\treturn -EFAULT;\n+\t}\n+\n+\tqueue = dlb2_get_domain_ldb_queue(args->qid, vdev_req, domain);\n+\tif (queue == NULL) {\n+\t\tDLB2_HW_ERR(hw,\n+\t\t\t \"[%s():%d] Internal error: queue not found\\n\",\n+\t\t\t __func__, __LINE__);\n+\t\treturn -EFAULT;\n+\t}\n+\n+\t/*\n+\t * If the queue hasn't been mapped yet, we need to update the slot's\n+\t * state and re-enable the queue's inflights.\n+\t */\n+\tst = DLB2_QUEUE_MAP_IN_PROG;\n+\tif (dlb2_port_find_slot_queue(port, st, queue, &i)) {\n+\t\tif (i >= DLB2_MAX_NUM_QIDS_PER_LDB_CQ) {\n+\t\t\tDLB2_HW_ERR(hw,\n+\t\t\t\t \"[%s():%d] Internal error: port slot tracking failed\\n\",\n+\t\t\t\t __func__, __LINE__);\n+\t\t\treturn -EFAULT;\n+\t\t}\n+\n+\t\t/*\n+\t\t * Since the in-progress map was aborted, re-enable the QID's\n+\t\t * inflights.\n+\t\t */\n+\t\tif (queue->num_pending_additions == 0)\n+\t\t\tdlb2_ldb_queue_set_inflight_limit(hw, queue);\n+\n+\t\tst = DLB2_QUEUE_UNMAPPED;\n+\t\tret = dlb2_port_slot_state_transition(hw, port, queue, i, st);\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\n+\t\tgoto unmap_qid_done;\n+\t}\n+\n+\t/*\n+\t * If the queue mapping is on hold pending an unmap, we simply need to\n+\t * update the slot's state.\n+\t */\n+\tif (dlb2_port_find_slot_with_pending_map_queue(port, queue, &i)) {\n+\t\tif (i >= DLB2_MAX_NUM_QIDS_PER_LDB_CQ) {\n+\t\t\tDLB2_HW_ERR(hw,\n+\t\t\t\t \"[%s():%d] Internal error: port slot tracking failed\\n\",\n+\t\t\t\t __func__, __LINE__);\n+\t\t\treturn -EFAULT;\n+\t\t}\n+\n+\t\tst = DLB2_QUEUE_UNMAP_IN_PROG;\n+\t\tret = dlb2_port_slot_state_transition(hw, port, queue, i, st);\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\n+\t\tgoto unmap_qid_done;\n+\t}\n+\n+\tst = DLB2_QUEUE_MAPPED;\n+\tif (!dlb2_port_find_slot_queue(port, st, queue, &i)) {\n+\t\tDLB2_HW_ERR(hw,\n+\t\t\t \"[%s()] Internal error: no available CQ slots\\n\",\n+\t\t\t __func__);\n+\t\treturn -EFAULT;\n+\t}\n+\n+\tif (i >= DLB2_MAX_NUM_QIDS_PER_LDB_CQ) {\n+\t\tDLB2_HW_ERR(hw,\n+\t\t\t \"[%s():%d] Internal error: port slot tracking failed\\n\",\n+\t\t\t __func__, __LINE__);\n+\t\treturn -EFAULT;\n+\t}\n+\n+\t/*\n+\t * QID->CQ mapping removal is an asynchronous procedure. It requires\n+\t * stopping the DLB2 from scheduling this CQ, draining all inflights\n+\t * from the CQ, then unmapping the queue from the CQ. This function\n+\t * simply marks the port as needing the queue unmapped, and (if\n+\t * necessary) starts the unmapping worker thread.\n+\t */\n+\tdlb2_ldb_port_cq_disable(hw, port);\n+\n+\tst = DLB2_QUEUE_UNMAP_IN_PROG;\n+\tret = dlb2_port_slot_state_transition(hw, port, queue, i, st);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\t/*\n+\t * Attempt to finish the unmapping now, in case the port has no\n+\t * outstanding inflights. If that's not the case, this will fail and\n+\t * the unmapping will be completed at a later time.\n+\t */\n+\tunmap_complete = dlb2_domain_finish_unmap_port(hw, domain, port);\n+\n+\t/*\n+\t * If the unmapping couldn't complete immediately, launch the worker\n+\t * thread (if it isn't already launched) to finish it later.\n+\t */\n+\tif (!unmap_complete && !os_worker_active(hw))\n+\t\tos_schedule_work(hw);\n+\n+unmap_qid_done:\n+\tresp->status = 0;\n+\n+\treturn 0;\n+}\n+\n+static void\n+dlb2_log_pending_port_unmaps_args(struct dlb2_hw *hw,\n+\t\t\t\t struct dlb2_pending_port_unmaps_args *args,\n+\t\t\t\t bool vdev_req,\n+\t\t\t\t unsigned int vdev_id)\n+{\n+\tDLB2_HW_DBG(hw, \"DLB unmaps in progress arguments:\\n\");\n+\tif (vdev_req)\n+\t\tDLB2_HW_DBG(hw, \"(Request from VF %d)\\n\", vdev_id);\n+\tDLB2_HW_DBG(hw, \"\\tPort ID: %d\\n\", args->port_id);\n+}\n+\n+int dlb2_hw_pending_port_unmaps(struct dlb2_hw *hw,\n+\t\t\t\tu32 domain_id,\n+\t\t\t\tstruct dlb2_pending_port_unmaps_args *args,\n+\t\t\t\tstruct dlb2_cmd_response *resp,\n+\t\t\t\tbool vdev_req,\n+\t\t\t\tunsigned int vdev_id)\n+{\n+\tstruct dlb2_hw_domain *domain;\n+\tstruct dlb2_ldb_port *port;\n+\n+\tdlb2_log_pending_port_unmaps_args(hw, args, vdev_req, vdev_id);\n+\n+\tdomain = dlb2_get_domain_from_id(hw, domain_id, vdev_req, vdev_id);\n+\n+\tif (domain == NULL) {\n+\t\tresp->status = DLB2_ST_INVALID_DOMAIN_ID;\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tport = dlb2_get_domain_used_ldb_port(args->port_id, vdev_req, domain);\n+\tif (port == NULL || !port->configured) {\n+\t\tresp->status = DLB2_ST_INVALID_PORT_ID;\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tresp->id = port->num_pending_removals;\n+\n+\treturn 0;\n+}\ndiff --git a/drivers/event/dlb2/pf/dlb2_pf.c b/drivers/event/dlb2/pf/dlb2_pf.c\nindex 37be4b1..33ea73e 100644\n--- a/drivers/event/dlb2/pf/dlb2_pf.c\n+++ b/drivers/event/dlb2/pf/dlb2_pf.c\n@@ -454,6 +454,55 @@ dlb2_pf_map_qid(struct dlb2_hw_dev *handle,\n \treturn ret;\n }\n \n+static int\n+dlb2_pf_unmap_qid(struct dlb2_hw_dev *handle,\n+\t\t struct dlb2_unmap_qid_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_hw_unmap_qid(&dlb2_dev->hw,\n+\t\t\t\thandle->domain_id,\n+\t\t\t\tcfg,\n+\t\t\t\t&response,\n+\t\t\t\tfalse,\n+\t\t\t\t0);\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 int\n+dlb2_pf_pending_port_unmaps(struct dlb2_hw_dev *handle,\n+\t\t\t struct dlb2_pending_port_unmaps_args *args)\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_hw_pending_port_unmaps(&dlb2_dev->hw,\n+\t\t\t\t\t handle->domain_id,\n+\t\t\t\t\t args,\n+\t\t\t\t\t &response,\n+\t\t\t\t\t false,\n+\t\t\t\t\t 0);\n+\n+\targs->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 static void\n dlb2_pf_iface_fn_ptrs_init(void)\n {\n@@ -470,6 +519,8 @@ dlb2_pf_iface_fn_ptrs_init(void)\n \tdlb2_iface_dir_queue_create = dlb2_pf_dir_queue_create;\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_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 \tdlb2_iface_get_sn_occupancy = dlb2_pf_get_sn_occupancy;\n", "prefixes": [ "v4", "15/23" ] }