[PATCH v12 15/15] net/enetc4: add WRR Tx scheduler devarg for VF rings
Gagandeep Singh
g.singh at nxp.com
Fri Aug 21 07:56:43 CEST 2026
Add enetc4_txq_wrr devarg to configure per-ring WRR weights in the
NETC LEAF-level Tx scheduler (TBaMR register, bits [6:4]).
The NETC Tx scheduler has three levels:
- ROOT (port/TC): strict priority + CBS (PF/port space)
- MID (SI/VSI): WBFS shaping (PF space)
- LEAF (Tx BDR): strict priority + frame-based WRR (VF/SI space)
TBaMR is in the VF own SI space, so no Linux PF involvement is
needed for PRIO or WRR configuration.
Changes:
- enetc_hw.h: add ENETC_TBMR_WRR_MASK, ENETC_TBMR_WRR(n) macros for
TBaMR bits [6:4], and ENETC_TBMR_PRIO_MASK for bits [2:0]
- enetc.h: add txq_wrr pointer to enetc_eth_hw struct
- enetc4_ethdev.c: add parse_txq_wrr() and wire ENETC4_TXQ_WRR devarg
through enetc4_get_devargs() and enetc4_dev_configure(); apply WRR
bits in enetc4_tx_queue_setup() and enetc4_tx_queue_start()
Usage:
# strict priority: ring 0 highest
-a 0002:00:12.0,enetc4_txq_prior="3|2|1"
# WRR 2:4:1 on same-priority rings
-a 0002:00:12.0,enetc4_txq_prior="1|1|1",enetc4_txq_wrr="2|4|1"
Signed-off-by: Gagandeep Singh <g.singh at nxp.com>
Acked-by: Hemant Agrawal <hemant.agrawal at nxp.com>
---
doc/guides/nics/enetc4.rst | 14 +++-
doc/guides/rel_notes/release_26_11.rst | 1 +
drivers/net/enetc/base/enetc_hw.h | 5 ++
drivers/net/enetc/enetc.h | 4 ++
drivers/net/enetc/enetc4_ethdev.c | 97 ++++++++++++++++++++------
drivers/net/enetc/enetc4_vf.c | 2 +
6 files changed, 102 insertions(+), 21 deletions(-)
diff --git a/doc/guides/nics/enetc4.rst b/doc/guides/nics/enetc4.rst
index 6c71108de6..64094c00a6 100644
--- a/doc/guides/nics/enetc4.rst
+++ b/doc/guides/nics/enetc4.rst
@@ -176,7 +176,19 @@ PF/Common devargs
Usage example::
- dpdk-testpmd -a 0000:00:00.0,enetc4_txq_prior=1|2|3 -- -i
+ dpdk-testpmd -a 0000:00:00.0,enetc4_txq_prior="1|2|3" -- -i
+
+``enetc4_txq_wrr``
+ Set per-queue WRR weight for the LEAF-level Tx scheduler (TBaMR bits [6:4]).
+ The value is a ``|``-separated list of WRR weights, one per Tx queue.
+ Meaningful only when the corresponding queues share the same strict-priority
+ level via ``enetc4_txq_prior``; queues with different priorities are
+ scheduled strictly regardless of their WRR weight.
+ Values beyond the maximum supported Tx queue count are discarded.
+
+ Usage example (WRR 2:4:1 on three equal-priority rings)::
+
+ dpdk-testpmd -a 0000:00:00.0,enetc4_txq_prior="1|1|1",enetc4_txq_wrr="2|4|1" -- -i
``nc``
Select non-cacheable Rx/Tx ops (BD rings mapped as non-cacheable memory).
diff --git a/doc/guides/rel_notes/release_26_11.rst b/doc/guides/rel_notes/release_26_11.rst
index f287390db7..2be5357af3 100644
--- a/doc/guides/rel_notes/release_26_11.rst
+++ b/doc/guides/rel_notes/release_26_11.rst
@@ -75,6 +75,7 @@ New Features
* Added SI-based port VLAN insertion (Tx) and removal (Rx) for ENETC4 PF and VF.
* Updated ENETC4 VF link status reporting to use bitmask encoding.
* Added Tx PAUSE support for the ENETC4 VF via Rx congestion mode.
+ * Added WRR Tx scheduler devarg (``enetc4_txq_wrr``) for ENETC4 VF ring weights.
Removed Items
-------------
diff --git a/drivers/net/enetc/base/enetc_hw.h b/drivers/net/enetc/base/enetc_hw.h
index 33d075fe59..3065c16e5c 100644
--- a/drivers/net/enetc/base/enetc_hw.h
+++ b/drivers/net/enetc/base/enetc_hw.h
@@ -86,6 +86,11 @@ enum enetc_bdr_type {TX, RX};
#define ENETC_RTBLENR_LEN(n) ((n) & ~0x7)
#define ENETC_TBMR_EN BIT(31)
+/* TBaMR[WRR] bits [6:4]: weight for same-priority ring arbitration (0=1x .. 7=8x). */
+#define ENETC_TBMR_WRR_MASK 0x70
+#define ENETC_TBMR_WRR(n) ((((n) - 1) & 0x7) << 4)
+/* TBaMR[PRIO] bits [2:0]: strict priority (0=lowest, 7=highest). */
+#define ENETC_TBMR_PRIO_MASK 0x7
/* Port regs, offset: 1_0000h */
#define ENETC_PORT_BASE 0x10000
diff --git a/drivers/net/enetc/enetc.h b/drivers/net/enetc/enetc.h
index c528d21b73..925ba22af6 100644
--- a/drivers/net/enetc/enetc.h
+++ b/drivers/net/enetc/enetc.h
@@ -53,6 +53,9 @@
/* size for marking hugepage non-cacheable */
#define SIZE_2MB 0x200000
+#define ENETC4_TXQ_PRIORITIES "enetc4_txq_prior"
+#define ENETC4_TXQ_WRR "enetc4_txq_wrr"
+
#define ENETC_TXBD(BDR, i) (&(((struct enetc_tx_bd *)((BDR).bd_base))[i]))
#define ENETC_RXBD(BDR, i) (&(((union enetc_rx_bd *)((BDR).bd_base))[i]))
@@ -135,6 +138,7 @@ struct enetc_eth_hw {
uint32_t vsi_timeout; /* VSI-PSI message wait timeout (iterations) */
uint32_t vsi_delay; /* VSI-PSI message wait delay (us) */
uint32_t *txq_prior; /* per-queue TX priority (TBMR priority bits) */
+ uint32_t *txq_wrr; /* per-queue TX WRR weight pre-shifted for TBMR[WRR] */
uint8_t nc_mode; /* 1 = non-cacheable BD memory, use _nc ops */
uint8_t rxq_intr_en; /* 1 = per-queue Rx MSI-X interrupts enabled */
/* 1 = legacy PF-to-VF link message layout (4-bit speed / 4-bit cookie),
diff --git a/drivers/net/enetc/enetc4_ethdev.c b/drivers/net/enetc/enetc4_ethdev.c
index ad6f5f4337..bb579a0b90 100644
--- a/drivers/net/enetc/enetc4_ethdev.c
+++ b/drivers/net/enetc/enetc4_ethdev.c
@@ -47,7 +47,6 @@ static uint64_t dev_tx_offloads_sup =
RTE_ETH_TX_OFFLOAD_TCP_TSO |
RTE_ETH_TX_OFFLOAD_UDP_TSO;
-#define ENETC4_TXQ_PRIORITIES "enetc4_txq_prior"
#define ENETC4_NC_MEMORY "nc"
static int
@@ -55,15 +54,17 @@ parse_txq_prior(const char *key __rte_unused, const char *value, void *opaque)
{
struct rte_eth_dev *dev = (struct rte_eth_dev *)opaque;
struct enetc_eth_hw *hw =
- ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private);
- char *input_str = strdup(value);
+ ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ char *input_str;
char *str;
uint32_t i = 0;
+ input_str = strdup(value);
if (!input_str)
return -ENOMEM;
- hw->txq_prior = calloc(hw->max_tx_queues, sizeof(uint32_t));
+ rte_free(hw->txq_prior);
+ hw->txq_prior = rte_zmalloc(NULL, hw->max_tx_queues * sizeof(uint32_t), 0);
if (!hw->txq_prior) {
free(input_str);
return -ENOMEM;
@@ -71,7 +72,46 @@ parse_txq_prior(const char *key __rte_unused, const char *value, void *opaque)
str = strtok(input_str, "|");
while (str != NULL && i < hw->max_tx_queues) {
- hw->txq_prior[i++] = (uint32_t)atoi(str);
+ hw->txq_prior[i++] = atoi(str) & ENETC_TBMR_PRIO_MASK;
+ str = strtok(NULL, "|");
+ }
+
+ free(input_str);
+ return 0;
+}
+
+/* Parse enetc4_txq_wrr="w0|w1|..." devarg; weight 1..8 per ring. */
+static int parse_txq_wrr(const char *key __rte_unused, const char *value,
+ void *opaque)
+{
+ struct rte_eth_dev *dev = (struct rte_eth_dev *)opaque;
+ struct enetc_eth_hw *hw =
+ ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ char *input_str;
+ char *str;
+ uint32_t i = 0;
+ int w;
+
+ input_str = strdup(value);
+ if (!input_str)
+ return -ENOMEM;
+
+ rte_free(hw->txq_wrr);
+ hw->txq_wrr = rte_zmalloc(NULL,
+ hw->max_tx_queues * sizeof(uint32_t), 0);
+ if (!hw->txq_wrr) {
+ free(input_str);
+ return -ENOMEM;
+ }
+
+ str = strtok(input_str, "|");
+ while (str != NULL && i < hw->max_tx_queues) {
+ w = atoi(str);
+ if (w < 1)
+ w = 1;
+ if (w > 8)
+ w = 8;
+ hw->txq_wrr[i++] = ENETC_TBMR_WRR(w);
str = strtok(NULL, "|");
}
@@ -117,6 +157,13 @@ enetc4_get_devargs(struct rte_eth_dev *dev, const char *key)
return 0;
}
}
+ if (!strcmp(key, ENETC4_TXQ_WRR)) {
+ if (rte_kvargs_process(kvlist, key,
+ parse_txq_wrr, (void *)dev) < 0) {
+ rte_kvargs_free(kvlist);
+ return 0;
+ }
+ }
if (!strcmp(key, ENETC4_NC_MEMORY)) {
if (rte_kvargs_process(kvlist, key,
parse_nc, (void *)dev) < 0) {
@@ -469,14 +516,17 @@ enetc4_tx_queue_setup(struct rte_eth_dev *dev,
data->tx_queues[queue_idx] = tx_ring;
tx_ring->tx_deferred_start = tx_conf->tx_deferred_start;
if (!tx_conf->tx_deferred_start) {
- uint32_t tx_en = ENETC_TBMR_EN;
-
+ /* Clear scheduler bits before applying fresh devarg values. */
+ tx_data &= ~(ENETC_TBMR_PRIO_MASK | ENETC_TBMR_WRR_MASK);
+ tx_data |= ENETC_TBMR_EN;
/* apply TX queue priority if configured */
if (priv->hw.txq_prior)
- tx_en |= priv->hw.txq_prior[tx_ring->index];
+ tx_data |= priv->hw.txq_prior[tx_ring->index];
+ if (priv->hw.txq_wrr)
+ tx_data |= priv->hw.txq_wrr[tx_ring->index];
/* enable ring */
enetc4_txbdr_wr(&priv->hw.hw, tx_ring->index,
- ENETC_TBMR, tx_en);
+ ENETC_TBMR, tx_data);
dev->data->tx_queue_state[tx_ring->index] =
RTE_ETH_QUEUE_STATE_STARTED;
} else {
@@ -918,7 +968,10 @@ enetc4_dev_close(struct rte_eth_dev *dev)
dev->data->tx_queues[i] = NULL;
}
dev->data->nb_tx_queues = 0;
-
+ rte_free(hw->txq_prior);
+ hw->txq_prior = NULL;
+ rte_free(hw->txq_wrr);
+ hw->txq_wrr = NULL;
if (rte_eal_iova_mode() == RTE_IOVA_PA)
dpaax_iova_table_depopulate();
@@ -1073,7 +1126,12 @@ enetc4_dev_configure(struct rte_eth_dev *dev)
enetc4_rxbdr_wr(enetc_hw, i, ENETC_RBMR, ENETC_BMR_RESET);
for (i = 0; i < dev->data->nb_tx_queues; i++)
- enetc4_rxbdr_wr(enetc_hw, i, ENETC_TBMR, ENETC_BMR_RESET);
+ enetc4_txbdr_wr(enetc_hw, i, ENETC_TBMR, ENETC_BMR_RESET);
+
+ hw->nc_mode = 0;
+ enetc4_get_devargs(dev, ENETC4_TXQ_PRIORITIES);
+ enetc4_get_devargs(dev, ENETC4_TXQ_WRR);
+ enetc4_get_devargs(dev, ENETC4_NC_MEMORY);
if (dev->data->nb_rx_queues <= 1)
return 0;
@@ -1206,7 +1264,13 @@ enetc4_tx_queue_start(struct rte_eth_dev *dev, uint16_t qidx)
if (dev->data->tx_queue_state[qidx] == RTE_ETH_QUEUE_STATE_STOPPED) {
tx_data = enetc4_txbdr_rd(&priv->hw.hw, tx_ring->index,
ENETC_TBMR);
- tx_data = tx_data | ENETC_TBMR_EN;
+ /* Clear scheduler bits before applying fresh devarg values. */
+ tx_data &= ~(ENETC_TBMR_PRIO_MASK | ENETC_TBMR_WRR_MASK);
+ tx_data |= ENETC_TBMR_EN;
+ if (priv->hw.txq_prior)
+ tx_data |= priv->hw.txq_prior[tx_ring->index];
+ if (priv->hw.txq_wrr)
+ tx_data |= priv->hw.txq_wrr[tx_ring->index];
enetc4_txbdr_wr(&priv->hw.hw, tx_ring->index, ENETC_TBMR,
tx_data);
dev->data->tx_queue_state[qidx] = RTE_ETH_QUEUE_STATE_STARTED;
@@ -1508,16 +1572,8 @@ enetc4_dev_init(struct rte_eth_dev *eth_dev)
static int
enetc4_dev_uninit(struct rte_eth_dev *eth_dev)
{
- struct enetc_eth_hw *hw =
- ENETC_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
-
PMD_INIT_FUNC_TRACE();
- if (hw->txq_prior) {
- free(hw->txq_prior);
- hw->txq_prior = NULL;
- }
-
return enetc4_dev_close(eth_dev);
}
@@ -1548,5 +1604,6 @@ RTE_PMD_REGISTER_PCI_TABLE(net_enetc4, pci_id_enetc4_map);
RTE_PMD_REGISTER_KMOD_DEP(net_enetc4, "* vfio-pci");
RTE_PMD_REGISTER_PARAM_STRING(net_enetc4,
ENETC4_TXQ_PRIORITIES "=<string> "
+ ENETC4_TXQ_WRR "=<string> "
ENETC4_NC_MEMORY "=<int>");
RTE_LOG_REGISTER_DEFAULT(enetc4_logtype_pmd, NOTICE);
diff --git a/drivers/net/enetc/enetc4_vf.c b/drivers/net/enetc/enetc4_vf.c
index a93aa20b49..6eb1e5d760 100644
--- a/drivers/net/enetc/enetc4_vf.c
+++ b/drivers/net/enetc/enetc4_vf.c
@@ -2208,5 +2208,7 @@ RTE_PMD_REGISTER_PARAM_STRING(net_enetc4_vf,
ENETC4_VSI_TIMEOUT "=<uint> "
ENETC4_VSI_DELAY "=<uint> "
ENETC4_NC_MEMORY "=<int> "
+ ENETC4_TXQ_PRIORITIES "=<string> "
+ ENETC4_TXQ_WRR "=<string> "
ENETC_VF_LINK_LEGACY "=<0|1>");
RTE_LOG_REGISTER_DEFAULT(enetc4_vf_logtype_pmd, NOTICE);
--
2.25.1
More information about the dev
mailing list