Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/60471/?format=api
{ "id": 60471, "url": "http://patches.dpdk.org/api/patches/60471/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20191002232601.22715-8-ajit.khaparde@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": "<20191002232601.22715-8-ajit.khaparde@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20191002232601.22715-8-ajit.khaparde@broadcom.com", "date": "2019-10-02T23:25:48", "name": "[v2,07/20] net/bnxt: delete and flush L2 filters cleanly", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "cfa2a9f82207c2fb9a5548af3cb31b911e3b2d33", "submitter": { "id": 501, "url": "http://patches.dpdk.org/api/people/501/?format=api", "name": "Ajit Khaparde", "email": "ajit.khaparde@broadcom.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20191002232601.22715-8-ajit.khaparde@broadcom.com/mbox/", "series": [ { "id": 6678, "url": "http://patches.dpdk.org/api/series/6678/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=6678", "date": "2019-10-02T23:25:44", "name": "bnxt patchset to improve rte flow support", "version": 2, "mbox": "http://patches.dpdk.org/series/6678/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/60471/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/60471/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 4E0C91BFC5;\n\tThu, 3 Oct 2019 01:26:28 +0200 (CEST)", "from rnd-relay.smtp.broadcom.com (unknown [192.19.229.170])\n\tby dpdk.org (Postfix) with ESMTP id 449081BF87\n\tfor <dev@dpdk.org>; Thu, 3 Oct 2019 01:26:10 +0200 (CEST)", "from mail-irv-17.broadcom.com (mail-irv-17.lvn.broadcom.net\n\t[10.75.242.48])\n\tby rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id B831730C283;\n\tWed, 2 Oct 2019 16:24:55 -0700 (PDT)", "from localhost.localdomain (unknown [10.230.30.225])\n\tby mail-irv-17.broadcom.com (Postfix) with ESMTP id BDA681400A8;\n\tWed, 2 Oct 2019 16:26:07 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com B831730C283", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n\ts=dkimrelay; t=1570058695;\n\tbh=P/TpAykHChUMi9WUxpHCgbvMPqgb88cM6uRJLijISMo=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=EpxNvaaG7lSyQdbfI8ybwEKxWOCPeaQlGXCsmbSrfm43eoL20DIQ58CrTzbr+tFIn\n\t/o2VcU43HptoxcvggKzII4sQQ2gnErqcWvpIQSQYRaZ54DYz9U1wm0HjciP9fLVdQn\n\tmcKpnGMsRZzspUlUBXgZ8s4/p7/3nq4EkuKQonBs=", "From": "Ajit Khaparde <ajit.khaparde@broadcom.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com, Rahul Gupta <rahul.gupta@broadcom.com>,\n\tVenkat Duvvuru <venkatkumar.duvvuru@broadcom.com>,\n\tKalesh AP <kalesh-anakkur.purayil@broadcom.com>", "Date": "Wed, 2 Oct 2019 16:25:48 -0700", "Message-Id": "<20191002232601.22715-8-ajit.khaparde@broadcom.com>", "X-Mailer": "git-send-email 2.20.1 (Apple Git-117)", "In-Reply-To": "<20191002232601.22715-1-ajit.khaparde@broadcom.com>", "References": "<20191002232601.22715-1-ajit.khaparde@broadcom.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v2 07/20] net/bnxt: delete and flush L2 filters\n\tcleanly", "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\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Once the last filter associated with a VNIC is deleted when using\nRSS action or the Queue action free the VNIC. Also free the RSS\ncontext if the VNIC is using it.\n\nReviewed-by: Rahul Gupta <rahul.gupta@broadcom.com>\nReviewed-by: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>\nSigned-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>\nSigned-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>\n---\n drivers/net/bnxt/bnxt_filter.c | 18 +++++-------\n drivers/net/bnxt/bnxt_flow.c | 41 ++++++++++++++++++++++++++--\n drivers/net/bnxt/bnxt_hwrm.c | 50 ++++++++++++++++++++--------------\n 3 files changed, 75 insertions(+), 34 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/bnxt_filter.c b/drivers/net/bnxt/bnxt_filter.c\nindex 34db988181..e95d47d296 100644\n--- a/drivers/net/bnxt/bnxt_filter.c\n+++ b/drivers/net/bnxt/bnxt_filter.c\n@@ -117,6 +117,13 @@ void bnxt_free_filter_mem(struct bnxt *bp)\n \tmax_filters = bp->max_l2_ctx;\n \tfor (i = 0; i < max_filters; i++) {\n \t\tfilter = &bp->filter_info[i];\n+\t\tif (filter->fw_ntuple_filter_id != ((uint64_t)-1) &&\n+\t\t filter->filter_type == HWRM_CFA_NTUPLE_FILTER) {\n+\t\t\t/* Call HWRM to try to free filter again */\n+\t\t\trc = bnxt_hwrm_clear_ntuple_filter(bp, filter);\n+\t\t}\n+\t\tfilter->fw_ntuple_filter_id = UINT64_MAX;\n+\n \t\tif (filter->fw_l2_filter_id != ((uint64_t)-1) &&\n \t\t filter->filter_type == HWRM_CFA_L2_FILTER) {\n \t\t\tPMD_DRV_LOG(DEBUG, \"L2 filter is not free\\n\");\n@@ -129,17 +136,6 @@ void bnxt_free_filter_mem(struct bnxt *bp)\n \t\t}\n \t\tfilter->fw_l2_filter_id = UINT64_MAX;\n \n-\t\tif (filter->fw_ntuple_filter_id != ((uint64_t)-1) &&\n-\t\t filter->filter_type == HWRM_CFA_NTUPLE_FILTER) {\n-\t\t\tPMD_DRV_LOG(ERR, \"NTUPLE filter is not free\\n\");\n-\t\t\t/* Call HWRM to try to free filter again */\n-\t\t\trc = bnxt_hwrm_clear_ntuple_filter(bp, filter);\n-\t\t\tif (rc)\n-\t\t\t\tPMD_DRV_LOG(ERR,\n-\t\t\t\t\t \"Cannot free NTUPLE filter: %d\\n\",\n-\t\t\t\t\t rc);\n-\t\t}\n-\t\tfilter->fw_ntuple_filter_id = UINT64_MAX;\n \t}\n \tSTAILQ_INIT(&bp->free_filter_list);\n \ndiff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c\nindex 0887bd7f2f..d092a76e99 100644\n--- a/drivers/net/bnxt/bnxt_flow.c\n+++ b/drivers/net/bnxt/bnxt_flow.c\n@@ -1636,7 +1636,7 @@ bnxt_flow_create(struct rte_eth_dev *dev,\n \t\trte_flow_error_set(error, 0,\n \t\t\t\t RTE_FLOW_ERROR_TYPE_NONE, NULL,\n \t\t\t\t \"Flow with pattern exists, updating destination queue\");\n-\telse if (!rte_errno)\n+\telse\n \t\trte_flow_error_set(error, -ret,\n \t\t\t\t RTE_FLOW_ERROR_TYPE_HANDLE, NULL,\n \t\t\t\t \"Failed to create flow.\");\n@@ -1715,6 +1715,7 @@ bnxt_flow_destroy(struct rte_eth_dev *dev,\n \tret = bnxt_match_filter(bp, filter);\n \tif (ret == 0)\n \t\tPMD_DRV_LOG(ERR, \"Could not find matching flow\\n\");\n+\n \tif (filter->filter_type == HWRM_CFA_EM_FILTER)\n \t\tret = bnxt_hwrm_clear_em_filter(bp, filter);\n \tif (filter->filter_type == HWRM_CFA_NTUPLE_FILTER)\n@@ -1723,9 +1724,40 @@ bnxt_flow_destroy(struct rte_eth_dev *dev,\n \n done:\n \tif (!ret) {\n+\t\tSTAILQ_REMOVE(&vnic->filter, filter, bnxt_filter_info, next);\n \t\tbnxt_free_filter(bp, filter);\n \t\tSTAILQ_REMOVE(&vnic->flow_list, flow, rte_flow, next);\n \t\trte_free(flow);\n+\n+\t\t/* If this was the last flow associated with this vnic,\n+\t\t * switch the queue back to RSS pool.\n+\t\t */\n+\t\tif (vnic && STAILQ_EMPTY(&vnic->flow_list)) {\n+\t\t\trte_free(vnic->fw_grp_ids);\n+\t\t\tif (vnic->rx_queue_cnt > 1) {\n+\t\t\t\tif (BNXT_CHIP_THOR(bp)) {\n+\t\t\t\t\tint j;\n+\n+\t\t\t\t\tfor (j = 0; j < vnic->num_lb_ctxts;\n+\t\t\t\t\t j++) {\n+\t\t\t\t\t\tbnxt_hwrm_vnic_ctx_free(bp,\n+ vnic,\n+ vnic->fw_grp_ids[j]);\n+\t\t\t\t\t\tvnic->fw_grp_ids[j] =\n+\t\t\t\t\t\t\tINVALID_HW_RING_ID;\n+\t\t\t\t\t}\n+\t\t\t\t\tvnic->num_lb_ctxts = 0;\n+\t\t\t\t} else {\n+\t\t\t\t\tbnxt_hwrm_vnic_ctx_free(bp,\n+\t\t\t\t\t\t\t\tvnic,\n+\t\t\t\t\t\t\t\tvnic->rss_rule);\n+\t\t\t\t\tvnic->rss_rule = INVALID_HW_RING_ID;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\tbnxt_hwrm_vnic_free(bp, vnic);\n+\t\t\tvnic->rx_queue_cnt = 0;\n+\t\t\tbp->nr_vnics--;\n+\t\t}\n \t} else {\n \t\trte_flow_error_set(error, -ret,\n \t\t\t\t RTE_FLOW_ERROR_TYPE_HANDLE, NULL,\n@@ -1744,8 +1776,11 @@ bnxt_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *error)\n \tunsigned int i;\n \tint ret = 0;\n \n-\tfor (i = 0; i < bp->nr_vnics; i++) {\n+\tfor (i = 0; i < bp->max_vnics; i++) {\n \t\tvnic = &bp->vnic_info[i];\n+\t\tif (vnic->fw_vnic_id == INVALID_VNIC_ID)\n+\t\t\tcontinue;\n+\n \t\tSTAILQ_FOREACH(flow, &vnic->flow_list, next) {\n \t\t\tstruct bnxt_filter_info *filter = flow->filter;\n \n@@ -1766,6 +1801,8 @@ bnxt_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *error)\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\ndiff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c\nindex 7c1aaa6102..5cb394994e 100644\n--- a/drivers/net/bnxt/bnxt_hwrm.c\n+++ b/drivers/net/bnxt/bnxt_hwrm.c\n@@ -2362,7 +2362,8 @@ bnxt_clear_hwrm_vnic_flows(struct bnxt *bp, struct bnxt_vnic_info *vnic)\n \tstruct rte_flow *flow;\n \tint rc = 0;\n \n-\tSTAILQ_FOREACH(flow, &vnic->flow_list, next) {\n+\twhile (!STAILQ_EMPTY(&vnic->flow_list)) {\n+\t\tflow = STAILQ_FIRST(&vnic->flow_list);\n \t\tfilter = flow->filter;\n \t\tPMD_DRV_LOG(DEBUG, \"filter type %d\\n\", filter->filter_type);\n \t\tif (filter->filter_type == HWRM_CFA_EM_FILTER)\n@@ -2424,13 +2425,12 @@ void bnxt_free_all_hwrm_resources(struct bnxt *bp)\n \t * Cleanup VNICs in reverse order, to make sure the L2 filter\n \t * from vnic0 is last to be cleaned up.\n \t */\n-\tfor (i = bp->nr_vnics - 1; i >= 0; i--) {\n+\tfor (i = bp->max_vnics - 1; i >= 0; i--) {\n \t\tstruct bnxt_vnic_info *vnic = &bp->vnic_info[i];\n \n-\t\tif (vnic->fw_vnic_id == INVALID_HW_RING_ID) {\n-\t\t\tPMD_DRV_LOG(DEBUG, \"Invalid vNIC ID\\n\");\n-\t\t\treturn;\n-\t\t}\n+\t\t// If the VNIC ID is invalid we are not currently using the VNIC\n+\t\tif (vnic->fw_vnic_id == INVALID_HW_RING_ID)\n+\t\t\tcontinue;\n \n \t\tbnxt_clear_hwrm_vnic_flows(bp, vnic);\n \n@@ -4307,23 +4307,31 @@ int bnxt_vnic_rss_configure(struct bnxt *bp, struct bnxt_vnic_info *vnic)\n \tif (BNXT_CHIP_THOR(bp))\n \t\treturn bnxt_vnic_rss_configure_thor(bp, vnic);\n \n-\t/*\n-\t * Fill the RSS hash & redirection table with\n-\t * ring group ids for all VNICs\n-\t */\n-\tfor (rss_idx = 0, fw_idx = 0; rss_idx < HW_HASH_INDEX_SIZE;\n-\t\trss_idx++, fw_idx++) {\n-\t\tfor (i = 0; i < bp->rx_cp_nr_rings; i++) {\n-\t\t\tfw_idx %= bp->rx_cp_nr_rings;\n-\t\t\tif (vnic->fw_grp_ids[fw_idx] != INVALID_HW_RING_ID)\n-\t\t\t\tbreak;\n-\t\t\tfw_idx++;\n+\tif (vnic->fw_vnic_id == INVALID_HW_RING_ID)\n+\t\treturn 0;\n+\n+\tif (vnic->rss_table && vnic->hash_type) {\n+\t\t/*\n+\t\t * Fill the RSS hash & redirection table with\n+\t\t * ring group ids for all VNICs\n+\t\t */\n+\t\tfor (rss_idx = 0, fw_idx = 0; rss_idx < HW_HASH_INDEX_SIZE;\n+\t\t\trss_idx++, fw_idx++) {\n+\t\t\tfor (i = 0; i < bp->rx_cp_nr_rings; i++) {\n+\t\t\t\tfw_idx %= bp->rx_cp_nr_rings;\n+\t\t\t\tif (vnic->fw_grp_ids[fw_idx] !=\n+\t\t\t\t INVALID_HW_RING_ID)\n+\t\t\t\t\tbreak;\n+\t\t\t\tfw_idx++;\n+\t\t\t}\n+\t\t\tif (i == bp->rx_cp_nr_rings)\n+\t\t\t\treturn 0;\n+\t\t\tvnic->rss_table[rss_idx] = vnic->fw_grp_ids[fw_idx];\n \t\t}\n-\t\tif (i == bp->rx_cp_nr_rings)\n-\t\t\treturn 0;\n-\t\tvnic->rss_table[rss_idx] = vnic->fw_grp_ids[fw_idx];\n+\t\treturn bnxt_hwrm_vnic_rss_cfg(bp, vnic);\n \t}\n-\treturn bnxt_hwrm_vnic_rss_cfg(bp, vnic);\n+\n+\treturn 0;\n }\n \n static void bnxt_hwrm_set_coal_params(struct bnxt_coal *hw_coal,\n", "prefixes": [ "v2", "07/20" ] }