Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/63947/?format=api
{ "id": 63947, "url": "http://patches.dpdk.org/api/patches/63947/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20191217041755.29232-4-somnath.kotur@broadcom.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": "<20191217041755.29232-4-somnath.kotur@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20191217041755.29232-4-somnath.kotur@broadcom.com", "date": "2019-12-17T04:17:52", "name": "[3/6] net/bnxt: fix flow flush to sync with flow destroy routine", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "05a234ad3a4016022bd20d25cca8df9c2b84d30c", "submitter": { "id": 908, "url": "http://patches.dpdk.org/api/people/908/?format=api", "name": "Somnath Kotur", "email": "somnath.kotur@broadcom.com" }, "delegate": { "id": 1766, "url": "http://patches.dpdk.org/api/users/1766/?format=api", "username": "ajitkhaparde", "first_name": "Ajit", "last_name": "Khaparde", "email": "ajit.khaparde@broadcom.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20191217041755.29232-4-somnath.kotur@broadcom.com/mbox/", "series": [ { "id": 7857, "url": "http://patches.dpdk.org/api/series/7857/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=7857", "date": "2019-12-17T04:17:49", "name": "bnxt patchset", "version": 1, "mbox": "http://patches.dpdk.org/series/7857/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/63947/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/63947/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 76738A04F0;\n\tTue, 17 Dec 2019 05:18:57 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id AB0AA1BE9D;\n\tTue, 17 Dec 2019 05:18:37 +0100 (CET)", "from relay.smtp.broadcom.com (relay.smtp.broadcom.com\n [192.19.232.149]) by dpdk.org (Postfix) with ESMTP id 574D42C19\n for <dev@dpdk.org>; Tue, 17 Dec 2019 05:18:31 +0100 (CET)", "from dhcp-10-123-153-55.dhcp.broadcom.net\n (bgccx-dev-host-lnx35.bec.broadcom.net [10.123.153.55])\n by relay.smtp.broadcom.com (Postfix) with ESMTP id 0FEDD1BE6C5;\n Mon, 16 Dec 2019 20:18:29 -0800 (PST)" ], "DKIM-Filter": "OpenDKIM Filter v2.10.3 relay.smtp.broadcom.com 0FEDD1BE6C5", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n s=dkimrelay; t=1576556310;\n bh=V9yr6rfCMMx5ok3S7nxnQrEAePQ+b4ZsA9q/T6TLmkQ=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=Mv1YC4LTNvm/hCsrtbOBSymrHrhKzRaxGIzo/UjtK1sLOl1LYZSulJPjXl4pgp9WL\n rxhedJ/Dfxiwy5gYAyEX0F5wJzlwqAA0FDCUtsyASWz+koRccZR96iW11o0OJby+d/\n jdWPqJ9hVM6OgEe8RpxYCrWQdVvjmvzuvnNXA+XI=", "From": "Somnath Kotur <somnath.kotur@broadcom.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com", "Date": "Tue, 17 Dec 2019 09:47:52 +0530", "Message-Id": "<20191217041755.29232-4-somnath.kotur@broadcom.com>", "X-Mailer": "git-send-email 2.10.1.613.g2cc2e70", "In-Reply-To": "<20191217041755.29232-1-somnath.kotur@broadcom.com>", "References": "<20191217041755.29232-1-somnath.kotur@broadcom.com>", "Subject": "[dpdk-dev] [PATCH 3/6] net/bnxt: fix flow flush to sync with flow\n\tdestroy routine", "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": "Sync flow flush routine with flow destroy so that the operations\nperformed per flow during a flush are the same as that are done for an\nindividual flow destroy by having a common function to call for both.\nOne of the things that was missed in the flow flush routine was the\ndeletion of the L2 filter that would have been created as part of an\nn-tuple filter.\nAlso, decrement the l2_ref_cnt for a filter in the case of a filter\nupdate as it would've bumped up previously in validate_and_parse_flow()\n\nFixes: a0800839 (\"net/bnxt: handle flow flush handling\")\n\nSigned-off-by: Somnath Kotur <somnath.kotur@broadcom.com>\nReviewed-by: Santoshkumar Karanappa Rastapur <santosh.rastapur@broadcom.com>\n---\n drivers/net/bnxt/bnxt_flow.c | 132 +++++++++++++++----------------------------\n 1 file changed, 46 insertions(+), 86 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c\nindex 4381cd7..59e55c3 100644\n--- a/drivers/net/bnxt/bnxt_flow.c\n+++ b/drivers/net/bnxt/bnxt_flow.c\n@@ -1537,10 +1537,13 @@ struct bnxt_vnic_info *find_matching_vnic(struct bnxt *bp,\n \t * filter which points to the new destination queue and so we clear\n \t * the previous L2 filter. For ntuple filters, we are going to reuse\n \t * the old L2 filter and create new NTUPLE filter with this new\n-\t * destination queue subsequently during bnxt_flow_create.\n+\t * destination queue subsequently during bnxt_flow_create. So we\n+\t * decrement the ref cnt of the L2 filter that would've been bumped\n+\t * up previously in bnxt_validate_and_parse_flow as the old n-tuple\n+\t * filter that was referencing it will be deleted now.\n \t */\n+\tbnxt_hwrm_clear_l2_filter(bp, old_filter);\n \tif (new_filter->filter_type == HWRM_CFA_L2_FILTER) {\n-\t\tbnxt_hwrm_clear_l2_filter(bp, old_filter);\n \t\tbnxt_hwrm_set_l2_filter(bp, new_filter->dst_id, new_filter);\n \t} else {\n \t\tif (new_filter->filter_type == HWRM_CFA_EM_FILTER)\n@@ -1828,46 +1831,24 @@ static int bnxt_handle_tunnel_redirect_destroy(struct bnxt *bp,\n }\n \n static int\n-bnxt_flow_destroy(struct rte_eth_dev *dev,\n-\t\t struct rte_flow *flow,\n-\t\t struct rte_flow_error *error)\n+_bnxt_flow_destroy(struct bnxt *bp,\n+\t\t struct rte_flow *flow,\n+\t\t struct rte_flow_error *error)\n {\n-\tstruct bnxt *bp = dev->data->dev_private;\n \tstruct bnxt_filter_info *filter;\n \tstruct bnxt_vnic_info *vnic;\n \tint ret = 0;\n \n-\tbnxt_acquire_flow_lock(bp);\n-\tif (!flow) {\n-\t\trte_flow_error_set(error, EINVAL,\n-\t\t\t\t RTE_FLOW_ERROR_TYPE_HANDLE, NULL,\n-\t\t\t\t \"Invalid flow: failed to destroy flow.\");\n-\t\tbnxt_release_flow_lock(bp);\n-\t\treturn -EINVAL;\n-\t}\n-\n \tfilter = flow->filter;\n \tvnic = flow->vnic;\n \n-\tif (!filter) {\n-\t\trte_flow_error_set(error, EINVAL,\n-\t\t\t\t RTE_FLOW_ERROR_TYPE_HANDLE, NULL,\n-\t\t\t\t \"Invalid flow: failed to destroy flow.\");\n-\t\tbnxt_release_flow_lock(bp);\n-\t\treturn -EINVAL;\n-\t}\n-\n \tif (filter->filter_type == HWRM_CFA_TUNNEL_REDIRECT_FILTER &&\n \t filter->enables == filter->tunnel_type) {\n-\t\tret = bnxt_handle_tunnel_redirect_destroy(bp,\n-\t\t\t\t\t\t\t filter,\n-\t\t\t\t\t\t\t error);\n-\t\tif (!ret) {\n+\t\tret = bnxt_handle_tunnel_redirect_destroy(bp, filter, error);\n+\t\tif (!ret)\n \t\t\tgoto done;\n-\t\t} else {\n-\t\t\tbnxt_release_flow_lock(bp);\n+\t\telse\n \t\t\treturn ret;\n-\t\t}\n \t}\n \n \tret = bnxt_match_filter(bp, filter);\n@@ -1919,7 +1900,36 @@ static int bnxt_handle_tunnel_redirect_destroy(struct bnxt *bp,\n \t\t\t\t \"Failed to destroy flow.\");\n \t}\n \n+\treturn ret;\n+}\n+\n+static int\n+bnxt_flow_destroy(struct rte_eth_dev *dev,\n+\t\t struct rte_flow *flow,\n+\t\t struct rte_flow_error *error)\n+{\n+\tstruct bnxt *bp = dev->data->dev_private;\n+\tint ret = 0;\n+\n+\tbnxt_acquire_flow_lock(bp);\n+\tif (!flow) {\n+\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\t RTE_FLOW_ERROR_TYPE_HANDLE, NULL,\n+\t\t\t\t \"Invalid flow: failed to destroy flow.\");\n+\t\tbnxt_release_flow_lock(bp);\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tif (!flow->filter) {\n+\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\t RTE_FLOW_ERROR_TYPE_HANDLE, NULL,\n+\t\t\t\t \"Invalid flow: failed to destroy flow.\");\n+\t\tbnxt_release_flow_lock(bp);\n+\t\treturn -EINVAL;\n+\t}\n+\tret = _bnxt_flow_destroy(bp, flow, error);\n \tbnxt_release_flow_lock(bp);\n+\n \treturn ret;\n }\n \n@@ -1927,7 +1937,6 @@ static int bnxt_handle_tunnel_redirect_destroy(struct bnxt *bp,\n bnxt_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *error)\n {\n \tstruct bnxt *bp = dev->data->dev_private;\n-\tstruct bnxt_filter_info *filter = NULL;\n \tstruct bnxt_vnic_info *vnic;\n \tstruct rte_flow *flow;\n \tunsigned int i;\n@@ -1941,66 +1950,17 @@ static int bnxt_handle_tunnel_redirect_destroy(struct bnxt *bp,\n \n \t\twhile (!STAILQ_EMPTY(&vnic->flow_list)) {\n \t\t\tflow = STAILQ_FIRST(&vnic->flow_list);\n-\t\t\tfilter = flow->filter;\n-\n-\t\t\tif (filter->filter_type ==\n-\t\t\t HWRM_CFA_TUNNEL_REDIRECT_FILTER &&\n-\t\t\t filter->enables == filter->tunnel_type) {\n-\t\t\t\tret =\n-\t\t\t\tbnxt_handle_tunnel_redirect_destroy(bp,\n-\t\t\t\t\t\t\t\t filter,\n-\t\t\t\t\t\t\t\t error);\n-\t\t\t\tif (!ret) {\n-\t\t\t\t\tgoto done;\n-\t\t\t\t} else {\n-\t\t\t\t\tbnxt_release_flow_lock(bp);\n-\t\t\t\t\treturn ret;\n-\t\t\t\t}\n-\t\t\t}\n-\n-\t\t\tif (filter->filter_type == HWRM_CFA_EM_FILTER)\n-\t\t\t\tret = bnxt_hwrm_clear_em_filter(bp, filter);\n-\t\t\tif (filter->filter_type == HWRM_CFA_NTUPLE_FILTER)\n-\t\t\t\tret = bnxt_hwrm_clear_ntuple_filter(bp, filter);\n-\t\t\telse if (i)\n-\t\t\t\tret = bnxt_hwrm_clear_l2_filter(bp, filter);\n \n-\t\t\tif (ret) {\n-\t\t\t\trte_flow_error_set\n-\t\t\t\t\t(error,\n-\t\t\t\t\t -ret,\n-\t\t\t\t\t RTE_FLOW_ERROR_TYPE_HANDLE,\n-\t\t\t\t\t NULL,\n-\t\t\t\t\t \"Failed to flush flow in HW.\");\n-\t\t\t\tbnxt_release_flow_lock(bp);\n-\t\t\t\treturn -rte_errno;\n-\t\t\t}\n-done:\n-\t\t\tSTAILQ_REMOVE(&vnic->flow_list, flow,\n-\t\t\t\t rte_flow, next);\n-\n-\t\t\tSTAILQ_REMOVE(&vnic->filter,\n-\t\t\t\t filter,\n-\t\t\t\t bnxt_filter_info,\n-\t\t\t\t next);\n-\t\t\tbnxt_free_filter(bp, filter);\n-\n-\t\t\trte_free(flow);\n+\t\t\tif (!flow->filter)\n+\t\t\t\tcontinue;\n \n-\t\t\t/* If this was the last flow associated with this vnic,\n-\t\t\t * switch the queue back to RSS pool.\n-\t\t\t */\n-\t\t\tif (STAILQ_EMPTY(&vnic->flow_list)) {\n-\t\t\t\trte_free(vnic->fw_grp_ids);\n-\t\t\t\tif (vnic->rx_queue_cnt > 1)\n-\t\t\t\t\tbnxt_hwrm_vnic_ctx_free(bp, vnic);\n-\t\t\t\tbnxt_hwrm_vnic_free(bp, vnic);\n-\t\t\t\tvnic->rx_queue_cnt = 0;\n-\t\t\t}\n+\t\t\tret = _bnxt_flow_destroy(bp, flow, error);\n+\t\t\tif (ret)\n+\t\t\t\tbreak;\n \t\t}\n \t}\n-\n \tbnxt_release_flow_lock(bp);\n+\n \treturn ret;\n }\n \n", "prefixes": [ "3/6" ] }