The fixed value of Rx burst threshold may not be optimal
for all the NIC speeds. For high speed NIC ports, like 400G
configure a higher Rx burst value.
Signed-off-by: Ajit Khaparde <ajit.khapa...@broadcom.com>
Reviewed-by: Kalesh AP <kalesh-anakkur.pura...@broadcom.com>
Reviewed-by: Somnath Kotur <somnath.ko...@broadcom.com>
Reviewed-by: Damodharam Ammepalli <damodharam.ammepa...@broadcom.com>
---
drivers/net/bnxt/bnxt_ethdev.c | 20 ++++++++++++++++++++
drivers/net/bnxt/bnxt_rxq.h | 1 +
drivers/net/bnxt/bnxt_rxtx_vec_avx2.c | 18 ++++++++++--------
drivers/net/bnxt/bnxt_rxtx_vec_neon.c | 9 +++++----
drivers/net/bnxt/bnxt_rxtx_vec_sse.c | 18 ++++++++++--------
5 files changed, 46 insertions(+), 20 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 144d4377bd..a0e3cd8bbe 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -1793,10 +1793,27 @@ int bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
return bnxt_dev_stop(eth_dev);
}
+static void bnxt_update_max_rx_burst(struct bnxt *bp, struct rte_eth_link
*link)
+{
+ if (link->link_speed == RTE_ETH_SPEED_NUM_400G) {
+ uint32_t i;
+
+ /* Faster port speed. Update threshold. Else use default. */
+ for (i = 0; i < bp->rx_nr_rings; i++) {
+ struct bnxt_rx_queue *rxq = bp->rx_queues[i];
+
+ rxq->rx_free_thresh =
+ RTE_MIN(rte_align32pow2(rxq->nb_rx_desc) / 4,
+ RTE_BNXT_MAX_RX_BURST_TH2);
+ }
+ }
+}
+
int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
{
struct bnxt *bp = eth_dev->data->dev_private;
uint64_t rx_offloads = eth_dev->data->dev_conf.rxmode.offloads;
+ struct rte_eth_link *link = ð_dev->data->dev_link;
int vlan_mask = 0;
int rc, retry_cnt = BNXT_IF_CHANGE_RETRY_COUNT;
@@ -1877,6 +1894,8 @@ int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
eth_dev->rx_pkt_burst = bnxt_receive_function(eth_dev);
eth_dev->tx_pkt_burst = bnxt_transmit_function(eth_dev);
+ bnxt_update_max_rx_burst(bp, link);
+
bnxt_schedule_fw_health_check(bp);
if (BNXT_P5_PTP_TIMESYNC_ENABLED(bp))
@@ -2114,6 +2133,7 @@ int bnxt_link_update_op(struct rte_eth_dev *eth_dev, int
wait_to_complete)
rte_eth_linkstatus_set(eth_dev, &new);
bnxt_print_link_info(eth_dev);
}
+ bnxt_update_max_rx_burst(bp, &new);
return rc;
}
diff --git a/drivers/net/bnxt/bnxt_rxq.h b/drivers/net/bnxt/bnxt_rxq.h
index 0b411a941a..cd49faf4cf 100644
--- a/drivers/net/bnxt/bnxt_rxq.h
+++ b/drivers/net/bnxt/bnxt_rxq.h
@@ -8,6 +8,7 @@
/* Maximum receive burst supported in vector mode. */
#define RTE_BNXT_MAX_RX_BURST 64U
+#define RTE_BNXT_MAX_RX_BURST_TH2 296U
/* Drop by default when receive desc is not available. */
#define BNXT_DEFAULT_RX_DROP_EN 1
diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_avx2.c
b/drivers/net/bnxt/bnxt_rxtx_vec_avx2.c
index 43d9528134..35550534de 100644
--- a/drivers/net/bnxt/bnxt_rxtx_vec_avx2.c
+++ b/drivers/net/bnxt/bnxt_rxtx_vec_avx2.c
@@ -660,18 +660,19 @@ uint16_t
bnxt_recv_pkts_vec_avx2(void *rx_queue, struct rte_mbuf **rx_pkts,
uint16_t nb_pkts)
{
+ struct bnxt_rx_queue *rxq = rx_queue;
+ uint32_t brst = rxq->rx_free_thresh;
uint16_t cnt = 0;
- while (nb_pkts > RTE_BNXT_MAX_RX_BURST) {
+ while (nb_pkts > brst) {
uint16_t burst;
- burst = recv_burst_vec_avx2(rx_queue, rx_pkts + cnt,
- RTE_BNXT_MAX_RX_BURST);
+ burst = recv_burst_vec_avx2(rx_queue, rx_pkts + cnt, brst);
cnt += burst;
nb_pkts -= burst;
- if (burst < RTE_BNXT_MAX_RX_BURST)
+ if (burst < brst)
return cnt;
}
return cnt + recv_burst_vec_avx2(rx_queue, rx_pkts + cnt, nb_pkts);
@@ -681,18 +682,19 @@ uint16_t
bnxt_crx_pkts_vec_avx2(void *rx_queue, struct rte_mbuf **rx_pkts,
uint16_t nb_pkts)
{
+ struct bnxt_rx_queue *rxq = rx_queue;
+ uint32_t brst = rxq->rx_free_thresh;
uint16_t cnt = 0;
- while (nb_pkts > RTE_BNXT_MAX_RX_BURST) {
+ while (nb_pkts > brst) {
uint16_t burst;
- burst = crx_burst_vec_avx2(rx_queue, rx_pkts + cnt,
- RTE_BNXT_MAX_RX_BURST);
+ burst = crx_burst_vec_avx2(rx_queue, rx_pkts + cnt, brst);
cnt += burst;
nb_pkts -= burst;
- if (burst < RTE_BNXT_MAX_RX_BURST)
+ if (burst < brst)
return cnt;
}
return cnt + crx_burst_vec_avx2(rx_queue, rx_pkts + cnt, nb_pkts);
diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c
b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c
index 840b21cef9..03f39280e5 100644
--- a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c
+++ b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c
@@ -317,18 +317,19 @@ recv_burst_vec_neon(void *rx_queue, struct rte_mbuf
**rx_pkts, uint16_t nb_pkts)
uint16_t
bnxt_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
{
+ struct bnxt_rx_queue *rxq = rx_queue;
+ uint32_t brst = rxq->rx_free_thresh;
uint16_t cnt = 0;
- while (nb_pkts > RTE_BNXT_MAX_RX_BURST) {
+ while (nb_pkts > brst) {
uint16_t burst;
- burst = recv_burst_vec_neon(rx_queue, rx_pkts + cnt,
- RTE_BNXT_MAX_RX_BURST);
+ burst = recv_burst_vec_neon(rx_queue, rx_pkts + cnt, brst);
cnt += burst;
nb_pkts -= burst;
- if (burst < RTE_BNXT_MAX_RX_BURST)
+ if (burst < brst)
return cnt;
}
diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
index c1c3e1ecaf..7d455b6f56 100644
--- a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
+++ b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
@@ -517,18 +517,19 @@ crx_burst_vec_sse(void *rx_queue, struct rte_mbuf
**rx_pkts, uint16_t nb_pkts)
uint16_t
bnxt_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
{
+ struct bnxt_rx_queue *rxq = rx_queue;
+ uint32_t brst = rxq->rx_free_thresh;
uint16_t cnt = 0;
- while (nb_pkts > RTE_BNXT_MAX_RX_BURST) {
+ while (nb_pkts > brst) {
uint16_t burst;
- burst = recv_burst_vec_sse(rx_queue, rx_pkts + cnt,
- RTE_BNXT_MAX_RX_BURST);
+ burst = recv_burst_vec_sse(rx_queue, rx_pkts + cnt, brst);
cnt += burst;
nb_pkts -= burst;
- if (burst < RTE_BNXT_MAX_RX_BURST)
+ if (burst < brst)
return cnt;
}
@@ -538,18 +539,19 @@ bnxt_recv_pkts_vec(void *rx_queue, struct rte_mbuf
**rx_pkts, uint16_t nb_pkts)
uint16_t
bnxt_crx_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
{
+ struct bnxt_rx_queue *rxq = rx_queue;
+ uint32_t brst = rxq->rx_free_thresh;
uint16_t cnt = 0;
- while (nb_pkts > RTE_BNXT_MAX_RX_BURST) {
+ while (nb_pkts > brst) {
uint16_t burst;
- burst = crx_burst_vec_sse(rx_queue, rx_pkts + cnt,
- RTE_BNXT_MAX_RX_BURST);
+ burst = crx_burst_vec_sse(rx_queue, rx_pkts + cnt, brst);
cnt += burst;
nb_pkts -= burst;
- if (burst < RTE_BNXT_MAX_RX_BURST)
+ if (burst < brst)
return cnt;
}
--
2.39.5 (Apple Git-154)
