From: Ajit Khaparde <ajit.khaparde@broadcom.com>
To: dev@dpdk.org
Cc: ferruh.yigit@intel.com
Subject: [dpdk-dev] [PATCH v2 04/15] net/bnxt: handle Rx multi queue creation properly
Date: Tue, 24 Oct 2017 16:19:42 -0500 [thread overview]
Message-ID: <20171024211953.12021-5-ajit.khaparde@broadcom.com> (raw)
In-Reply-To: <20171024211953.12021-1-ajit.khaparde@broadcom.com>
This patch simplifies logic for RSS queue creation.
1) Do not hardcode number of VNIC pools in case of RSS
2) Log a message if Number of queues is > RTE_ETHDEV_QUEUE_STAT_CNTRS
3) Move the check for allocation of l2_filter inside the for loop.
Fixes: 6133f207970c ("net/bnxt: add Rx queue create/destroy")
Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---
drivers/net/bnxt/bnxt_ethdev.c | 5 +++++
drivers/net/bnxt/bnxt_rxq.c | 18 ++++++------------
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 8419f8bfd..786e41c9d 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -574,6 +574,11 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
int vlan_mask = 0;
int rc;
+ if (bp->rx_cp_nr_rings > RTE_ETHDEV_QUEUE_STAT_CNTRS) {
+ RTE_LOG(ERR, PMD,
+ "RxQ cnt %d > CONFIG_RTE_ETHDEV_QUEUE_STAT_CNTRS %d\n",
+ bp->rx_cp_nr_rings, RTE_ETHDEV_QUEUE_STAT_CNTRS);
+ }
bp->dev_stopped = 0;
rc = bnxt_init_nic(bp);
diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c
index f2389515d..a2fa7e40f 100644
--- a/drivers/net/bnxt/bnxt_rxq.c
+++ b/drivers/net/bnxt/bnxt_rxq.c
@@ -68,7 +68,6 @@ int bnxt_mq_rx_configure(struct bnxt *bp)
struct bnxt_filter_info *filter;
enum rte_eth_nb_pools pools = bp->rx_cp_nr_rings, max_pools = 0;
struct bnxt_rx_queue *rxq;
- bool rss_dflt_cr = false;
bp->nr_vnics = 0;
@@ -119,7 +118,7 @@ int bnxt_mq_rx_configure(struct bnxt *bp)
pools = max_pools;
break;
case ETH_MQ_RX_RSS:
- pools = 1;
+ pools = bp->rx_cp_nr_rings;
break;
default:
RTE_LOG(ERR, PMD, "Unsupported mq_mod %d\n",
@@ -128,13 +127,6 @@ int bnxt_mq_rx_configure(struct bnxt *bp)
goto err_out;
}
}
- /*
- * If MQ RX w/o RSS no need for per VNIC filter.
- */
- if ((dev_conf->rxmode.mq_mode & ETH_MQ_RX_VMDQ_DCB) ||
- (bp->rx_cp_nr_rings &&
- !(dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS)))
- rss_dflt_cr = true;
nb_q_per_grp = bp->rx_cp_nr_rings / pools;
start_grp_id = 0;
@@ -151,7 +143,7 @@ int bnxt_mq_rx_configure(struct bnxt *bp)
STAILQ_INSERT_TAIL(&bp->ff_pool[i], vnic, next);
bp->nr_vnics++;
- for (j = 0, ring_idx = 0; j < nb_q_per_grp; j++, ring_idx++) {
+ for (j = 0; j < nb_q_per_grp; j++, ring_idx++) {
rxq = bp->eth_dev->data->rx_queues[ring_idx];
rxq->vnic = vnic;
}
@@ -166,8 +158,10 @@ int bnxt_mq_rx_configure(struct bnxt *bp)
vnic->start_grp_id = start_grp_id;
vnic->end_grp_id = end_grp_id;
- if (rss_dflt_cr && i) {
- vnic->rss_dflt_cr = true;
+ if (i) {
+ if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_VMDQ_DCB ||
+ !(dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS))
+ vnic->rss_dflt_cr = true;
goto skip_filter_allocation;
}
filter = bnxt_alloc_filter(bp);
--
2.13.5 (Apple Git-94)
next prev parent reply other threads:[~2017-10-24 21:20 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-12 17:35 [dpdk-dev] [PATCH 0/3] patchset for bnxt PMD Ajit Khaparde
2017-10-12 17:35 ` [dpdk-dev] [PATCH 1/3] net/bnxt: handle Rx multi queue creation properly Ajit Khaparde
2017-10-12 17:35 ` [dpdk-dev] [PATCH 2/3] net/bnxt: remove redundant code parsing pool_map Ajit Khaparde
2017-10-12 17:35 ` [dpdk-dev] [PATCH 3/3] net/bnxt: update HWRM API to 1.8.2 Ajit Khaparde
2017-10-20 19:28 ` Ferruh Yigit
2017-10-20 19:39 ` Ferruh Yigit
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 00/15] bnxt patchset Ajit Khaparde
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 01/15] net/bnxt: update HWRM to 1.8.2 Ajit Khaparde
2017-10-24 22:50 ` Ferruh Yigit
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 02/15] net/bnxt: fix tx_offload capability Ajit Khaparde
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 03/15] net/bnxt: fix rx_offload capability Ajit Khaparde
2017-10-24 21:19 ` Ajit Khaparde [this message]
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 05/15] net/bnxt: remove redundant code parsing pool_map Ajit Khaparde
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 06/15] net/bnxt: fix redirecting traffic to a VF Ajit Khaparde
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 07/15] net/bnxt: fix a bad bit shift operation Ajit Khaparde
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 08/15] net/bnxt: fix a null pointer dereference Ajit Khaparde
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 09/15] net/bnxt: fix an issue reported by Coverity Ajit Khaparde
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 10/15] net/bnxt: fix a potential null pointer dereference Ajit Khaparde
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 11/15] net/bnxt: fix a potential null poiner dereference Ajit Khaparde
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 12/15] net/bnxt: fix a null pointer deref Ajit Khaparde
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 13/15] net/bnxt: fix a pointer deref before null check Ajit Khaparde
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 14/15] net/bnxt: fix an issue reported by Coverity Ajit Khaparde
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 15/15] net/bnxt: check VLANs from pool_map only for VMDQ Ajit Khaparde
2017-10-24 22:49 ` [dpdk-dev] [PATCH v2 00/15] bnxt patchset Ferruh Yigit
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=20171024211953.12021-5-ajit.khaparde@broadcom.com \
--to=ajit.khaparde@broadcom.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.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).