From: Ajit Khaparde <ajit.khaparde@broadcom.com>
To: dev@dpdk.org
Cc: ferruh.yigit@intel.com
Subject: [dpdk-dev] [PATCH v4 14/24] net/bnxt: add support for rx_queue_count
Date: Thu, 28 Sep 2017 16:43:35 -0500 [thread overview]
Message-ID: <20170928214345.87655-15-ajit.khaparde@broadcom.com> (raw)
In-Reply-To: <20170928214345.87655-1-ajit.khaparde@broadcom.com>
add support for rx_queue_count dev_op
Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
--
v1->v2: incorporate review comments.
v2->v3: fix checkpatch warning.
---
drivers/net/bnxt/bnxt_cpr.h | 6 +++++-
drivers/net/bnxt/bnxt_ethdev.c | 46 ++++++++++++++++++++++++++++++++++++++++++
drivers/net/bnxt/bnxt_rxr.c | 12 +++++++++--
3 files changed, 61 insertions(+), 3 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_cpr.h b/drivers/net/bnxt/bnxt_cpr.h
index a6e87858a..e8f048a3b 100644
--- a/drivers/net/bnxt/bnxt_cpr.h
+++ b/drivers/net/bnxt/bnxt_cpr.h
@@ -41,6 +41,9 @@
(!!(((struct cmpl_base *)(cmp))->info3_v & CMPL_BASE_V) == \
!((raw_cons) & ((ring)->ring_size)))
+#define CMPL_VALID(cmp, v) \
+ (!!(((struct cmpl_base *)(cmp))->info3_v & CMPL_BASE_V) == !(v))
+
#define CMP_TYPE(cmp) \
(((struct cmpl_base *)cmp)->type & CMPL_BASE_TYPE_MASK)
@@ -48,6 +51,7 @@
#define NEXT_RAW_CMP(idx) ADV_RAW_CMP(idx, 1)
#define RING_CMP(ring, idx) ((idx) & (ring)->ring_mask)
#define NEXT_CMP(idx) RING_CMP(ADV_RAW_CMP(idx, 1))
+#define FLIP_VALID(cons, mask, val) ((cons) >= (mask) ? !(val) : (val))
#define DB_CP_REARM_FLAGS (DB_KEY_CP | DB_IDX_VALID)
#define DB_CP_FLAGS (DB_KEY_CP | DB_IDX_VALID | DB_IRQ_DIS)
@@ -90,7 +94,7 @@ struct bnxt_cp_ring_info {
struct bnxt_ring *cp_ring_struct;
uint16_t cp_cons;
- bool v;
+ bool valid;
};
#define RX_CMP_L2_ERRORS \
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 5b17eef53..5c68797c1 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -1527,6 +1527,51 @@ bnxt_dev_led_off_op(struct rte_eth_dev *dev)
return bnxt_hwrm_port_led_cfg(bp, false);
}
+static uint32_t
+bnxt_rx_queue_count_op(struct rte_eth_dev *dev, uint16_t rx_queue_id)
+{
+ uint32_t desc = 0, raw_cons = 0, cons;
+ struct bnxt_cp_ring_info *cpr;
+ struct bnxt_rx_queue *rxq;
+ struct rx_pkt_cmpl *rxcmp;
+ uint16_t cmp_type;
+ uint8_t cmp = 1;
+ bool valid;
+
+ rxq = dev->data->rx_queues[rx_queue_id];
+ cpr = rxq->cp_ring;
+ valid = cpr->valid;
+
+ while (raw_cons < rxq->nb_rx_desc) {
+ cons = RING_CMP(cpr->cp_ring_struct, raw_cons);
+ rxcmp = (struct rx_pkt_cmpl *)&cpr->cp_desc_ring[cons];
+
+ if (!CMPL_VALID(rxcmp, valid))
+ goto nothing_to_do;
+ valid = FLIP_VALID(cons, cpr->cp_ring_struct->ring_mask, valid);
+ cmp_type = CMP_TYPE(rxcmp);
+ if (cmp_type == RX_PKT_CMPL_TYPE_RX_L2_TPA_END) {
+ cmp = (rte_le_to_cpu_32(
+ ((struct rx_tpa_end_cmpl *)
+ (rxcmp))->agg_bufs_v1) &
+ RX_TPA_END_CMPL_AGG_BUFS_MASK) >>
+ RX_TPA_END_CMPL_AGG_BUFS_SFT;
+ desc++;
+ } else if (cmp_type == 0x11) {
+ desc++;
+ cmp = (rxcmp->agg_bufs_v1 &
+ RX_PKT_CMPL_AGG_BUFS_MASK) >>
+ RX_PKT_CMPL_AGG_BUFS_SFT;
+ } else {
+ cmp = 1;
+ }
+nothing_to_do:
+ raw_cons += cmp ? cmp : 2;
+ }
+
+ return desc;
+}
+
/*
* Initialization
*/
@@ -1576,6 +1621,7 @@ static const struct eth_dev_ops bnxt_dev_ops = {
.dev_led_off = bnxt_dev_led_off_op,
.xstats_get_by_id = bnxt_dev_xstats_get_by_id_op,
.xstats_get_names_by_id = bnxt_dev_xstats_get_names_by_id_op,
+ .rx_queue_count = bnxt_rx_queue_count_op,
};
static bool bnxt_vf_pciid(uint16_t id)
diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
index 28105b06b..3216a6d3b 100644
--- a/drivers/net/bnxt/bnxt_rxr.c
+++ b/drivers/net/bnxt/bnxt_rxr.c
@@ -219,6 +219,9 @@ static int bnxt_agg_bufs_valid(struct bnxt_cp_ring_info *cpr,
raw_cp_cons = ADV_RAW_CMP(raw_cp_cons, agg_bufs);
last_cp_cons = RING_CMP(cpr->cp_ring_struct, raw_cp_cons);
agg_cmpl = (struct rx_pkt_cmpl *)&cpr->cp_desc_ring[last_cp_cons];
+ cpr->valid = FLIP_VALID(raw_cp_cons,
+ cpr->cp_ring_struct->ring_mask,
+ cpr->valid);
return CMP_VALID(agg_cmpl, raw_cp_cons, cpr->cp_ring_struct);
}
@@ -360,6 +363,10 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
if (!CMP_VALID(rxcmp1, tmp_raw_cons, cpr->cp_ring_struct))
return -EBUSY;
+ cpr->valid = FLIP_VALID(cp_cons,
+ cpr->cp_ring_struct->ring_mask,
+ cpr->valid);
+
cmp_type = CMP_TYPE(rxcmp);
if (cmp_type == RX_PKT_CMPL_TYPE_RX_L2_TPA_START) {
bnxt_tpa_start(rxq, (struct rx_tpa_start_cmpl *)rxcmp,
@@ -492,14 +499,15 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
/* Handle RX burst request */
while (1) {
- int rc;
-
cons = RING_CMP(cpr->cp_ring_struct, raw_cons);
rte_prefetch0(&cpr->cp_desc_ring[cons]);
rxcmp = (struct rx_pkt_cmpl *)&cpr->cp_desc_ring[cons];
if (!CMP_VALID(rxcmp, raw_cons, cpr->cp_ring_struct))
break;
+ cpr->valid = FLIP_VALID(cons,
+ cpr->cp_ring_struct->ring_mask,
+ cpr->valid);
/* TODO: Avoid magic numbers... */
if ((CMP_TYPE(rxcmp) & 0x30) == 0x10) {
--
2.13.5 (Apple Git-94)
next prev parent reply other threads:[~2017-09-28 21:44 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-28 21:43 [dpdk-dev] [PATCH v4 00/24] bnxt patchset Ajit Khaparde
2017-09-28 21:43 ` [dpdk-dev] [PATCH v4 01/24] net/bnxt: fix HWRM_*() macros and locking Ajit Khaparde
2017-09-28 21:43 ` [dpdk-dev] [PATCH v4 02/24] net/bnxt: use 64-bits of address for vlan_table Ajit Khaparde
2017-09-28 21:43 ` [dpdk-dev] [PATCH v4 03/24] net/bnxt: fix an issue with group id calculation Ajit Khaparde
2017-09-28 21:43 ` [dpdk-dev] [PATCH v4 04/24] net/bnxt: fix calculation of number of pools Ajit Khaparde
2017-09-28 21:43 ` [dpdk-dev] [PATCH v4 05/24] net/bnxt: handle multi queue mode properly Ajit Khaparde
2017-09-28 21:43 ` [dpdk-dev] [PATCH v4 06/24] net/bnxt: fix rx handling and buffer allocation logic Ajit Khaparde
2017-09-28 21:43 ` [dpdk-dev] [PATCH v4 07/24] net/bnxt: fix an issue with broadcast traffic Ajit Khaparde
2017-09-28 21:43 ` [dpdk-dev] [PATCH v4 08/24] net/bnxt: fix usage of ETH_VMDQ_* flags Ajit Khaparde
2017-09-28 21:43 ` [dpdk-dev] [PATCH v4 09/24] net/bnxt: set checksum offload flags correctly Ajit Khaparde
2017-09-28 21:43 ` [dpdk-dev] [PATCH v4 10/24] net/bnxt: update status of Rx IP/L4 CKSUM Ajit Khaparde
2017-09-28 21:43 ` [dpdk-dev] [PATCH v4 11/24] net/bnxt: add support for xstats get by id Ajit Khaparde
2017-09-28 21:43 ` [dpdk-dev] [PATCH v4 12/24] net/bnxt: fix config rss update Ajit Khaparde
2017-09-28 21:43 ` [dpdk-dev] [PATCH v4 13/24] net/bnxt: set the hash_key_size Ajit Khaparde
2017-09-28 21:43 ` Ajit Khaparde [this message]
2017-09-28 21:43 ` [dpdk-dev] [PATCH v4 15/24] net/bnxt: add support for rx_descriptor_status Ajit Khaparde
2017-09-28 21:43 ` [dpdk-dev] [PATCH v4 16/24] net/bnxt: add support for tx_descriptor_status Ajit Khaparde
2017-09-28 21:43 ` [dpdk-dev] [PATCH v4 17/24] net/bnxt: add new HWRM structs to support flow filtering Ajit Khaparde
2017-09-28 21:43 ` [dpdk-dev] [PATCH v4 18/24] net/bnxt: add support for flow filter ops Ajit Khaparde
2017-09-28 21:43 ` [dpdk-dev] [PATCH v4 19/24] doc: update release notes Ajit Khaparde
2017-09-28 21:43 ` [dpdk-dev] [PATCH v4 20/24] net/bnxt: fix per queue stats display in xstats Ajit Khaparde
2017-09-28 21:43 ` [dpdk-dev] [PATCH v4 21/24] net/bnxt: prevent interrupt handler from accessing freed memory Ajit Khaparde
2017-09-28 21:43 ` [dpdk-dev] [PATCH v4 22/24] net/bnxt: add dev_supported_ptypes_get dev_op Ajit Khaparde
2017-09-28 21:43 ` [dpdk-dev] [PATCH v4 23/24] net/bnxt: add support for get/set EEPROM Ajit Khaparde
2017-09-28 21:43 ` [dpdk-dev] [PATCH v4 24/24] net/bnxt: add support for rx_queue_intr_enable/disable APIs Ajit Khaparde
2017-10-02 21:28 ` [dpdk-dev] [PATCH v4 00/24] 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=20170928214345.87655-15-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).