From: Ajit Khaparde <ajit.khaparde@broadcom.com>
To: dev@dpdk.org
Cc: ferruh.yigit@intel.com, Rahul Gupta <rahul.gupta@broadcom.com>,
Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>
Subject: [dpdk-dev] [PATCH 08/17] net/bnxt: cleanup vnic after flow validate
Date: Mon, 2 Sep 2019 19:18:52 -0700 [thread overview]
Message-ID: <20190903021901.25895-9-ajit.khaparde@broadcom.com> (raw)
In-Reply-To: <20190903021901.25895-1-ajit.khaparde@broadcom.com>
When an application issues flow validate, we free the temporary
filter that is created. But the vnic is not freed up. This can
potentially interfere with subsequent flow creation. So free the vnic.
Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Reviewed-by: Rahul Gupta <rahul.gupta@broadcom.com>
Reviewed-by: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>
---
drivers/net/bnxt/bnxt_flow.c | 76 +++++++++++++++++++++---------------
drivers/net/bnxt/bnxt_hwrm.c | 41 ++++++++++++-------
drivers/net/bnxt/bnxt_hwrm.h | 3 +-
3 files changed, 73 insertions(+), 47 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c
index 496edd7ac..aed822ee3 100644
--- a/drivers/net/bnxt/bnxt_flow.c
+++ b/drivers/net/bnxt/bnxt_flow.c
@@ -1289,6 +1289,25 @@ bnxt_validate_and_parse_flow(struct rte_eth_dev *dev,
return rc;
}
+static
+struct bnxt_vnic_info *find_matching_vnic(struct bnxt *bp,
+ struct bnxt_filter_info *filter)
+{
+ struct bnxt_vnic_info *vnic = NULL;
+ unsigned int i;
+
+ for (i = 0; i < bp->max_vnics; i++) {
+ vnic = &bp->vnic_info[i];
+ if (vnic->fw_vnic_id != INVALID_VNIC_ID &&
+ filter->dst_id == vnic->fw_vnic_id) {
+ PMD_DRV_LOG(DEBUG, "Found matching VNIC Id %d\n",
+ vnic->ff_pool_idx);
+ return vnic;
+ }
+ }
+ return NULL;
+}
+
static int
bnxt_flow_validate(struct rte_eth_dev *dev,
const struct rte_flow_attr *attr,
@@ -1297,6 +1316,7 @@ bnxt_flow_validate(struct rte_eth_dev *dev,
struct rte_flow_error *error)
{
struct bnxt *bp = dev->data->dev_private;
+ struct bnxt_vnic_info *vnic = NULL;
struct bnxt_filter_info *filter;
int ret = 0;
@@ -1312,6 +1332,26 @@ bnxt_flow_validate(struct rte_eth_dev *dev,
ret = bnxt_validate_and_parse_flow(dev, pattern, actions, attr,
error, filter);
+
+ vnic = find_matching_vnic(bp, filter);
+ if (vnic) {
+ if (STAILQ_EMPTY(&vnic->filter)) {
+ rte_free(vnic->fw_grp_ids);
+ bnxt_hwrm_vnic_ctx_free(bp, vnic);
+ bnxt_hwrm_vnic_free(bp, vnic);
+ vnic->rx_queue_cnt = 0;
+ bp->nr_vnics--;
+ PMD_DRV_LOG(DEBUG, "Free VNIC\n");
+ }
+ }
+
+ if (filter->filter_type == HWRM_CFA_EM_FILTER)
+ bnxt_hwrm_clear_em_filter(bp, filter);
+ else if (filter->filter_type == HWRM_CFA_NTUPLE_FILTER)
+ bnxt_hwrm_clear_ntuple_filter(bp, filter);
+ else
+ bnxt_hwrm_clear_l2_filter(bp, filter);
+
/* No need to hold on to this filter if we are just validating flow */
filter->fw_l2_filter_id = UINT64_MAX;
bnxt_free_filter(bp, filter);
@@ -1326,7 +1366,7 @@ bnxt_match_filter(struct bnxt *bp, struct bnxt_filter_info *nf)
struct rte_flow *flow;
int i;
- for (i = bp->max_vnics; i >= 0; i--) {
+ for (i = bp->max_vnics - 1; i >= 0; i--) {
struct bnxt_vnic_info *vnic = &bp->vnic_info[i];
if (vnic->fw_vnic_id == INVALID_VNIC_ID)
@@ -1407,7 +1447,6 @@ bnxt_flow_create(struct rte_eth_dev *dev,
struct bnxt_filter_info *filter;
bool update_flow = false;
struct rte_flow *flow;
- unsigned int i;
int ret = 0;
uint32_t tun_type;
@@ -1501,15 +1540,7 @@ bnxt_flow_create(struct rte_eth_dev *dev,
ret = bnxt_hwrm_set_ntuple_filter(bp, filter->dst_id, filter);
}
- for (i = 0; i < bp->max_vnics; i++) {
- vnic = &bp->vnic_info[i];
- if (vnic->fw_vnic_id != INVALID_VNIC_ID &&
- filter->dst_id == vnic->fw_vnic_id) {
- PMD_DRV_LOG(ERR, "Found matching VNIC Id %d\n",
- vnic->ff_pool_idx);
- break;
- }
- }
+ vnic = find_matching_vnic(bp, filter);
done:
if (!ret) {
flow->filter = filter;
@@ -1651,26 +1682,9 @@ bnxt_flow_destroy(struct rte_eth_dev *dev,
*/
if (vnic && STAILQ_EMPTY(&vnic->flow_list)) {
rte_free(vnic->fw_grp_ids);
- if (vnic->rx_queue_cnt > 1) {
- if (BNXT_CHIP_THOR(bp)) {
- int j;
-
- for (j = 0; j < vnic->num_lb_ctxts;
- j++) {
- bnxt_hwrm_vnic_ctx_free(bp,
- vnic,
- vnic->fw_grp_ids[j]);
- vnic->fw_grp_ids[j] =
- INVALID_HW_RING_ID;
- }
- vnic->num_lb_ctxts = 0;
- } else {
- bnxt_hwrm_vnic_ctx_free(bp,
- vnic,
- vnic->rss_rule);
- vnic->rss_rule = INVALID_HW_RING_ID;
- }
- }
+ if (vnic->rx_queue_cnt > 1)
+ bnxt_hwrm_vnic_ctx_free(bp, vnic);
+
bnxt_hwrm_vnic_free(bp, vnic);
vnic->rx_queue_cnt = 0;
bp->nr_vnics--;
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 26559dce1..a033e2d1e 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -1766,8 +1766,9 @@ int bnxt_hwrm_vnic_ctx_alloc(struct bnxt *bp,
return rc;
}
-int bnxt_hwrm_vnic_ctx_free(struct bnxt *bp,
- struct bnxt_vnic_info *vnic, uint16_t ctx_idx)
+static
+int _bnxt_hwrm_vnic_ctx_free(struct bnxt *bp,
+ struct bnxt_vnic_info *vnic, uint16_t ctx_idx)
{
int rc = 0;
struct hwrm_vnic_rss_cos_lb_ctx_free_input req = {.req_type = 0 };
@@ -1790,6 +1791,28 @@ int bnxt_hwrm_vnic_ctx_free(struct bnxt *bp,
return rc;
}
+int bnxt_hwrm_vnic_ctx_free(struct bnxt *bp, struct bnxt_vnic_info *vnic)
+{
+ int rc = 0;
+
+ if (BNXT_CHIP_THOR(bp)) {
+ int j;
+
+ for (j = 0; j < vnic->num_lb_ctxts; j++) {
+ rc = _bnxt_hwrm_vnic_ctx_free(bp,
+ vnic,
+ vnic->fw_grp_ids[j]);
+ vnic->fw_grp_ids[j] = INVALID_HW_RING_ID;
+ }
+ vnic->num_lb_ctxts = 0;
+ } else {
+ rc = _bnxt_hwrm_vnic_ctx_free(bp, vnic, vnic->rss_rule);
+ vnic->rss_rule = INVALID_HW_RING_ID;
+ }
+
+ return rc;
+}
+
int bnxt_hwrm_vnic_free(struct bnxt *bp, struct bnxt_vnic_info *vnic)
{
int rc = 0;
@@ -2401,7 +2424,7 @@ void bnxt_free_tunnel_ports(struct bnxt *bp)
void bnxt_free_all_hwrm_resources(struct bnxt *bp)
{
- int i, j;
+ int i;
if (bp->vnic_info == NULL)
return;
@@ -2421,17 +2444,7 @@ void bnxt_free_all_hwrm_resources(struct bnxt *bp)
bnxt_clear_hwrm_vnic_filters(bp, vnic);
- if (BNXT_CHIP_THOR(bp)) {
- for (j = 0; j < vnic->num_lb_ctxts; j++) {
- bnxt_hwrm_vnic_ctx_free(bp, vnic,
- vnic->fw_grp_ids[j]);
- vnic->fw_grp_ids[j] = INVALID_HW_RING_ID;
- }
- vnic->num_lb_ctxts = 0;
- } else {
- bnxt_hwrm_vnic_ctx_free(bp, vnic, vnic->rss_rule);
- vnic->rss_rule = INVALID_HW_RING_ID;
- }
+ bnxt_hwrm_vnic_ctx_free(bp, vnic);
bnxt_hwrm_vnic_tpa_cfg(bp, vnic, false);
diff --git a/drivers/net/bnxt/bnxt_hwrm.h b/drivers/net/bnxt/bnxt_hwrm.h
index 47b1e43ac..9fa52be72 100644
--- a/drivers/net/bnxt/bnxt_hwrm.h
+++ b/drivers/net/bnxt/bnxt_hwrm.h
@@ -113,8 +113,7 @@ int bnxt_hwrm_vnic_qcfg(struct bnxt *bp, struct bnxt_vnic_info *vnic,
int bnxt_hwrm_vnic_qcaps(struct bnxt *bp);
int bnxt_hwrm_vnic_ctx_alloc(struct bnxt *bp, struct bnxt_vnic_info *vnic,
uint16_t ctx_idx);
-int bnxt_hwrm_vnic_ctx_free(struct bnxt *bp, struct bnxt_vnic_info *vnic,
- uint16_t ctx_idx);
+int bnxt_hwrm_vnic_ctx_free(struct bnxt *bp, struct bnxt_vnic_info *vnic);
int bnxt_hwrm_vnic_free(struct bnxt *bp, struct bnxt_vnic_info *vnic);
int bnxt_hwrm_vnic_rss_cfg(struct bnxt *bp,
struct bnxt_vnic_info *vnic);
--
2.20.1 (Apple Git-117)
next prev parent reply other threads:[~2019-09-03 2:19 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-03 2:18 [dpdk-dev] [PATCH 00/17] bnxt patchset to improve rte flow support Ajit Khaparde
2019-09-03 2:18 ` [dpdk-dev] [PATCH 01/17] net/bnxt: return standard error codes for HWRM command Ajit Khaparde
2019-09-03 2:18 ` [dpdk-dev] [PATCH 02/17] net/bnxt: refactor code to allow dynamic creation of VNIC Ajit Khaparde
2019-09-03 2:18 ` [dpdk-dev] [PATCH 03/17] net/bnxt: allow flow creation when RSS is enabled Ajit Khaparde
2019-09-03 2:18 ` [dpdk-dev] [PATCH 04/17] net/bnxt: add support to create SMAC and inner DMAC filters Ajit Khaparde
2019-09-03 2:18 ` [dpdk-dev] [PATCH 05/17] net/bnxt: add support for RSS action Ajit Khaparde
2019-09-03 2:18 ` [dpdk-dev] [PATCH 06/17] net/bnxt: parse priority attribute for flow creation Ajit Khaparde
2019-09-03 2:18 ` [dpdk-dev] [PATCH 07/17] net/bnxt: delete and flush L2 filters cleanly Ajit Khaparde
2019-09-03 2:18 ` Ajit Khaparde [this message]
2019-09-03 2:18 ` [dpdk-dev] [PATCH 09/17] net/bnxt: allow only unicast MAC address filter creation Ajit Khaparde
2019-09-03 2:18 ` [dpdk-dev] [PATCH 10/17] net/bnxt: properly handle ring cleanup in case of error Ajit Khaparde
2019-09-03 2:18 ` [dpdk-dev] [PATCH 11/17] net/bnxt: check device is started before flow creation Ajit Khaparde
2019-09-03 2:18 ` [dpdk-dev] [PATCH 12/17] net/bnxt: check for invalid VNIC ID in vnic tpa cfg Ajit Khaparde
2019-09-03 2:18 ` [dpdk-dev] [PATCH 13/17] net/bnxt: handle flow flush handling Ajit Khaparde
2019-09-03 2:18 ` [dpdk-dev] [PATCH 14/17] net/bnxt: validate RSS hash key length Ajit Khaparde
2019-09-03 2:18 ` [dpdk-dev] [PATCH 15/17] net/bnxt: handle cleanup if flow creation fails Ajit Khaparde
2019-09-03 2:19 ` [dpdk-dev] [PATCH 16/17] net/bnxt: synchronize between flow related functions Ajit Khaparde
2019-09-03 2:19 ` [dpdk-dev] [PATCH 17/17] net/bnxt: drop untagged frames when specified Ajit Khaparde
2019-10-01 17:02 ` [dpdk-dev] [PATCH 00/17] bnxt patchset to improve rte flow support Ferruh Yigit
2019-10-01 17:32 ` Ajit Khaparde
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190903021901.25895-9-ajit.khaparde@broadcom.com \
--to=ajit.khaparde@broadcom.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=rahul.gupta@broadcom.com \
--cc=venkatkumar.duvvuru@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).