[PATCH v2 08/13] net/ngbe: check length of Tx packets
Add checking of the Tx packet length to avoid TDM fatal error as far as
possible. Set the pkt_len=1518 for invalid packet in simple Tx code path,
and drop it directly in featured Tx code path. Althrough the hardware
does not support TDM desc check.
Signed-off-by: Jiawen Wu
---
drivers/net/ngbe/ngbe_rxtx.c | 33 +++
drivers/net/ngbe/ngbe_rxtx_vec_neon.c | 10 +---
drivers/net/ngbe/ngbe_rxtx_vec_sse.c | 11 ++---
3 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ngbe/ngbe_rxtx.c b/drivers/net/ngbe/ngbe_rxtx.c
index f3eb797d0c..25a314f10a 100644
--- a/drivers/net/ngbe/ngbe_rxtx.c
+++ b/drivers/net/ngbe/ngbe_rxtx.c
@@ -113,6 +113,8 @@ tx4(volatile struct ngbe_tx_desc *txdp, struct rte_mbuf
**pkts)
for (i = 0; i < 4; ++i, ++txdp, ++pkts) {
buf_dma_addr = rte_mbuf_data_iova(*pkts);
pkt_len = (*pkts)->data_len;
+ if (pkt_len < RTE_ETHER_HDR_LEN)
+ pkt_len = NGBE_FRAME_SIZE_DFT;
/* write data to descriptor */
txdp->qw0 = rte_cpu_to_le_64(buf_dma_addr);
@@ -133,6 +135,8 @@ tx1(volatile struct ngbe_tx_desc *txdp, struct rte_mbuf
**pkts)
buf_dma_addr = rte_mbuf_data_iova(*pkts);
pkt_len = (*pkts)->data_len;
+ if (pkt_len < RTE_ETHER_HDR_LEN)
+ pkt_len = NGBE_FRAME_SIZE_DFT;
/* write data to descriptor */
txdp->qw0 = cpu_to_le64(buf_dma_addr);
@@ -555,6 +559,30 @@ ngbe_xmit_cleanup(struct ngbe_tx_queue *txq)
return 0;
}
+static inline bool
+ngbe_check_pkt_err(struct rte_mbuf *tx_pkt)
+{
+ uint32_t total_len = 0, nb_seg = 0;
+ struct rte_mbuf *mseg;
+
+ mseg = tx_pkt;
+ do {
+ if (mseg->data_len == 0)
+ return true;
+ total_len += mseg->data_len;
+ nb_seg++;
+ mseg = mseg->next;
+ } while (mseg != NULL);
+
+ if (tx_pkt->pkt_len != total_len || tx_pkt->pkt_len == 0)
+ return true;
+
+ if (tx_pkt->nb_segs != nb_seg || tx_pkt->nb_segs > 64)
+ return true;
+
+ return false;
+}
+
uint16_t
ngbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
uint16_t nb_pkts)
@@ -599,6 +627,11 @@ ngbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
for (nb_tx = 0; nb_tx < nb_pkts; nb_tx++) {
new_ctx = 0;
tx_pkt = *tx_pkts++;
+ if (ngbe_check_pkt_err(tx_pkt)) {
+ rte_pktmbuf_free(tx_pkt);
+ continue;
+ }
+
pkt_len = tx_pkt->pkt_len;
/*
diff --git a/drivers/net/ngbe/ngbe_rxtx_vec_neon.c
b/drivers/net/ngbe/ngbe_rxtx_vec_neon.c
index dcf12b7070..37075ea5e7 100644
--- a/drivers/net/ngbe/ngbe_rxtx_vec_neon.c
+++ b/drivers/net/ngbe/ngbe_rxtx_vec_neon.c
@@ -476,9 +476,13 @@ static inline void
vtx1(volatile struct ngbe_tx_desc *txdp,
struct rte_mbuf *pkt, uint64_t flags)
{
- uint64x2_t descriptor = {
- pkt->buf_iova + pkt->data_off,
- (uint64_t)pkt->pkt_len << 45 | flags | pkt->data_len};
+ uint16_t pkt_len = pkt->data_len;
+
+ if (pkt_len < RTE_ETHER_HDR_LEN)
+ pkt_len = NGBE_FRAME_SIZE_DFT;
+
+ uint64x2_t descriptor = {pkt->buf_iova + pkt->data_off,
+ (uint64_t)pkt_len << 45 | flags | pkt_len};
vst1q_u64((uint64_t *)(uintptr_t)txdp, descriptor);
}
diff --git a/drivers/net/ngbe/ngbe_rxtx_vec_sse.c
b/drivers/net/ngbe/ngbe_rxtx_vec_sse.c
index b128bd3a67..19c69cdfa6 100644
--- a/drivers/net/ngbe/ngbe_rxtx_vec_sse.c
+++ b/drivers/net/ngbe/ngbe_rxtx_vec_sse.c
@@ -563,9 +563,14 @@ static inline void
vtx1(volatile struct ngbe_tx_desc *txdp,
struct rte_mbuf *pkt, uint64_t flags)
{
- __m128i descriptor = _mm_set_epi64x((uint64_t)pkt->pkt_len << 45 |
- flags | pkt->data_len,
- pkt->buf_iova + pkt->data_off);
+ uint16_t pkt_len = pkt->data_len;
+ __m128i descriptor;
+
+ if (pkt_len < RTE_ETHER_HDR_LEN)
+ pkt_len = NGBE_FRAME_SIZE_DFT;
+
+ descriptor = _mm_set_epi64x((uint64_t)pkt_len << 45 | flags | pkt_len,
+ pkt->buf_iova + pkt->data_off);
_mm_store_si128((__m128i *)(uintptr_t)txdp, descriptor);
}
--
2.27.0
[PATCH v2 00/13] Wangxun fixes
Fix some bugs in txgbe/ngbe, and optimize the Tx flow. v1 -> v2: - Fix build errors on ARM platform. Jiawen Wu (13): net/txgbe: fix swfw mbox failure net/txgbe: fix VF-PF mbox interrupt net/txgbe: remove outer UDP checksum capability net/txgbe: fix driver load bit to inform firmware net/txgbe: enable Tx descriptor error interrupt net/txgbe: check length of Tx packets net/txgbe: add Tx descriptor error statistics net/ngbe: check length of Tx packets net/ngbe: add Tx descriptor error statistics net/ngbe: fix driver load bit to inform firmware net/ngbe: reconfigure more MAC Rx registers net/ngbe: fix interrupt lost in legacy or MSI mode net/ngbe: restrict configuration of VLAN strip offload drivers/net/ngbe/base/ngbe_regs.h | 2 + drivers/net/ngbe/ngbe_ethdev.c | 79 +- drivers/net/ngbe/ngbe_rxtx.c| 35 ++ drivers/net/ngbe/ngbe_rxtx.h| 1 + drivers/net/ngbe/ngbe_rxtx_vec_neon.c | 10 +- drivers/net/ngbe/ngbe_rxtx_vec_sse.c| 11 +- drivers/net/txgbe/base/txgbe_mng.c | 1 + drivers/net/txgbe/base/txgbe_regs.h | 8 +- drivers/net/txgbe/txgbe_ethdev.c| 75 + drivers/net/txgbe/txgbe_ethdev.h| 3 + drivers/net/txgbe/txgbe_rxtx.c | 139 +++- drivers/net/txgbe/txgbe_rxtx.h | 2 + drivers/net/txgbe/txgbe_rxtx_vec_neon.c | 10 +- drivers/net/txgbe/txgbe_rxtx_vec_sse.c | 11 +- 14 files changed, 343 insertions(+), 44 deletions(-) -- 2.27.0
[PATCH v2 03/13] net/txgbe: remove outer UDP checksum capability
The hardware does not support outer UDP checksum for tunnel packets.
It's wrong to claim this Tx offload capability, so fix it.
Bugzilla ID: 1529
Fixes: b950203be7f1 ("net/txgbe: support VXLAN-GPE")
Fixes: 295968d17407 ("ethdev: add namespace")
Cc: sta...@dpdk.org
Signed-off-by: Jiawen Wu
---
drivers/net/txgbe/txgbe_rxtx.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/txgbe/txgbe_rxtx.c b/drivers/net/txgbe/txgbe_rxtx.c
index 5bc0f8772f..c12726553c 100644
--- a/drivers/net/txgbe/txgbe_rxtx.c
+++ b/drivers/net/txgbe/txgbe_rxtx.c
@@ -2284,8 +2284,7 @@ txgbe_get_tx_port_offloads(struct rte_eth_dev *dev)
tx_offload_capa |= RTE_ETH_TX_OFFLOAD_MACSEC_INSERT;
- tx_offload_capa |= RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM |
- RTE_ETH_TX_OFFLOAD_OUTER_UDP_CKSUM;
+ tx_offload_capa |= RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM;
#ifdef RTE_LIB_SECURITY
if (dev->security_ctx)
--
2.27.0
[PATCH v2 07/13] net/txgbe: add Tx descriptor error statistics
Count the number of packets not sent due to Tx descriptor error.
Signed-off-by: Jiawen Wu
---
drivers/net/txgbe/txgbe_ethdev.c | 6 ++
drivers/net/txgbe/txgbe_rxtx.c | 3 +++
drivers/net/txgbe/txgbe_rxtx.h | 1 +
3 files changed, 10 insertions(+)
diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index bafa9cf829..0c76e986f4 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -2344,6 +2344,7 @@ txgbe_dev_stats_get(struct rte_eth_dev *dev, struct
rte_eth_stats *stats)
struct txgbe_hw_stats *hw_stats = TXGBE_DEV_STATS(dev);
struct txgbe_stat_mappings *stat_mappings =
TXGBE_DEV_STAT_MAPPINGS(dev);
+ struct txgbe_tx_queue *txq;
uint32_t i, j;
txgbe_read_stats_registers(hw, hw_stats);
@@ -2398,6 +2399,11 @@ txgbe_dev_stats_get(struct rte_eth_dev *dev, struct
rte_eth_stats *stats)
/* Tx Errors */
stats->oerrors = 0;
+ for (i = 0; i < dev->data->nb_tx_queues; i++) {
+ txq = dev->data->tx_queues[i];
+ stats->oerrors += txq->desc_error;
+ }
+
return 0;
}
diff --git a/drivers/net/txgbe/txgbe_rxtx.c b/drivers/net/txgbe/txgbe_rxtx.c
index 06acbd0881..fc9e7b14f5 100644
--- a/drivers/net/txgbe/txgbe_rxtx.c
+++ b/drivers/net/txgbe/txgbe_rxtx.c
@@ -894,6 +894,7 @@ txgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
tx_pkt = *tx_pkts++;
if (txgbe_check_pkt_err(tx_pkt)) {
rte_pktmbuf_free(tx_pkt);
+ txq->desc_error++;
continue;
}
@@ -2523,6 +2524,7 @@ txgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
txgbe_set_tx_function(dev, txq);
txq->ops->reset(txq);
+ txq->desc_error = 0;
dev->data->tx_queues[queue_idx] = txq;
@@ -4980,6 +4982,7 @@ txgbe_tx_queue_clear_error(void *param)
if (!txq->resetting)
continue;
+ txq->desc_error++;
txgbe_dev_save_tx_queue(hw, i);
/* tx ring reset */
diff --git a/drivers/net/txgbe/txgbe_rxtx.h b/drivers/net/txgbe/txgbe_rxtx.h
index e668b60b1e..622a0d3981 100644
--- a/drivers/net/txgbe/txgbe_rxtx.h
+++ b/drivers/net/txgbe/txgbe_rxtx.h
@@ -412,6 +412,7 @@ struct txgbe_tx_queue {
/**< indicates that IPsec TX feature is in use */
#endif
const struct rte_memzone *mz;
+ uint64_tdesc_error;
boolresetting;
};
--
2.27.0
[PATCH v2 09/13] net/ngbe: add Tx descriptor error statistics
Count the number of packets not sent due to Tx descriptor error.
Signed-off-by: Jiawen Wu
---
drivers/net/ngbe/ngbe_ethdev.c | 6 ++
drivers/net/ngbe/ngbe_rxtx.c | 2 ++
drivers/net/ngbe/ngbe_rxtx.h | 1 +
3 files changed, 9 insertions(+)
diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c
index 6c45ffaad3..d9d2daf656 100644
--- a/drivers/net/ngbe/ngbe_ethdev.c
+++ b/drivers/net/ngbe/ngbe_ethdev.c
@@ -1507,6 +1507,7 @@ ngbe_dev_stats_get(struct rte_eth_dev *dev, struct
rte_eth_stats *stats)
struct ngbe_hw_stats *hw_stats = NGBE_DEV_STATS(dev);
struct ngbe_stat_mappings *stat_mappings =
NGBE_DEV_STAT_MAPPINGS(dev);
+ struct ngbe_tx_queue *txq;
uint32_t i, j;
ngbe_read_stats_registers(hw, hw_stats);
@@ -1559,6 +1560,11 @@ ngbe_dev_stats_get(struct rte_eth_dev *dev, struct
rte_eth_stats *stats)
/* Tx Errors */
stats->oerrors = 0;
+ for (i = 0; i < dev->data->nb_tx_queues; i++) {
+ txq = dev->data->tx_queues[i];
+ stats->oerrors += txq->desc_error;
+ }
+
return 0;
}
diff --git a/drivers/net/ngbe/ngbe_rxtx.c b/drivers/net/ngbe/ngbe_rxtx.c
index 25a314f10a..8d31d47de9 100644
--- a/drivers/net/ngbe/ngbe_rxtx.c
+++ b/drivers/net/ngbe/ngbe_rxtx.c
@@ -629,6 +629,7 @@ ngbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
tx_pkt = *tx_pkts++;
if (ngbe_check_pkt_err(tx_pkt)) {
rte_pktmbuf_free(tx_pkt);
+ txq->desc_error++;
continue;
}
@@ -2100,6 +2101,7 @@ ngbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
ngbe_set_tx_function(dev, txq);
txq->ops->reset(txq);
+ txq->desc_error = 0;
dev->data->tx_queues[queue_idx] = txq;
diff --git a/drivers/net/ngbe/ngbe_rxtx.h b/drivers/net/ngbe/ngbe_rxtx.h
index 7574db32d8..8534ec123a 100644
--- a/drivers/net/ngbe/ngbe_rxtx.h
+++ b/drivers/net/ngbe/ngbe_rxtx.h
@@ -375,6 +375,7 @@ struct ngbe_tx_queue {
const struct ngbe_txq_ops *ops; /**< txq ops */
const struct rte_memzone *mz;
+ uint64_tdesc_error;
};
struct ngbe_txq_ops {
--
2.27.0
[PATCH v2 10/13] net/ngbe: fix driver load bit to inform firmware
Drv_load bit will be reset to default 0 after hardware LAN reset,
reconfigure it to inform firmware that driver is loaded. And set it to 0
when device is closed.
Fixes: 3518df5774c7 ("net/ngbe: support device start/stop")
Fixes: cc63194e89cb ("net/ngbe: support close and reset device")
Cc: sta...@dpdk.org
Signed-off-by: Jiawen Wu
---
drivers/net/ngbe/ngbe_ethdev.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c
index d9d2daf656..ba46dcf2a5 100644
--- a/drivers/net/ngbe/ngbe_ethdev.c
+++ b/drivers/net/ngbe/ngbe_ethdev.c
@@ -263,6 +263,8 @@ ngbe_pf_reset_hw(struct ngbe_hw *hw)
status = hw->mac.reset_hw(hw);
ctrl_ext = rd32(hw, NGBE_PORTCTL);
+ /* let hardware know driver is loaded */
+ ctrl_ext |= NGBE_PORTCTL_DRVLOAD;
/* Set PF Reset Done bit so PF/VF Mail Ops can work */
ctrl_ext |= NGBE_PORTCTL_RSTDONE;
wr32(hw, NGBE_PORTCTL, ctrl_ext);
@@ -1277,6 +1279,9 @@ ngbe_dev_close(struct rte_eth_dev *dev)
ngbe_dev_stop(dev);
+ /* Let firmware take over control of hardware */
+ wr32m(hw, NGBE_PORTCTL, NGBE_PORTCTL_DRVLOAD, 0);
+
ngbe_dev_free_queues(dev);
ngbe_set_pcie_master(hw, false);
--
2.27.0
[PATCH v2 04/13] net/txgbe: fix driver load bit to inform firmware
Drv_load bit will be reset to default 0 after hardware LAN reset,
reconfigure it to inform firmware that driver is loaded. And set it to 0
when device is closed.
Fixes: b1f596677d8e ("net/txgbe: support device start")
Cc: sta...@dpdk.org
Signed-off-by: Jiawen Wu
---
drivers/net/txgbe/txgbe_ethdev.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index 2834468764..4aa3bfd0bc 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -331,6 +331,8 @@ txgbe_pf_reset_hw(struct txgbe_hw *hw)
status = hw->mac.reset_hw(hw);
ctrl_ext = rd32(hw, TXGBE_PORTCTL);
+ /* let hardware know driver is loaded */
+ ctrl_ext |= TXGBE_PORTCTL_DRVLOAD;
/* Set PF Reset Done bit so PF/VF Mail Ops can work */
ctrl_ext |= TXGBE_PORTCTL_RSTDONE;
wr32(hw, TXGBE_PORTCTL, ctrl_ext);
@@ -2061,6 +2063,9 @@ txgbe_dev_close(struct rte_eth_dev *dev)
ret = txgbe_dev_stop(dev);
+ /* Let firmware take over control of hardware */
+ wr32m(hw, TXGBE_PORTCTL, TXGBE_PORTCTL_DRVLOAD, 0);
+
txgbe_dev_free_queues(dev);
txgbe_set_pcie_master(hw, false);
--
2.27.0
[PATCH v2 06/13] net/txgbe: check length of Tx packets
Add checking of the Tx packet length to avoid TDM fatal error as far as
possible. Set the pkt_len=1518 for invalid packet in simple Tx code path,
and drop it directly in featured Tx code path.
Signed-off-by: Jiawen Wu
---
drivers/net/txgbe/txgbe_rxtx.c | 33 +
drivers/net/txgbe/txgbe_rxtx_vec_neon.c | 10 +---
drivers/net/txgbe/txgbe_rxtx_vec_sse.c | 11 ++---
3 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/drivers/net/txgbe/txgbe_rxtx.c b/drivers/net/txgbe/txgbe_rxtx.c
index 2d2b437643..06acbd0881 100644
--- a/drivers/net/txgbe/txgbe_rxtx.c
+++ b/drivers/net/txgbe/txgbe_rxtx.c
@@ -160,6 +160,8 @@ tx4(volatile struct txgbe_tx_desc *txdp, struct rte_mbuf
**pkts)
for (i = 0; i < 4; ++i, ++txdp, ++pkts) {
buf_dma_addr = rte_mbuf_data_iova(*pkts);
pkt_len = (*pkts)->data_len;
+ if (pkt_len < RTE_ETHER_HDR_LEN)
+ pkt_len = TXGBE_FRAME_SIZE_DFT;
/* write data to descriptor */
txdp->qw0 = rte_cpu_to_le_64(buf_dma_addr);
@@ -180,6 +182,8 @@ tx1(volatile struct txgbe_tx_desc *txdp, struct rte_mbuf
**pkts)
buf_dma_addr = rte_mbuf_data_iova(*pkts);
pkt_len = (*pkts)->data_len;
+ if (pkt_len < RTE_ETHER_HDR_LEN)
+ pkt_len = TXGBE_FRAME_SIZE_DFT;
/* write data to descriptor */
txdp->qw0 = cpu_to_le64(buf_dma_addr);
@@ -813,6 +817,30 @@ txgbe_parse_tun_ptid(struct rte_mbuf *tx_pkt, uint8_t
tun_len)
return ptid;
}
+static inline bool
+txgbe_check_pkt_err(struct rte_mbuf *tx_pkt)
+{
+ uint32_t total_len = 0, nb_seg = 0;
+ struct rte_mbuf *mseg;
+
+ mseg = tx_pkt;
+ do {
+ if (mseg->data_len == 0)
+ return true;
+ total_len += mseg->data_len;
+ nb_seg++;
+ mseg = mseg->next;
+ } while (mseg != NULL);
+
+ if (tx_pkt->pkt_len != total_len || tx_pkt->pkt_len == 0)
+ return true;
+
+ if (tx_pkt->nb_segs != nb_seg || tx_pkt->nb_segs > 64)
+ return true;
+
+ return false;
+}
+
uint16_t
txgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
uint16_t nb_pkts)
@@ -864,6 +892,11 @@ txgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
for (nb_tx = 0; nb_tx < nb_pkts; nb_tx++) {
new_ctx = 0;
tx_pkt = *tx_pkts++;
+ if (txgbe_check_pkt_err(tx_pkt)) {
+ rte_pktmbuf_free(tx_pkt);
+ continue;
+ }
+
pkt_len = tx_pkt->pkt_len;
/*
diff --git a/drivers/net/txgbe/txgbe_rxtx_vec_neon.c
b/drivers/net/txgbe/txgbe_rxtx_vec_neon.c
index a96baf9b1d..d4d647fab5 100644
--- a/drivers/net/txgbe/txgbe_rxtx_vec_neon.c
+++ b/drivers/net/txgbe/txgbe_rxtx_vec_neon.c
@@ -476,9 +476,13 @@ static inline void
vtx1(volatile struct txgbe_tx_desc *txdp,
struct rte_mbuf *pkt, uint64_t flags)
{
- uint64x2_t descriptor = {
- pkt->buf_iova + pkt->data_off,
- (uint64_t)pkt->pkt_len << 45 | flags | pkt->data_len};
+ uint16_t pkt_len = pkt->data_len;
+
+ if (pkt_len < RTE_ETHER_HDR_LEN)
+ pkt_len = TXGBE_FRAME_SIZE_DFT;
+
+ uint64x2_t descriptor = {pkt->buf_iova + pkt->data_off,
+ (uint64_t)pkt_len << 45 | flags | pkt_len};
vst1q_u64((uint64_t *)(uintptr_t)txdp, descriptor);
}
diff --git a/drivers/net/txgbe/txgbe_rxtx_vec_sse.c
b/drivers/net/txgbe/txgbe_rxtx_vec_sse.c
index 1a3f2ce3cd..8ecce33471 100644
--- a/drivers/net/txgbe/txgbe_rxtx_vec_sse.c
+++ b/drivers/net/txgbe/txgbe_rxtx_vec_sse.c
@@ -607,9 +607,14 @@ static inline void
vtx1(volatile struct txgbe_tx_desc *txdp,
struct rte_mbuf *pkt, uint64_t flags)
{
- __m128i descriptor = _mm_set_epi64x((uint64_t)pkt->pkt_len << 45 |
- flags | pkt->data_len,
- pkt->buf_iova + pkt->data_off);
+ uint16_t pkt_len = pkt->data_len;
+ __m128i descriptor;
+
+ if (pkt_len < RTE_ETHER_HDR_LEN)
+ pkt_len = TXGBE_FRAME_SIZE_DFT;
+
+ descriptor = _mm_set_epi64x((uint64_t)pkt_len << 45 | flags | pkt_len,
+ pkt->buf_iova + pkt->data_off);
_mm_store_si128((__m128i *)(uintptr_t)txdp, descriptor);
}
--
2.27.0
[PATCH v2 05/13] net/txgbe: enable Tx descriptor error interrupt
Enable Tdm_desc_chk then handle the interrupt of TDM desc error. If it's a
non-fatal error, clear the error to reset the queue. If it's a fatal error,
require users to manually restart the port. This flow prevents the hardware
from PCIe pending due to Tx hang, resulting in a reboot to recover.
But remarkably, when packet layer length does not match the packet type in
TX descriptor, it will cause non-fatal error if Tdm_desc_chk is enabled.
But it can be transmitted normally if Tdm_desc_chk is disabled. So in order
to prevent hardware over check, fix the layer length on the basis of packet
type.
Signed-off-by: Jiawen Wu
---
drivers/net/txgbe/base/txgbe_regs.h | 6 ++
drivers/net/txgbe/txgbe_ethdev.c| 64 ++
drivers/net/txgbe/txgbe_ethdev.h| 3 +
drivers/net/txgbe/txgbe_rxtx.c | 100
drivers/net/txgbe/txgbe_rxtx.h | 1 +
5 files changed, 174 insertions(+)
diff --git a/drivers/net/txgbe/base/txgbe_regs.h
b/drivers/net/txgbe/base/txgbe_regs.h
index b46d65331e..7a9ba6976f 100644
--- a/drivers/net/txgbe/base/txgbe_regs.h
+++ b/drivers/net/txgbe/base/txgbe_regs.h
@@ -1197,6 +1197,7 @@ enum txgbe_5tuple_protocol {
#define TXGBE_ICRMISC_ANDONE MS(19, 0x1) /* link auto-nego done */
#define TXGBE_ICRMISC_ERRIG MS(20, 0x1) /* integrity error */
#define TXGBE_ICRMISC_SPIMS(21, 0x1) /* SPI interface */
+#define TXGBE_ICRMISC_TXDESC MS(22, 0x1) /* TDM desc error */
#define TXGBE_ICRMISC_VFMBX MS(23, 0x1) /* VF-PF message box */
#define TXGBE_ICRMISC_GPIO MS(26, 0x1) /* GPIO interrupt */
#define TXGBE_ICRMISC_ERRPCI MS(27, 0x1) /* pcie request error */
@@ -1382,6 +1383,11 @@ enum txgbe_5tuple_protocol {
#define TXGBE_TXCFG_WTHRESH(v)LS(v, 16, 0x7F)
#define TXGBE_TXCFG_FLUSH MS(26, 0x1)
+#define TXGBE_TDM_DESC_CHK(i) (0x0180B0 + (i) * 4) /*0-3*/
+#define TXGBE_TDM_DESC_NONFATAL(i) (0x0180C0 + (i) * 4) /*0-3*/
+#define TXGBE_TDM_DESC_FATAL(i)(0x0180D0 + (i) * 4) /*0-3*/
+#define TXGBE_TDM_DESC_MASK(v) MS(v, 0x1)
+
/* interrupt registers */
#define TXGBE_ITRI 0x000180
#define TXGBE_ITR(i)(0x000200 + 4 * (i))
diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index 4aa3bfd0bc..bafa9cf829 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -1936,6 +1936,7 @@ txgbe_dev_stop(struct rte_eth_dev *dev)
PMD_INIT_FUNC_TRACE();
rte_eal_alarm_cancel(txgbe_dev_detect_sfp, dev);
+ rte_eal_alarm_cancel(txgbe_tx_queue_clear_error, dev);
txgbe_dev_wait_setup_link_complete(dev, 0);
/* disable interrupts */
@@ -2838,6 +2839,60 @@ txgbe_dev_setup_link_alarm_handler(void *param)
intr->flags &= ~TXGBE_FLAG_NEED_LINK_CONFIG;
}
+static void
+txgbe_do_reset(struct rte_eth_dev *dev)
+{
+ struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
+ struct txgbe_tx_queue *txq;
+ u32 i;
+
+ for (i = 0; i < dev->data->nb_tx_queues; i++) {
+ txq = dev->data->tx_queues[i];
+ txq->resetting = true;
+ }
+
+ rte_delay_ms(1);
+ wr32(hw, TXGBE_RST, TXGBE_RST_LAN(hw->bus.lan_id));
+ txgbe_flush(hw);
+
+ PMD_DRV_LOG(ERR, "Please manually restart the port %d",
+ dev->data->port_id);
+}
+
+static void
+txgbe_tx_ring_recovery(struct rte_eth_dev *dev)
+{
+ struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
+ u32 desc_error[4] = {0, 0, 0, 0};
+ struct txgbe_tx_queue *txq;
+ u32 i;
+
+ /* check tdm fatal error */
+ for (i = 0; i < 4; i++) {
+ desc_error[i] = rd32(hw, TXGBE_TDM_DESC_FATAL(i));
+ if (desc_error[i] != 0) {
+ PMD_DRV_LOG(ERR, "TDM fatal error reg[%d]: 0x%x", i,
desc_error[i]);
+ txgbe_do_reset(dev);
+ return;
+ }
+ }
+
+ /* check tdm non-fatal error */
+ for (i = 0; i < 4; i++)
+ desc_error[i] = rd32(hw, TXGBE_TDM_DESC_NONFATAL(i));
+
+ for (i = 0; i < dev->data->nb_tx_queues; i++) {
+ if (desc_error[i / 32] & (1 << i % 32)) {
+ PMD_DRV_LOG(ERR, "TDM non-fatal error, reset port[%d]
queue[%d]",
+ dev->data->port_id, i);
+ dev->data->tx_queue_state[i] =
RTE_ETH_QUEUE_STATE_STOPPED;
+ txq = dev->data->tx_queues[i];
+ txq->resetting = true;
+ rte_eal_alarm_set(1000, txgbe_tx_queue_clear_error,
(void *)dev);
+ }
+ }
+}
+
/*
* If @timeout_ms was 0, it means that it will not return until link complete.
* It returns 1 on complete, return 0 on timeout.
@@ -3096,6 +3151,7 @@ txgbe_dev_misc_interrupt_setup(struct rte_eth_dev *dev)
intr->mask |= mask;
intr->mask_misc |= TXGBE_ICRMISC_GPIO;
intr
[PATCH v2 12/13] net/ngbe: fix interrupt lost in legacy or MSI mode
When interrupt is legacy or MSI mode, shared interrupt may cause the
interrupt cannot be re-enabled. So fix to read the shared interrupt.
Fixes: b9246b8fa280 ("net/ngbe: support link update")
Cc: sta...@dpdk.org
Signed-off-by: Jiawen Wu
---
drivers/net/ngbe/ngbe_ethdev.c | 13 +
1 file changed, 13 insertions(+)
diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c
index 3ea7ed43ff..e7dc1c0f94 100644
--- a/drivers/net/ngbe/ngbe_ethdev.c
+++ b/drivers/net/ngbe/ngbe_ethdev.c
@@ -2186,6 +2186,19 @@ ngbe_dev_interrupt_get_status(struct rte_eth_dev *dev)
struct ngbe_hw *hw = ngbe_dev_hw(dev);
struct ngbe_interrupt *intr = ngbe_dev_intr(dev);
+ eicr = ((u32 *)hw->isb_mem)[NGBE_ISB_VEC0];
+ if (!eicr) {
+ /*
+* shared interrupt alert!
+* make sure interrupts are enabled because the read will
+* have disabled interrupts.
+*/
+ if (!hw->adapter_stopped)
+ ngbe_enable_intr(dev);
+ return 0;
+ }
+ ((u32 *)hw->isb_mem)[NGBE_ISB_VEC0] = 0;
+
/* read-on-clear nic registers here */
eicr = ((u32 *)hw->isb_mem)[NGBE_ISB_MISC];
PMD_DRV_LOG(DEBUG, "eicr %x", eicr);
--
2.27.0
[PATCH v2 01/13] net/txgbe: fix swfw mbox failure
There is a unknown bug that the register TXGBE_MNGMBX cannot be written
in the loop, when DPDK is built with GCC high version. Access any register
before write TXGBE_MNGMBX can fix it.
Bugzilla ID: 1531
Fixes: 35c90ecccfd4 ("net/txgbe: add EEPROM functions")
Cc: sta...@dpdk.org
Signed-off-by: Jiawen Wu
---
drivers/net/txgbe/base/txgbe_mng.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/txgbe/base/txgbe_mng.c
b/drivers/net/txgbe/base/txgbe_mng.c
index 20db982891..7dc8f21183 100644
--- a/drivers/net/txgbe/base/txgbe_mng.c
+++ b/drivers/net/txgbe/base/txgbe_mng.c
@@ -58,6 +58,7 @@ txgbe_hic_unlocked(struct txgbe_hw *hw, u32 *buffer, u32
length, u32 timeout)
dword_len = length >> 2;
+ txgbe_flush(hw);
/* The device driver writes the relevant command block
* into the ram area.
*/
--
2.27.0
[PATCH v2 13/13] net/ngbe: restrict configuration of VLAN strip offload
There is a hardware limitation that Rx ring config register is not
writable when Rx ring is enabled, i.e. the NGBE_RXCFG_ENA bit is set.
But disabling the ring when there is traffic will cause ring get stuck.
So restrict the configuration of VLAN strip offload only if device is
started.
Fixes: 59b46438fdaa ("net/ngbe: support VLAN offload and VLAN filter")
Cc: sta...@dpdk.org
Signed-off-by: Jiawen Wu
---
drivers/net/ngbe/ngbe_ethdev.c | 49 ++
1 file changed, 20 insertions(+), 29 deletions(-)
diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c
index e7dc1c0f94..eef31af233 100644
--- a/drivers/net/ngbe/ngbe_ethdev.c
+++ b/drivers/net/ngbe/ngbe_ethdev.c
@@ -586,41 +586,25 @@ ngbe_vlan_filter_set(struct rte_eth_dev *dev, uint16_t
vlan_id, int on)
}
static void
-ngbe_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on)
+ngbe_vlan_strip_q_set(struct rte_eth_dev *dev, uint16_t queue, int on)
{
- struct ngbe_hw *hw = ngbe_dev_hw(dev);
- struct ngbe_rx_queue *rxq;
- bool restart;
- uint32_t rxcfg, rxbal, rxbah;
-
if (on)
ngbe_vlan_hw_strip_enable(dev, queue);
else
ngbe_vlan_hw_strip_disable(dev, queue);
+}
- rxq = dev->data->rx_queues[queue];
- rxbal = rd32(hw, NGBE_RXBAL(rxq->reg_idx));
- rxbah = rd32(hw, NGBE_RXBAH(rxq->reg_idx));
- rxcfg = rd32(hw, NGBE_RXCFG(rxq->reg_idx));
- if (rxq->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) {
- restart = (rxcfg & NGBE_RXCFG_ENA) &&
- !(rxcfg & NGBE_RXCFG_VLAN);
- rxcfg |= NGBE_RXCFG_VLAN;
- } else {
- restart = (rxcfg & NGBE_RXCFG_ENA) &&
- (rxcfg & NGBE_RXCFG_VLAN);
- rxcfg &= ~NGBE_RXCFG_VLAN;
- }
- rxcfg &= ~NGBE_RXCFG_ENA;
+static void
+ngbe_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on)
+{
+ struct ngbe_hw *hw = ngbe_dev_hw(dev);
- if (restart) {
- /* set vlan strip for ring */
- ngbe_dev_rx_queue_stop(dev, queue);
- wr32(hw, NGBE_RXBAL(rxq->reg_idx), rxbal);
- wr32(hw, NGBE_RXBAH(rxq->reg_idx), rxbah);
- wr32(hw, NGBE_RXCFG(rxq->reg_idx), rxcfg);
- ngbe_dev_rx_queue_start(dev, queue);
+ if (!hw->adapter_stopped) {
+ PMD_DRV_LOG(ERR, "Please stop port first");
+ return;
}
+
+ ngbe_vlan_strip_q_set(dev, queue, on);
}
static int
@@ -846,9 +830,9 @@ ngbe_vlan_hw_strip_config(struct rte_eth_dev *dev)
rxq = dev->data->rx_queues[i];
if (rxq->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)
- ngbe_vlan_hw_strip_enable(dev, i);
+ ngbe_vlan_strip_q_set(dev, i, 1);
else
- ngbe_vlan_hw_strip_disable(dev, i);
+ ngbe_vlan_strip_q_set(dev, i, 0);
}
}
@@ -910,6 +894,13 @@ ngbe_vlan_offload_config(struct rte_eth_dev *dev, int mask)
static int
ngbe_vlan_offload_set(struct rte_eth_dev *dev, int mask)
{
+ struct ngbe_hw *hw = ngbe_dev_hw(dev);
+
+ if (!hw->adapter_stopped && (mask & RTE_ETH_VLAN_STRIP_MASK)) {
+ PMD_DRV_LOG(ERR, "Please stop port first");
+ return -EPERM;
+ }
+
ngbe_config_vlan_strip_on_all_queues(dev, mask);
ngbe_vlan_offload_config(dev, mask);
--
2.27.0
[PATCH v2 11/13] net/ngbe: reconfigure more MAC Rx registers
When link status changes, there is a probability that no more packets
can be received on the port, due to hardware defects. These MAC Rx
registers should be reconfigured to fix this problem.
Fixes: b9246b8fa280 ("net/ngbe: support link update")
Fixes: a7c5f95ed9c2 ("net/ngbe: reconfigure MAC Rx when link update")
Cc: sta...@dpdk.org
Signed-off-by: Jiawen Wu
---
drivers/net/ngbe/base/ngbe_regs.h | 2 ++
drivers/net/ngbe/ngbe_ethdev.c| 6 ++
2 files changed, 8 insertions(+)
diff --git a/drivers/net/ngbe/base/ngbe_regs.h
b/drivers/net/ngbe/base/ngbe_regs.h
index 8a6776b0e6..b1295280a7 100644
--- a/drivers/net/ngbe/base/ngbe_regs.h
+++ b/drivers/net/ngbe/base/ngbe_regs.h
@@ -712,6 +712,8 @@ enum ngbe_5tuple_protocol {
#define NGBE_MACRXFLT_CTL_PASS LS(3, 6, 0x3)
#define NGBE_MACRXFLT_RXALL MS(31, 0x1)
+#define NGBE_MAC_WDG_TIMEOUT 0x01100C
+
/**
* Statistic Registers
**/
diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c
index ba46dcf2a5..3ea7ed43ff 100644
--- a/drivers/net/ngbe/ngbe_ethdev.c
+++ b/drivers/net/ngbe/ngbe_ethdev.c
@@ -1934,6 +1934,7 @@ ngbe_dev_link_update_share(struct rte_eth_dev *dev,
bool link_up;
int err;
int wait = 1;
+ u32 reg;
memset(&link, 0, sizeof(link));
link.link_status = RTE_ETH_LINK_DOWN;
@@ -1991,8 +1992,13 @@ ngbe_dev_link_update_share(struct rte_eth_dev *dev,
wr32m(hw, NGBE_MACTXCFG, NGBE_MACTXCFG_SPEED_MASK,
NGBE_MACTXCFG_SPEED_1G | NGBE_MACTXCFG_TE);
}
+ /* Re configure MAC RX */
+ reg = rd32(hw, NGBE_MACRXCFG);
+ wr32(hw, NGBE_MACRXCFG, reg);
wr32m(hw, NGBE_MACRXFLT, NGBE_MACRXFLT_PROMISC,
NGBE_MACRXFLT_PROMISC);
+ reg = rd32(hw, NGBE_MAC_WDG_TIMEOUT);
+ wr32(hw, NGBE_MAC_WDG_TIMEOUT, reg);
}
return rte_eth_linkstatus_set(dev, &link);
--
2.27.0
答复: [PATCH v4 18/18] doc/guides/nics: add documents for r8169 pmd
Hi Stephen, Are there any comments for PATCH v4? Looking forward to your feedback. Best Regards, Howard Wang -邮件原件- 发件人: Howard Wang 发送时间: 2024年10月25日 11:35 收件人: dev@dpdk.org 抄送: pro_nic_d...@realtek.com; 王颢 主题: [PATCH v4 18/18] doc/guides/nics: add documents for r8169 pmd Signed-off-by: Howard Wang --- MAINTAINERS| 2 ++ doc/guides/nics/features/r8169.ini | 32 ++ doc/guides/nics/index.rst | 1 + doc/guides/nics/r8169.rst | 17 4 files changed, 52 insertions(+) create mode 100644 doc/guides/nics/features/r8169.ini create mode 100644 doc/guides/nics/r8169.rst diff --git a/MAINTAINERS b/MAINTAINERS index 5f9eccc43f..6f56c966fd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1082,6 +1082,8 @@ M: ChunHao Lin M: Xing Wang M: Realtek NIC SW F: drivers/net/r8169 +F: doc/guides/nics/r8169.rst +F: doc/guides/nics/features/r8169.ini Crypto Drivers diff --git a/doc/guides/nics/features/r8169.ini b/doc/guides/nics/features/r8169.ini new file mode 100644 index 00..8e4142f64e --- /dev/null +++ b/doc/guides/nics/features/r8169.ini @@ -0,0 +1,32 @@ +; +; Supported features of the 'r8169' network poll mode driver. +; +; Refer to default.ini for the full list of available PMD features. +; +[Features] +Speed capabilities = Y +Link speed configuration = Y +Link status = Y +Link status event= Y +MTU update = Y +Scattered Rx = Y +TSO = Y +Promiscuous mode = Y +Allmulticast mode= Y +Unicast MAC filter = Y +Multicast MAC filter = Y +Flow control = Y +CRC offload = Y +L3 checksum offload = Y +L4 checksum offload = Y +Packet type parsing = Y +Rx descriptor status = Y +Tx descriptor status = Y +Basic stats = Y +Extended stats = Y +Stats per queue = Y +FW version = Y +Registers dump = Y +Linux= Y +x86-32 = Y +x86-64 = Y diff --git a/doc/guides/nics/index.rst b/doc/guides/nics/index.rst index c14bc7988a..0861be59d3 100644 --- a/doc/guides/nics/index.rst +++ b/doc/guides/nics/index.rst @@ -60,6 +60,7 @@ Network Interface Controller Drivers pcap_ring pfe qede +r8169 sfc_efx softnic tap diff --git a/doc/guides/nics/r8169.rst b/doc/guides/nics/r8169.rst new file mode 100644 index 00..149276cc91 --- /dev/null +++ b/doc/guides/nics/r8169.rst @@ -0,0 +1,17 @@ +.. SPDX-License-Identifier: BSD-3-Clause +Copyright(c) 2024 Realtek Corporation. All rights reserved + +R8169 Poll Mode Driver +== + +The R8169 PMD provides poll mode driver support for Realtek 2.5 and 5 +Gigabit Ethernet NICs. + +Features + + +Features of the R8169 PMD are: + +* Checksum offload +* TCP segmentation offload +* Jumbo frames supported -- 2.34.1
[PATCH v10 3/8] mbuf: decode the hash and fdir info in rte_pktmbuf_dump
Useful to be able to see the meta data in the hex dump.
Signed-off-by: Stephen Hemminger
---
lib/mbuf/rte_mbuf.c | 14 ++
1 file changed, 14 insertions(+)
diff --git a/lib/mbuf/rte_mbuf.c b/lib/mbuf/rte_mbuf.c
index 559d5ad8a7..8e452ca98f 100644
--- a/lib/mbuf/rte_mbuf.c
+++ b/lib/mbuf/rte_mbuf.c
@@ -678,12 +678,26 @@ rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m,
unsigned dump_len)
fprintf(f, " pkt_len=%u, ol_flags=%#"PRIx64", nb_segs=%u, port=%u",
m->pkt_len, m->ol_flags, m->nb_segs, m->port);
+ if (m->port != RTE_MBUF_PORT_INVALID)
+ fprintf(f, ", port=%u", m->port);
+
if (m->ol_flags & (RTE_MBUF_F_RX_QINQ | RTE_MBUF_F_TX_QINQ))
fprintf(f, ", vlan_tci_outer=%u", m->vlan_tci_outer);
if (m->ol_flags & (RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_TX_VLAN))
fprintf(f, ", vlan_tci=%u", m->vlan_tci);
+ if (m->ol_flags & RTE_MBUF_F_RX_RSS_HASH)
+ fprintf(f, ", rss=%#x", m->hash.rss);
+ else if (m->ol_flags & RTE_MBUF_F_RX_FDIR) {
+ if (m->ol_flags & RTE_MBUF_F_RX_FDIR_ID)
+ fprintf(f, ", fdir id=%u", m->hash.fdir.id);
+ else if (m->ol_flags & RTE_MBUF_F_RX_FDIR_FLX)
+ fprintf(f, ", fdir flex=%#x %x", m->hash.fdir.hi,
m->hash.fdir.lo);
+ else
+ fprintf(f, " fdir hash=%#x id=%#x ", m->hash.fdir.hash,
m->hash.fdir.id);
+ }
+
fprintf(f, ", ptype=%#"PRIx32"\n", m->packet_type);
nb_segs = m->nb_segs;
--
2.45.2
[PATCH v10 0/8] test-pmd packet decoding enhancements
While debugging TAP rte_flow discovered that test pmd verbose output was confusing and unhelpful. Instead, made a simple dissector that prints one line per packet like this in test-pmd. Also supports hex and JSON mode when more detail is needed. The new commands are: testpmd> set output /tmp/packet.log testpmd> set format dissect To enable packet logging need to use: testpmd> set verbose 3 v10 - rebase based on changes to lib/net and cmdline Stephen Hemminger (8): net: add more icmp types net: add new packet dissector mbuf: decode the hash and fdir info in rte_pktmbuf_dump test: add test for packet dissector test-pmd: add option to redirect packet log test-pmd: add hex decode test-pmd: add packet dissect format test-pmd: add a JSON packet output app/test-pmd/cmdline.c | 81 app/test-pmd/config.c | 48 +++ app/test-pmd/testpmd.c | 4 + app/test-pmd/testpmd.h | 12 + app/test-pmd/util.c | 256 +++- app/test/meson.build| 1 + app/test/test_dissect.c | 302 ++ doc/guides/testpmd_app_ug/testpmd_funcs.rst | 22 + lib/mbuf/rte_mbuf.c | 14 + lib/net/meson.build | 2 + lib/net/rte_dissect.c | 429 lib/net/rte_dissect.h | 45 ++ lib/net/rte_icmp.h | 9 + lib/net/version.map | 7 + 14 files changed, 1225 insertions(+), 7 deletions(-) create mode 100644 app/test/test_dissect.c create mode 100644 lib/net/rte_dissect.c create mode 100644 lib/net/rte_dissect.h -- 2.45.2
[PATCH v10 4/8] test: add test for packet dissector
Add some tests for new packet dissector.
Signed-off-by: Stephen Hemminger
---
app/test/meson.build| 1 +
app/test/test_dissect.c | 302
2 files changed, 303 insertions(+)
create mode 100644 app/test/test_dissect.c
diff --git a/app/test/meson.build b/app/test/meson.build
index 0f7e11969a..9fa0ad7cfe 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -63,6 +63,7 @@ source_file_deps = {
'test_debug.c': [],
'test_devargs.c': ['kvargs'],
'test_dispatcher.c': ['dispatcher'],
+'test_dissect.c': ['net'],
'test_distributor.c': ['distributor'],
'test_distributor_perf.c': ['distributor'],
'test_dmadev.c': ['dmadev', 'bus_vdev'],
diff --git a/app/test/test_dissect.c b/app/test/test_dissect.c
new file mode 100644
index 00..08734134d5
--- /dev/null
+++ b/app/test/test_dissect.c
@@ -0,0 +1,302 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2024 Stephen Hemminger
+ */
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "test.h"
+
+#ifndef LINE_MAX
+#define LINE_MAX 2048
+#endif
+
+#define TOTAL_PACKETS 100
+#define PACKET_LEN 1000
+#define ETH_IP_UDP_VXLAN_SIZE (sizeof(struct rte_ether_hdr) + \
+ sizeof(struct rte_ipv4_hdr) + \
+ sizeof(struct rte_udp_hdr) + \
+ sizeof(struct rte_vxlan_hdr))
+
+
+static uint16_t port_id;
+static const char null_dev[] = "net_null0";
+
+static void
+add_header(struct rte_mbuf *mb, uint32_t plen,
+ rte_be16_t src_port, rte_be16_t dst_port)
+{
+ struct {
+ struct rte_ether_hdr eth;
+ struct rte_ipv4_hdr ip;
+ struct rte_udp_hdr udp;
+ } pkt = {
+ .eth = {
+ .dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff,
0xff },
+ .ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4),
+ },
+ .ip = {
+ .version_ihl = RTE_IPV4_VHL_DEF,
+ .time_to_live = 1,
+ .next_proto_id = IPPROTO_UDP,
+ .src_addr = rte_cpu_to_be_32(RTE_IPV4_LOOPBACK),
+ .dst_addr = rte_cpu_to_be_32(RTE_IPV4_BROADCAST),
+ },
+ .udp = {
+ .dst_port = dst_port,
+ .src_port = src_port,
+ },
+ };
+
+ rte_eth_random_addr(pkt.eth.src_addr.addr_bytes);
+
+ plen -= sizeof(struct rte_ether_hdr);
+ pkt.ip.total_length = rte_cpu_to_be_16(plen);
+ pkt.ip.hdr_checksum = rte_ipv4_cksum(&pkt.ip);
+
+ plen -= sizeof(struct rte_ipv4_hdr);
+ pkt.udp.dgram_len = rte_cpu_to_be_16(plen);
+
+ /* Copy header into mbuf */
+ memcpy(rte_pktmbuf_append(mb, sizeof(pkt)), &pkt, sizeof(pkt));
+}
+
+static void
+add_vxlan(struct rte_mbuf *mb, rte_be32_t vni)
+{
+ struct rte_vxlan_hdr *vxlan;
+
+ vxlan = (struct rte_vxlan_hdr *)rte_pktmbuf_append(mb, sizeof(*vxlan));
+ memset(vxlan, 0, sizeof(*vxlan));
+ vxlan->flag_i = 1;
+ vxlan->vx_vni = vni;
+}
+
+
+static void
+fill_data(struct rte_mbuf *mb, uint32_t len)
+{
+ uint32_t i;
+ char *ptr = rte_pktmbuf_append(mb, len);
+ char c = '!';
+
+ /* traditional barber pole pattern */
+ for (i = 0; i < len; i++) {
+ ptr[i] = c++;
+ if (c == 0x7f)
+ c = '!';
+ }
+}
+
+static void
+mbuf_prep(struct rte_mbuf *mb, uint8_t buf[], uint32_t buf_len)
+{
+ mb->buf_addr = buf;
+ rte_mbuf_iova_set(mb, (uintptr_t)buf);
+ mb->buf_len = buf_len;
+ rte_mbuf_refcnt_set(mb, 1);
+
+ /* set pool pointer to dummy value, test doesn't use it */
+ mb->pool = (void *)buf;
+
+ rte_pktmbuf_reset(mb);
+}
+
+static int
+test_setup(void)
+{
+ port_id = rte_eth_dev_count_avail();
+
+ /* Make a dummy null device to snoop on */
+ if (rte_vdev_init(null_dev, NULL) != 0) {
+ fprintf(stderr, "Failed to create vdev '%s'\n", null_dev);
+ goto fail;
+ }
+ return 0;
+
+fail:
+ rte_vdev_uninit(null_dev);
+ return -1;
+}
+
+static void
+test_cleanup(void)
+{
+ rte_vdev_uninit(null_dev);
+}
+
+
+static int
+test_simple(void)
+{
+ struct rte_mbuf mb;
+ uint8_t buf[RTE_MBUF_DEFAULT_BUF_SIZE];
+ uint32_t data_len = PACKET_LEN;
+ rte_be16_t src_port = rte_rand_max(UINT16_MAX);
+ const rte_be16_t dst_port = rte_cpu_to_be_16(9); /* Discard port */
+ char obuf[LINE_MAX] = { };
+ char result[LINE_MAX] = { };
+ int ret;
+
+ /* make a dummy packet */
+ mbuf_prep(&mb, buf, sizeof(buf));
+ add_header(&mb, data_len, src_port, dst_port);
+ fill_data(&mb, da
[PATCH v10 2/8] net: add new packet dissector
The function rte_dissect_mbuf is used to decode the contents
of an mbuf into ah uman readable format similar to what tshark uses.
For now, handles IP, IPv6, TCP, UDP, ICMP and ARP.
Signed-off-by: Stephen Hemminger
---
lib/net/meson.build | 2 +
lib/net/rte_dissect.c | 429 ++
lib/net/rte_dissect.h | 45 +
lib/net/version.map | 7 +
4 files changed, 483 insertions(+)
create mode 100644 lib/net/rte_dissect.c
create mode 100644 lib/net/rte_dissect.h
diff --git a/lib/net/meson.build b/lib/net/meson.build
index 8afcc4ed37..ebeeb561b8 100644
--- a/lib/net/meson.build
+++ b/lib/net/meson.build
@@ -3,6 +3,7 @@
headers = files(
'rte_cksum.h',
+'rte_dissect.h',
'rte_ip.h',
'rte_ip4.h',
'rte_ip6.h',
@@ -33,6 +34,7 @@ headers = files(
sources = files(
'rte_arp.c',
+'rte_dissect.c',
'rte_ether.c',
'rte_net.c',
'rte_net_crc.c',
diff --git a/lib/net/rte_dissect.c b/lib/net/rte_dissect.c
new file mode 100644
index 00..80e84b8c70
--- /dev/null
+++ b/lib/net/rte_dissect.c
@@ -0,0 +1,429 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 Stephen Hemminger
+ *
+ * Print packets in format similar to tshark.
+ * Output should be one line per mbuf
+ */
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+/* Forward declaration - Ethernet can be nested */
+static int
+dissect_eth(char *buf, size_t size, const struct rte_mbuf *mb,
+ uint32_t offset, uint32_t dump_len);
+
+/*
+ * Read data from segmented mbuf and put it into buf , but stop if would go
past max length
+ * See rte_pktmbuf_read()
+ */
+static const void *
+dissect_read(const struct rte_mbuf *m, uint32_t offset, uint32_t len,
+void *buf, uint32_t dump_len)
+{
+
+ /* If this header would be past the requested length */
+ if (dump_len > 0 && offset + len > dump_len)
+ return NULL;
+
+ return rte_pktmbuf_read(m, offset, len, buf);
+}
+
+/*
+ * Print to string buffer and adjust result
+ * Returns true on success, false if buffer is exhausted.
+ */
+static __rte_format_printf(3, 4) int
+dissect_print(char **buf, size_t *sz, const char *fmt, ...)
+{
+ va_list ap;
+ int count;
+
+ va_start(ap, fmt);
+ count = vsnprintf(*buf, *sz, fmt, ap);
+ va_end(ap);
+
+ /* error or string is full */
+ if (count < 0 || count >= (int)*sz) {
+ *sz = 0;
+ } else {
+ *buf += count;
+ *sz -= count;
+ }
+ return count;
+}
+
+static int
+dissect_arp(char *buf, size_t size, const struct rte_mbuf *mb,
+ uint32_t offset, uint32_t dump_len)
+{
+ const struct rte_arp_hdr *arp;
+ struct rte_arp_hdr _arp;
+ int count = 0;
+ char abuf[64];
+
+ arp = dissect_read(mb, offset, sizeof(_arp), &_arp, dump_len);
+ if (arp == NULL)
+ return snprintf(buf, size, "Missing ARP header");
+
+ offset += sizeof(_arp);
+
+ uint16_t ar_op = rte_be_to_cpu_16(arp->arp_opcode);
+ switch (ar_op) {
+ case RTE_ARP_OP_REQUEST:
+ inet_ntop(AF_INET, &arp->arp_data.arp_tip, abuf, sizeof(abuf));
+ count += dissect_print(&buf, &size, "Who has %s? ", abuf);
+
+ rte_ether_format_addr(abuf, sizeof(abuf),
&arp->arp_data.arp_sha);
+ count += dissect_print(&buf, &size, "Tell %s ", abuf);
+ break;
+
+ case RTE_ARP_OP_REPLY:
+ inet_ntop(AF_INET, &arp->arp_data.arp_sip, abuf, sizeof(abuf));
+ count += dissect_print(&buf, &size, "%s is at", abuf);
+
+ rte_ether_format_addr(abuf, sizeof(abuf),
&arp->arp_data.arp_sha);
+ count += dissect_print(&buf, &size, "%s ", abuf);
+ break;
+
+ case RTE_ARP_OP_INVREQUEST:
+ rte_ether_format_addr(abuf, sizeof(abuf),
&arp->arp_data.arp_tha);
+ count += dissect_print(&buf, &size, "Who is %s? ", abuf);
+
+ rte_ether_format_addr(abuf, sizeof(abuf),
&arp->arp_data.arp_sha);
+ count += dissect_print(&buf, &size, "Tell %s ", abuf);
+ break;
+
+ case RTE_ARP_OP_INVREPLY:
+ rte_ether_format_addr(abuf, sizeof(buf),
&arp->arp_data.arp_sha);
+ count += dissect_print(&buf, &size, "%s is at ", abuf);
+
+ inet_ntop(AF_INET, &arp->arp_data.arp_sip, abuf, sizeof(abuf));
+ count += dissect_print(&buf, &size, "%s ", abuf);
+ break;
+
+ default:
+ count += dissect_print(&buf, &size, "Unknown ARP %#x ", ar_op);
+ break;
+ }
+
+ return count;
+}
+
+static int
+dissect_vxlan(char *buf, size_t size, const struct rte_mbuf *mb, uint32_t
offset, uint32
[PATCH v10 5/8] test-pmd: add option to redirect packet log
When running tests in interactive mode, it is useful to be
able to redirect the packet decode (verbose output) into
a file.
Signed-off-by: Stephen Hemminger
---
app/test-pmd/cmdline.c | 41 +
app/test-pmd/config.c | 23
app/test-pmd/testpmd.c | 3 ++
app/test-pmd/testpmd.h | 3 ++
app/test-pmd/util.c | 11 +-
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 7
6 files changed, 86 insertions(+), 2 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 7e0666e9f6..a6dfa116c7 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -315,6 +315,9 @@ static void cmd_help_long_parsed(void *parsed_result,
"set verbose (level)\n"
"Set the debug verbosity level X.\n\n"
+ "set output (filename)\n"
+ "Set the packet debug log file\n\n"
+
"set log global|(type) (level)\n"
"Set the log level.\n\n"
@@ -4110,6 +4113,43 @@ static cmdline_parse_inst_t cmd_set_numbers = {
},
};
+
+/* *** SET OUTPUT FILENAME *** */
+struct cmd_set_output_result {
+ cmdline_fixed_string_t set;
+ cmdline_fixed_string_t output;
+ cmdline_fixed_string_t filename;
+};
+
+static void
+cmd_set_output_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ struct cmd_set_output_result *res = parsed_result;
+
+ set_output_file(res->filename);
+}
+
+static cmdline_parse_token_string_t cmd_set_output_set =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_output_result, set, "set");
+static cmdline_parse_token_string_t cmd_set_output_output =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_output_result, output,
"output");
+static cmdline_parse_token_string_t cmd_set_output_name =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_output_result, filename, NULL);
+
+static cmdline_parse_inst_t cmd_set_output = {
+ .f = cmd_set_output_parsed,
+ .data = NULL,
+ .help_str = "set output ",
+ .tokens = {
+ (void *)&cmd_set_output_set,
+ (void *)&cmd_set_output_output,
+ (void *)&cmd_set_output_name,
+ NULL,
+ },
+};
+
/* *** SET LOG LEVEL CONFIGURATION *** */
struct cmd_set_log_result {
@@ -13650,6 +13690,7 @@ static cmdline_parse_ctx_t builtin_ctx[] = {
&cmd_set_xstats_hide_zero,
&cmd_set_record_core_cycles,
&cmd_set_record_burst_stats,
+ &cmd_set_output,
&cmd_operate_port,
&cmd_operate_specific_port,
&cmd_operate_attach_port,
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 88770b4dfc..d806cea3d3 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -6340,6 +6340,29 @@ set_verbose_level(uint16_t vb_level)
configure_rxtx_dump_callbacks(verbose_level);
}
+void
+set_output_file(const char *filename)
+{
+ FILE *outf, *oldf;
+
+ if (!strcmp(filename, "-")) {
+ outf = stdout;
+ } else {
+ outf = fopen(filename, "a");
+ if (outf == NULL) {
+ perror(filename);
+ return;
+ }
+ }
+
+ oldf = rte_atomic_exchange_explicit(&output_file, outf,
rte_memory_order_seq_cst);
+ if (oldf != NULL && oldf != stdout) {
+ /* make sure other threads are not mid print */
+ rte_delay_us_sleep(US_PER_S/10);
+ fclose(oldf);
+ }
+}
+
void
vlan_extend_set(portid_t port_id, int on)
{
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index b1401136e4..7790ba6ce0 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -99,6 +99,7 @@
#define EXTBUF_ZONE_SIZE (RTE_PGSIZE_2M - 4 * RTE_CACHE_LINE_SIZE)
uint16_t verbose_level = 0; /**< Silent by default. */
+RTE_ATOMIC(FILE *) output_file; /**< log to console by default. */
int testpmd_logtype; /**< Log type for testpmd logs */
/* use main core for command line ? */
@@ -4543,6 +4544,8 @@ main(int argc, char** argv)
rte_exit(EXIT_FAILURE, "Cannot register log type");
rte_log_set_level(testpmd_logtype, RTE_LOG_DEBUG);
+ output_file = stdout;
+
diag = rte_eal_init(argc, argv);
if (diag < 0)
rte_exit(EXIT_FAILURE, "Cannot init EAL: %s\n",
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 131ea53f84..e5affd44a2 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -17,6 +17,7 @@
#include
#include
#include
+#include
#include
#include
@@ -493,6 +494,7 @@ extern uint8_t xstats_hide_zero; /**< Hide zero values for
xstats display */
extern uint8_t record_core_cycles; /**< Enables measurement of CPU cycles
[PATCH v10 1/8] net: add more icmp types
Add types for SOURCE_QUENCH and IPv6 neighbor discovery.
Signed-off-by: Stephen Hemminger
---
lib/net/rte_icmp.h | 9 +
1 file changed, 9 insertions(+)
diff --git a/lib/net/rte_icmp.h b/lib/net/rte_icmp.h
index e69d68ab6e..1ca6cf35cb 100644
--- a/lib/net/rte_icmp.h
+++ b/lib/net/rte_icmp.h
@@ -54,6 +54,7 @@ struct rte_icmp_hdr {
#define RTE_IP_ICMP_ECHO_REPLY \
(RTE_DEPRECATED(RTE_IP_ICMP_ECHO_REPLY) RTE_ICMP_TYPE_ECHO_REPLY)
#define RTE_ICMP_TYPE_DEST_UNREACHABLE 3
+#define RTE_ICMP_TYPE_SOURCE_QUENCH 4
#define RTE_ICMP_TYPE_REDIRECT 5
#define RTE_ICMP_TYPE_ECHO_REQUEST 8
#define RTE_IP_ICMP_ECHO_REQUEST \
@@ -62,6 +63,8 @@ struct rte_icmp_hdr {
#define RTE_ICMP_TYPE_PARAM_PROBLEM 12
#define RTE_ICMP_TYPE_TIMESTAMP_REQUEST 13
#define RTE_ICMP_TYPE_TIMESTAMP_REPLY 14
+#define RTE_ICMP_TYPE_INFO_REQUEST 15
+#define RTE_ICMP_TYPE_INFO_REPLY 16
/* Destination Unreachable codes */
#define RTE_ICMP_CODE_UNREACH_NET 0
@@ -84,4 +87,10 @@ struct rte_icmp_hdr {
#define RTE_ICMP6_ECHO_REQUEST 128
#define RTE_ICMP6_ECHO_REPLY 129
+/* Neighbor discovery */
+#define RTE_ND_ROUTER_SOLICIT 133
+#define RTE_ND_ROUTER_ADVERT134
+#define RTE_ND_NEIGHBOR_SOLICIT 135
+#define RTE_ND_NEIGHBOR_ADVERT 136
+
#endif /* RTE_ICMP_H_ */
--
2.45.2
[PATCH v10 7/8] test-pmd: add packet dissect format
Add ability to get decode packet in summary tshark style format.
Signed-off-by: Stephen Hemminger
---
app/test-pmd/cmdline.c | 6 ++--
app/test-pmd/config.c | 23 +
app/test-pmd/testpmd.h | 1 +
app/test-pmd/util.c | 36 +
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 3 +-
5 files changed, 59 insertions(+), 10 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index fb73087880..0595da6749 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -318,7 +318,7 @@ static void cmd_help_long_parsed(void *parsed_result,
"set output (filename)\n"
"Set the packet debug log file\n\n"
- "set format (verbose|hex)\n"
+ "set format (dissect|hex|verbose)\n"
"Set the format of packet log\\n"
"set log global|(type) (level)\n"
@@ -4175,12 +4175,12 @@ static cmdline_parse_token_string_t cmd_set_format_set =
static cmdline_parse_token_string_t cmd_set_format_output =
TOKEN_STRING_INITIALIZER(struct cmd_set_format_result, format,
"format");
static cmdline_parse_token_string_t cmd_set_format_value =
- TOKEN_STRING_INITIALIZER(struct cmd_set_format_result, value,
"verbose#hex");
+ TOKEN_STRING_INITIALIZER(struct cmd_set_format_result, value,
"dissect#hex#verbose");
static cmdline_parse_inst_t cmd_set_format = {
.f = cmd_set_format_parsed,
.data = NULL,
- .help_str = "set format verbose|hex",
+ .help_str = "set format dissect|hex|verbose",
.tokens = {
(void *)&cmd_set_format_set,
(void *)&cmd_set_format_output,
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 86c18a7dc1..410d5a60f2 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -6343,12 +6343,23 @@ set_verbose_level(uint16_t vb_level)
void
set_output_format(const char *mode)
{
- if (!strcmp(mode, "verbose"))
- output_format = OUTPUT_MODE_VERBOSE;
- else if (!strcmp(mode, "hex"))
- output_format = OUTPUT_MODE_HEX;
- else
- fprintf(stderr, "Unknown output format '%s'\n", mode);
+ static const char * const output_formats[] = {
+ [OUTPUT_MODE_VERBOSE] = "verbose",
+ [OUTPUT_MODE_HEX] = "hex",
+ [OUTPUT_MODE_DISSECT] = "dissect",
+ };
+
+ printf("Change output format from %s to %s\n",
+ output_formats[output_format], mode);
+
+ for (unsigned int i = 0; i < RTE_DIM(output_formats); i++) {
+ if (strcasecmp(mode, output_formats[i]) == 0) {
+ output_format = i;
+ return;
+ }
+ }
+
+ fprintf(stderr, "Unknown output format '%s'\n", mode);
}
void
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 6c21fb16f8..167bfeb00f 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -491,6 +491,7 @@ enum dcb_mode_enable
enum output_mode {
OUTPUT_MODE_VERBOSE = 0,
OUTPUT_MODE_HEX,
+ OUTPUT_MODE_DISSECT,
};
extern uint8_t xstats_hide_zero; /**< Hide zero values for xstats display */
diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c
index 130821fddb..551e684e4c 100644
--- a/app/test-pmd/util.c
+++ b/app/test-pmd/util.c
@@ -8,6 +8,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -311,6 +312,38 @@ dump_pkt_hex(FILE *outf, uint16_t port_id, uint16_t queue,
}
}
+/* Brief tshark style one line output which is
+ * number time_delta Source Destination Protocol len info
+ */
+static void
+dump_pkt_brief(FILE *outf, uint16_t port, uint16_t queue,
+ struct rte_mbuf *pkts[], uint16_t nb_pkts, int is_rx)
+{
+ static uint64_t start_cycles;
+ static RTE_ATOMIC(uint64_t) packet_count = 1;
+ uint64_t now, count;
+ double interval;
+
+ /* Compute time interval from the first packet received */
+ now = rte_rdtsc();
+ if (start_cycles == 0) {
+ start_cycles = now;
+ printf("Seq# TimePort:Que R Description\n");
+ }
+ interval = (double)(now - start_cycles) / (double)rte_get_tsc_hz();
+
+ /* Packet counter needs to be thread safe */
+ count = rte_atomic_fetch_add_explicit(&packet_count, nb_pkts,
rte_memory_order_relaxed);
+
+ for (uint16_t i = 0; i < nb_pkts; i++) {
+ const struct rte_mbuf *mb = pkts[i];
+ char str[256];
+
+ rte_dissect_mbuf(str, sizeof(str), mb, 0);
+ fprintf(outf, "%6"PRIu64" %11.9f %4u:%-3u %c %s\n",
+ count + i, interval, port, queue, is_rx ? 'R' : 'T',
str);
+ }
+}
static void
dump_pkt_burst(uint16_t port_id, uint16_t queu
[PATCH v10 8/8] test-pmd: add a JSON packet output
When doing automated testing it is useful to show packet meta
data in JSON.
Signed-off-by: Stephen Hemminger
---
app/test-pmd/cmdline.c | 6 +-
app/test-pmd/config.c | 3 +
app/test-pmd/testpmd.h | 1 +
app/test-pmd/util.c | 167
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 7 +-
5 files changed, 178 insertions(+), 6 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 0595da6749..e132dfb3be 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -318,7 +318,7 @@ static void cmd_help_long_parsed(void *parsed_result,
"set output (filename)\n"
"Set the packet debug log file\n\n"
- "set format (dissect|hex|verbose)\n"
+ "set format (dissect|hex|json|verbose)\n"
"Set the format of packet log\\n"
"set log global|(type) (level)\n"
@@ -4175,12 +4175,12 @@ static cmdline_parse_token_string_t cmd_set_format_set =
static cmdline_parse_token_string_t cmd_set_format_output =
TOKEN_STRING_INITIALIZER(struct cmd_set_format_result, format,
"format");
static cmdline_parse_token_string_t cmd_set_format_value =
- TOKEN_STRING_INITIALIZER(struct cmd_set_format_result, value,
"dissect#hex#verbose");
+ TOKEN_STRING_INITIALIZER(struct cmd_set_format_result, value,
"dissect#hex#json#verbose");
static cmdline_parse_inst_t cmd_set_format = {
.f = cmd_set_format_parsed,
.data = NULL,
- .help_str = "set format dissect|hex|verbose",
+ .help_str = "set format dissect|hex|json|verbose",
.tokens = {
(void *)&cmd_set_format_set,
(void *)&cmd_set_format_output,
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 410d5a60f2..99076a326e 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -6347,6 +6347,9 @@ set_output_format(const char *mode)
[OUTPUT_MODE_VERBOSE] = "verbose",
[OUTPUT_MODE_HEX] = "hex",
[OUTPUT_MODE_DISSECT] = "dissect",
+#ifdef RTE_HAS_JANSSON
+ [OUTPUT_MODE_JSON]= "json",
+#endif
};
printf("Change output format from %s to %s\n",
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 167bfeb00f..fe6025473e 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -492,6 +492,7 @@ enum output_mode {
OUTPUT_MODE_VERBOSE = 0,
OUTPUT_MODE_HEX,
OUTPUT_MODE_DISSECT,
+ OUTPUT_MODE_JSON,
};
extern uint8_t xstats_hide_zero; /**< Hide zero values for xstats display */
diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c
index 551e684e4c..7da59988db 100644
--- a/app/test-pmd/util.c
+++ b/app/test-pmd/util.c
@@ -299,6 +299,168 @@ dump_pkt_verbose(FILE *outf, uint16_t port_id, uint16_t
queue,
}
}
+#ifdef RTE_HAS_JANSSON
+
+/* Encode offload flags as JSON array */
+static json_t *
+encode_ol_flags(uint64_t flags, int is_rx)
+{
+ json_t *ol_array = json_array();
+ unsigned int i;
+
+ if (is_rx)
+ flags &= ~RTE_MBUF_F_TX_OFFLOAD_MASK;
+ else
+ flags &= RTE_MBUF_F_TX_OFFLOAD_MASK;
+
+ for (i = 0; i < 64; i++) {
+ uint64_t mask = (uint64_t)1 << i;
+ const char *name;
+
+ if (!(mask & flags))
+ continue;
+
+ if (is_rx)
+ name = rte_get_rx_ol_flag_name(mask);
+ else
+ name = rte_get_tx_ol_flag_name(mask);
+ json_array_append_new(ol_array, json_string(name));
+ }
+ return ol_array;
+}
+
+/* Encode packet type fields as JSON object */
+static json_t *
+encode_ptype(uint32_t ptype)
+{
+ if ((ptype & RTE_PTYPE_ALL_MASK) == RTE_PTYPE_UNKNOWN)
+ return json_string("UNKNOWN");
+
+ json_t *ptypes = json_array();
+ if (ptype & RTE_PTYPE_L2_MASK)
+ json_array_append(ptypes,
json_string(rte_get_ptype_l2_name(ptype)));
+ if (ptype & RTE_PTYPE_L3_MASK)
+ json_array_append(ptypes,
json_string(rte_get_ptype_l3_name(ptype)));
+ if (ptype & RTE_PTYPE_L4_MASK)
+ json_array_append(ptypes,
json_string(rte_get_ptype_l4_name(ptype)));
+ if (ptype & RTE_PTYPE_TUNNEL_MASK)
+ json_array_append(ptypes,
json_string(rte_get_ptype_tunnel_name(ptype)));
+ if (ptype & RTE_PTYPE_INNER_L2_MASK)
+ json_array_append(ptypes,
json_string(rte_get_ptype_inner_l2_name(ptype)));
+ if (ptype & RTE_PTYPE_INNER_L3_MASK)
+ json_array_append(ptypes,
json_string(rte_get_ptype_inner_l3_name(ptype)));
+ if (ptype & RTE_PTYPE_INNER_L4_MASK)
+ json_array_append(ptypes,
json_string(rte_get_ptype_inner_l4_name(ptype)));
+
+
[PATCH v10 6/8] test-pmd: add hex decode
This adds new command:
testpmd> set format hex
which decodes packet in hex.
Signed-off-by: Stephen Hemminger
---
app/test-pmd/cmdline.c | 40 +++
app/test-pmd/config.c | 11 +
app/test-pmd/testpmd.c | 1 +
app/test-pmd/testpmd.h | 7 +++
app/test-pmd/util.c | 54 -
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 13 +
6 files changed, 115 insertions(+), 11 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index a6dfa116c7..fb73087880 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -318,6 +318,9 @@ static void cmd_help_long_parsed(void *parsed_result,
"set output (filename)\n"
"Set the packet debug log file\n\n"
+ "set format (verbose|hex)\n"
+ "Set the format of packet log\\n"
+
"set log global|(type) (level)\n"
"Set the log level.\n\n"
@@ -4150,6 +4153,42 @@ static cmdline_parse_inst_t cmd_set_output = {
},
};
+/* *** SET FORMAT OF PACKET LOG */
+struct cmd_set_format_result {
+ cmdline_fixed_string_t set;
+ cmdline_fixed_string_t format;
+ cmdline_fixed_string_t value;
+};
+
+static void
+cmd_set_format_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ struct cmd_set_format_result *res = parsed_result;
+
+ set_output_format(res->value);
+}
+
+static cmdline_parse_token_string_t cmd_set_format_set =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_format_result, set, "set");
+static cmdline_parse_token_string_t cmd_set_format_output =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_format_result, format,
"format");
+static cmdline_parse_token_string_t cmd_set_format_value =
+ TOKEN_STRING_INITIALIZER(struct cmd_set_format_result, value,
"verbose#hex");
+
+static cmdline_parse_inst_t cmd_set_format = {
+ .f = cmd_set_format_parsed,
+ .data = NULL,
+ .help_str = "set format verbose|hex",
+ .tokens = {
+ (void *)&cmd_set_format_set,
+ (void *)&cmd_set_format_output,
+ (void *)&cmd_set_format_value,
+ NULL,
+ },
+};
+
/* *** SET LOG LEVEL CONFIGURATION *** */
struct cmd_set_log_result {
@@ -13685,6 +13724,7 @@ static cmdline_parse_ctx_t builtin_ctx[] = {
&cmd_read_rxd_txd,
&cmd_stop,
&cmd_mac_addr,
+ &cmd_set_format,
&cmd_set_fwd_eth_peer,
&cmd_set_qmap,
&cmd_set_xstats_hide_zero,
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index d806cea3d3..86c18a7dc1 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -6340,6 +6340,17 @@ set_verbose_level(uint16_t vb_level)
configure_rxtx_dump_callbacks(verbose_level);
}
+void
+set_output_format(const char *mode)
+{
+ if (!strcmp(mode, "verbose"))
+ output_format = OUTPUT_MODE_VERBOSE;
+ else if (!strcmp(mode, "hex"))
+ output_format = OUTPUT_MODE_HEX;
+ else
+ fprintf(stderr, "Unknown output format '%s'\n", mode);
+}
+
void
set_output_file(const char *filename)
{
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 7790ba6ce0..f4fd51e46f 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -100,6 +100,7 @@
uint16_t verbose_level = 0; /**< Silent by default. */
RTE_ATOMIC(FILE *) output_file; /**< log to console by default. */
+enum output_mode output_format; /**< default to original mode. */
int testpmd_logtype; /**< Log type for testpmd logs */
/* use main core for command line ? */
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index e5affd44a2..6c21fb16f8 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -488,6 +488,11 @@ enum dcb_mode_enable
DCB_ENABLED
};
+enum output_mode {
+ OUTPUT_MODE_VERBOSE = 0,
+ OUTPUT_MODE_HEX,
+};
+
extern uint8_t xstats_hide_zero; /**< Hide zero values for xstats display */
/* globals used for configuration */
@@ -495,6 +500,7 @@ extern uint8_t record_core_cycles; /**< Enables measurement
of CPU cycles */
extern uint8_t record_burst_stats; /**< Enables display of RX and TX bursts */
extern uint16_t verbose_level; /**< Drives messages being displayed, if any. */
extern RTE_ATOMIC(FILE *) output_file; /**< Where packet data is written */
+extern enum output_mode output_format; /**< Format of packet decode */
extern int testpmd_logtype; /**< Log type for testpmd logs */
extern uint8_t interactive;
extern uint8_t auto_start;
@@ -1107,6 +1113,7 @@ void set_xstats_hide_zero(uint8_t on_off);
void set_record_core_cycles(uint8_t on_off);
void set_record_burst_stats(uint8_t on_off);
void set_verbose_level(uint16_t vb_level
RE: [PATCH] net/vmxnet3: Fix vmxnet3 NULL pointer deref after configuration failure
> From: Roger B Melton [mailto:rmel...@cisco.com] > Sent: Saturday, 26 October 2024 16.34 > > Problem: > > If vxmnet3_dev_configure() fails, applications may call > vmxnet3_dev_close(). If the failure occurs before the vmxnet3 > hw->shared structure is allocated the close will lead to a segv. > > Root Cause: > > This crash is due to incorrect adapter_stopped state in the > vmxnet3 dev_private structure. When dev_private is allocated, > adapter_stopped will be 0 (FALSE). eth_vmxnet3_dev_init() does not > set it to TRUE, so it will remain FALSE until a successful > vmxnet3_dev_start() followed by a vmxnet3_dev_stop(). When > vmxnet3_dev_close() is called, it will invoke vmxnet3_dev_stop(). > vmxnet3_dev_stop() will check the adapter_stopped state in the > vmxnet3 shared data, find it is FALSE and will proceed to stop the > device, calling vmxnet3_disable_all_intrs(). > vmxnet3_disable_all_intrs() attempts to access the vmxnet3 shared data > resulting in the segv. > > Solution: > > Set adapter_stopped to TRUE in eth_vmxnet3_dev_init(), to prevent stop > processing. > > Signed-off-by: Roger B Melton > --- > drivers/net/vmxnet3/vmxnet3_ethdev.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c > b/drivers/net/vmxnet3/vmxnet3_ethdev.c > index 467fb61137..8d7f95a753 100644 > --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c > +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c > @@ -403,6 +403,7 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev) > /* Vendor and Device ID need to be set before init of shared code > */ > hw->device_id = pci_dev->id.device_id; > hw->vendor_id = pci_dev->id.vendor_id; > + hw->adapter_stopped = TRUE; > hw->hw_addr0 = (void *)pci_dev->mem_resource[0].addr; > hw->hw_addr1 = (void *)pci_dev->mem_resource[1].addr; > > -- > 2.47.0 Acked-by: Morten Brørup
[v2] net/mlx5/hws: in NAT64 fix TC to TOS fields mapping
From: Hamdan Igbaria
In IPv6 to IPv4 scenario when copying the TC field to the
TOS[DSCP:6 bits, ECN: 2 bits] field the mapping of the fields
get set wrongly, since the destination field of TOS is defined as 2
split fields of DSCP and ECN.
In IPv4 to IPv6 we don't have this issue since both the source field of
TOS and destination field of TC defined as 8 bits.
Example to the problematic case of IPv6 to IPv4, TOS to TC mapping:
TC=[abcdefgh], it should be mapped to TOS=[DSCP=abcdef, ECN=gh],
but instead it was mapped as follow TOS=[DSCP=cdefgh, ECN=ab].
Fixes: 06d969a8c5b8 ("net/mlx5/hws: support NAT64 flow action")
Cc: sta...@dpdk.org
Signed-off-by: Hamdan Igbaria
Acked-by: Dariusz Sosnowski
---
drivers/net/mlx5/hws/mlx5dr_action.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/mlx5/hws/mlx5dr_action.c
b/drivers/net/mlx5/hws/mlx5dr_action.c
index 3fceb96de2..3c1122a06f 100644
--- a/drivers/net/mlx5/hws/mlx5dr_action.c
+++ b/drivers/net/mlx5/hws/mlx5dr_action.c
@@ -617,7 +617,8 @@ mlx5dr_action_create_nat64_copy_back_state(struct
mlx5dr_context *ctx,
MLX5_SET(copy_action_in, action_ptr, src_field,
attr->registers[MLX5DR_ACTION_NAT64_REG_CONTROL]);
MLX5_SET(copy_action_in, action_ptr, dst_field, tos_field);
- MLX5_SET(copy_action_in, action_ptr, src_offset, 24);
+ MLX5_SET(copy_action_in, action_ptr, src_offset, 24 + (ecn ?
+
MLX5DR_ACTION_NAT64_ECN_SIZE : 0));
MLX5_SET(copy_action_in, action_ptr, length, tos_size);
action_ptr += MLX5DR_ACTION_DOUBLE_SIZE;
@@ -629,7 +630,7 @@ mlx5dr_action_create_nat64_copy_back_state(struct
mlx5dr_context *ctx,
MLX5_SET(copy_action_in, action_ptr, src_field,
attr->registers[MLX5DR_ACTION_NAT64_REG_CONTROL]);
MLX5_SET(copy_action_in, action_ptr, dst_field, ecn);
- MLX5_SET(copy_action_in, action_ptr, src_offset, 24 + tos_size);
+ MLX5_SET(copy_action_in, action_ptr, src_offset, 24);
MLX5_SET(copy_action_in, action_ptr, length,
MLX5DR_ACTION_NAT64_ECN_SIZE);
action_ptr += MLX5DR_ACTION_DOUBLE_SIZE;
}
--
2.39.3
Re: [PATCH v7 3/9] net/zxdh: add zxdh device pci init implementation
On Tue, 22 Oct 2024 20:20:36 +0800 Junlong Wang wrote: > Add device pci init implementation, > to obtain PCI capability and read configuration, etc. > > Signed-off-by: Junlong Wang > --- > drivers/net/zxdh/meson.build | 1 + > drivers/net/zxdh/zxdh_ethdev.c | 43 + > drivers/net/zxdh/zxdh_ethdev.h | 22 ++- > drivers/net/zxdh/zxdh_pci.c| 290 + > drivers/net/zxdh/zxdh_pci.h| 151 + > drivers/net/zxdh/zxdh_queue.h | 105 > drivers/net/zxdh/zxdh_rxtx.h | 51 ++ > 7 files changed, 660 insertions(+), 3 deletions(-) > create mode 100644 drivers/net/zxdh/zxdh_pci.c > create mode 100644 drivers/net/zxdh/zxdh_pci.h > create mode 100644 drivers/net/zxdh/zxdh_queue.h > create mode 100644 drivers/net/zxdh/zxdh_rxtx.h DPDK has switched from GNU special zero length arrays to the C99 standard flexible arrays. ### [PATCH] net/zxdh: add zxdh device pci init implementation ERROR:FLEXIBLE_ARRAY: Use C99 flexible arrays - see https://docs.kernel.org/process/deprecated.html#zero-length-and-one-element-arrays #620: FILE: drivers/net/zxdh/zxdh_queue.h:33: + uint16_t ring[0]; +}; ERROR:FLEXIBLE_ARRAY: Use C99 flexible arrays - see https://docs.kernel.org/process/deprecated.html#zero-length-and-one-element-arrays #690: FILE: drivers/net/zxdh/zxdh_queue.h:103: + struct vq_desc_extra vq_descx[0]; +}; total: 2 errors, 0 warnings, 0 checks, 698 lines checked
Re: [PATCH v7 9/9] net/zxdh: add zxdh dev configure ops
On Tue, 22 Oct 2024 20:20:42 +0800 Junlong Wang wrote: > provided zxdh dev configure ops for queue > check,reset,alloc resources,etc. > > Signed-off-by: Junlong Wang > --- > drivers/net/zxdh/meson.build | 1 + > drivers/net/zxdh/zxdh_common.c | 118 + > drivers/net/zxdh/zxdh_common.h | 12 + > drivers/net/zxdh/zxdh_ethdev.c | 457 + > drivers/net/zxdh/zxdh_ethdev.h | 18 +- > drivers/net/zxdh/zxdh_pci.c| 97 +++ > drivers/net/zxdh/zxdh_pci.h| 29 +++ > drivers/net/zxdh/zxdh_queue.c | 131 ++ > drivers/net/zxdh/zxdh_queue.h | 175 - > 9 files changed, 1035 insertions(+), 3 deletions(-) > create mode 100644 drivers/net/zxdh/zxdh_queue.c In future, DPDK wants to re-enable the Gcc warning for taking address of packed member. When I enable that (in config/meson.build) this shows up. [1478/3078] Compiling C object drivers/libtmp_rte_net_zxdh.a.p/net_zxdh_zxdh_ethdev.c.o ../drivers/net/zxdh/zxdh_ethdev.c: In function ‘zxdh_init_vring’: ../drivers/net/zxdh/zxdh_ethdev.c:541:27: warning: taking address of packed member of ‘struct ’ may result in an unaligned pointer value [-Waddress-of-packed-member] 541 | vring_init_packed(&vq->vq_packed.ring, ring_mem, ZXDH_PCI_VRING_ALIGN, size); | ^~~ ../drivers/net/zxdh/zxdh_ethdev.c: In function ‘zxdh_init_queue’: ../drivers/net/zxdh/zxdh_ethdev.c:682:62: warning: taking address of packed member of ‘union ’ may result in an unaligned pointer value [-Waddress-of-packed-member] 682 | struct vring_packed_desc *start_dp = txr[i].tx_packed_indir; | ^~~ [1479/3078] Compiling C object drivers/libtmp_rte_net_virtio.a.p/net_virtio_virtio_ethdev
Re: [PATCH v7 9/9] net/zxdh: add zxdh dev configure ops
On Tue, 22 Oct 2024 20:20:42 +0800
Junlong Wang wrote:
> +int32_t zxdh_acquire_lock(struct zxdh_hw *hw)
> +{
> + uint32_t var = zxdh_read_comm_reg((uint64_t)hw->common_cfg,
> ZXDH_VF_LOCK_REG);
> +
> + /* check whether lock is used */
> + if (!(var & ZXDH_VF_LOCK_ENABLE_MASK))
> + return -1;
> +
> + return 0;
> +}
> +
> +int32_t zxdh_release_lock(struct zxdh_hw *hw)
> +{
> + uint32_t var = zxdh_read_comm_reg((uint64_t)hw->common_cfg,
> ZXDH_VF_LOCK_REG);
> +
> + if (var & ZXDH_VF_LOCK_ENABLE_MASK) {
> + var &= ~ZXDH_VF_LOCK_ENABLE_MASK;
> + zxdh_write_comm_reg((uint64_t)hw->common_cfg, ZXDH_VF_LOCK_REG,
> var);
> + return 0;
> + }
> +
> + return -1;
> +}
> +
It is your driver, so you are free to name functions as appropriate.
But it would make more sense to make the hardware lock follow the pattern
of existing spinlock's etc.
RE: [PATCH v2] net/vmxnet3: support per-queue stats for fewer queues
Jochen, Ronak, (Roger,)
Please review the below patch, so it can go into the 24.11 LTS release.
> From: Morten Brørup [mailto:m...@smartsharesystems.com]
> Sent: Friday, 25 October 2024 11.28
>
> Removed the requirement that the configured number of queues to provide
> statistics for (RTE_ETHDEV_QUEUE_STAT_CNTRS) cannot be less than the
> driver's max number of supported transmit queues
> (VMXNET3_MAX_TX_QUEUES).
>
> Also improved support for virtual hardware version 6.
>
> Signed-off-by: Morten Brørup
> ---
> v2:
> * Virtual hardware version 6 supports more queues; updated some arrays
> accordingly.
> * Added support for larger MTU with virtual hardware version 6.
> ---
> drivers/net/vmxnet3/vmxnet3_ethdev.c | 34 +---
> drivers/net/vmxnet3/vmxnet3_ethdev.h | 4 ++--
> 2 files changed, 23 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c
> b/drivers/net/vmxnet3/vmxnet3_ethdev.c
> index 78fac63ab6..1752c58069 100644
> --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
> +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
> @@ -1470,42 +1470,52 @@ vmxnet3_dev_stats_get(struct rte_eth_dev *dev,
> struct rte_eth_stats *stats)
> struct vmxnet3_hw *hw = dev->data->dev_private;
> struct UPT1_TxStats txStats;
> struct UPT1_RxStats rxStats;
> + uint64_t packets, bytes;
>
> VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD,
> VMXNET3_CMD_GET_STATS);
>
> for (i = 0; i < hw->num_tx_queues; i++) {
> vmxnet3_tx_stats_get(hw, i, &txStats);
>
> - stats->q_opackets[i] = txStats.ucastPktsTxOK +
> + packets = txStats.ucastPktsTxOK +
> txStats.mcastPktsTxOK +
> txStats.bcastPktsTxOK;
>
> - stats->q_obytes[i] = txStats.ucastBytesTxOK +
> + bytes = txStats.ucastBytesTxOK +
> txStats.mcastBytesTxOK +
> txStats.bcastBytesTxOK;
>
> - stats->opackets += stats->q_opackets[i];
> - stats->obytes += stats->q_obytes[i];
> + stats->opackets += packets;
> + stats->obytes += bytes;
> stats->oerrors += txStats.pktsTxError +
> txStats.pktsTxDiscard;
> +
> + if (i < RTE_ETHDEV_QUEUE_STAT_CNTRS) {
> + stats->q_opackets[i] = packets;
> + stats->q_obytes[i] = bytes;
> + }
> }
>
> for (i = 0; i < hw->num_rx_queues; i++) {
> vmxnet3_rx_stats_get(hw, i, &rxStats);
>
> - stats->q_ipackets[i] = rxStats.ucastPktsRxOK +
> + packets = rxStats.ucastPktsRxOK +
> rxStats.mcastPktsRxOK +
> rxStats.bcastPktsRxOK;
>
> - stats->q_ibytes[i] = rxStats.ucastBytesRxOK +
> + bytes = rxStats.ucastBytesRxOK +
> rxStats.mcastBytesRxOK +
> rxStats.bcastBytesRxOK;
>
> - stats->ipackets += stats->q_ipackets[i];
> - stats->ibytes += stats->q_ibytes[i];
> -
> - stats->q_errors[i] = rxStats.pktsRxError;
> + stats->ipackets += packets;
> + stats->ibytes += bytes;
> stats->ierrors += rxStats.pktsRxError;
> stats->imissed += rxStats.pktsRxOutOfBuf;
> +
> + if (i < RTE_ETHDEV_QUEUE_STAT_CNTRS) {
> + stats->q_ipackets[i] = packets;
> + stats->q_ibytes[i] = bytes;
> + stats->q_errors[i] = rxStats.pktsRxError;
> + }
> }
>
> return 0;
> @@ -1521,8 +1531,6 @@ vmxnet3_dev_stats_reset(struct rte_eth_dev *dev)
>
> VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD,
> VMXNET3_CMD_GET_STATS);
>
> - RTE_BUILD_BUG_ON(RTE_ETHDEV_QUEUE_STAT_CNTRS <
> VMXNET3_MAX_TX_QUEUES);
> -
> for (i = 0; i < hw->num_tx_queues; i++) {
> vmxnet3_hw_tx_stats_get(hw, i, &txStats);
> memcpy(&hw->snapshot_tx_stats[i], &txStats,
> @@ -1566,7 +1574,7 @@ vmxnet3_dev_info_get(struct rte_eth_dev *dev,
> dev_info->min_rx_bufsize = 1518 + RTE_PKTMBUF_HEADROOM;
> dev_info->max_rx_pktlen = 16384; /* includes CRC, cf MAXFRS
> register */
> dev_info->min_mtu = VMXNET3_MIN_MTU;
> - dev_info->max_mtu = VMXNET3_MAX_MTU;
> + dev_info->max_mtu = VMXNET3_VERSION_GE_6(hw) ? VMXNET3_V6_MAX_MTU
> : VMXNET3_MAX_MTU;
> dev_info->speed_capa = RTE_ETH_LINK_SPEED_10G;
> dev_info->max_mac_addrs = VMXNET3_MAX_MAC_ADDRS;
>
> diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.h
> b/drivers/net/vmxnet3/vmxnet3_ethdev.h
> index 2b3e2c4caa..e9ded6663d 100644
> --- a/drivers/net/vmxnet3/vmxnet3_ethdev.h
> +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.h
> @@ -121,8 +121,8 @@ struct vmxnet3_hw {
> #define VMXNET3_VFT_TABLE_SIZE (VMXNET3_VFT_SIZE *
> sizeof(uint32_t))
> UPT1_TxStats
> saved_tx_stats[VMXNET3_EXT_MAX_TX_QUEUES];
> UPT1_RxStats
> saved_rx_stats[VMX
Re: [PATCH v7 9/9] net/zxdh: add zxdh dev configure ops
On Sun, 27 Oct 2024 09:40:48 -0700
Stephen Hemminger wrote:
> On Tue, 22 Oct 2024 20:20:42 +0800
> Junlong Wang wrote:
>
> > +int32_t zxdh_acquire_lock(struct zxdh_hw *hw)
> > +{
> > + uint32_t var = zxdh_read_comm_reg((uint64_t)hw->common_cfg,
> > ZXDH_VF_LOCK_REG);
> > +
> > + /* check whether lock is used */
> > + if (!(var & ZXDH_VF_LOCK_ENABLE_MASK))
> > + return -1;
> > +
> > + return 0;
> > +}
> > +
> > +int32_t zxdh_release_lock(struct zxdh_hw *hw)
> > +{
> > + uint32_t var = zxdh_read_comm_reg((uint64_t)hw->common_cfg,
> > ZXDH_VF_LOCK_REG);
> > +
> > + if (var & ZXDH_VF_LOCK_ENABLE_MASK) {
> > + var &= ~ZXDH_VF_LOCK_ENABLE_MASK;
> > + zxdh_write_comm_reg((uint64_t)hw->common_cfg, ZXDH_VF_LOCK_REG,
> > var);
> > + return 0;
> > + }
> > +
> > + return -1;
> > +}
> > +
>
> It is your driver, so you are free to name functions as appropriate.
>
> But it would make more sense to make the hardware lock follow the pattern
> of existing spinlock's etc.
I am suggesting:
static bool zxdh_try_lock(hw);
void zxdh_release_lock(hw);
also, move the loop into a new function, something like:
int zxdh_timedlock(hw, uint32_t us);
[PATCH v2 09/13] net/bnxt: disable VLAN filter when TF is enabled
From: Kishore Padmanabha
For p7 platform, the vlan filter and strip is disabled if the truflow
is enabled on the platform.
Signed-off-by: Kishore Padmanabha
Reviewed-by: Mike Baucom
---
drivers/net/bnxt/bnxt_ethdev.c | 6 +-
drivers/net/bnxt/bnxt_rxq.c| 17 +++--
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 890c9f8b45..d3ea4ed539 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -2964,7 +2964,7 @@ bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int
mask)
{
uint64_t rx_offloads = dev->data->dev_conf.rxmode.offloads;
struct bnxt *bp = dev->data->dev_private;
- int rc;
+ int rc = 0;
rc = is_bnxt_in_error(bp);
if (rc)
@@ -2974,6 +2974,10 @@ bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int
mask)
if (!dev->data->dev_started)
return 0;
+ /* For P7 platform, cannot support if truflow is enabled */
+ if (BNXT_TRUFLOW_EN(bp) && BNXT_CHIP_P7(bp))
+ return rc;
+
if (mask & RTE_ETH_VLAN_FILTER_MASK) {
/* Enable or disable VLAN filtering */
rc = bnxt_config_vlan_hw_filter(bp, rx_offloads);
diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c
index 249fe7f6e5..8b8bc6584a 100644
--- a/drivers/net/bnxt/bnxt_rxq.c
+++ b/drivers/net/bnxt/bnxt_rxq.c
@@ -28,18 +28,23 @@ uint64_t bnxt_get_rx_port_offloads(struct bnxt *bp)
RTE_ETH_RX_OFFLOAD_UDP_CKSUM |
RTE_ETH_RX_OFFLOAD_TCP_CKSUM |
RTE_ETH_RX_OFFLOAD_KEEP_CRC|
- RTE_ETH_RX_OFFLOAD_VLAN_FILTER |
- RTE_ETH_RX_OFFLOAD_VLAN_EXTEND |
RTE_ETH_RX_OFFLOAD_SCATTER |
RTE_ETH_RX_OFFLOAD_RSS_HASH;
- if ((BNXT_CHIP_P7(bp) && !bnxt_compressed_rx_cqe_mode_enabled(bp)) ||
- BNXT_CHIP_P5(bp))
+ /* In P7 platform if truflow is enabled then vlan offload is disabled*/
+ if (!(BNXT_TRUFLOW_EN(bp) && BNXT_CHIP_P7(bp)))
+ rx_offload_capa |= (RTE_ETH_RX_OFFLOAD_VLAN_FILTER |
+ RTE_ETH_RX_OFFLOAD_VLAN_EXTEND);
+
+
+ if (!bnxt_compressed_rx_cqe_mode_enabled(bp))
rx_offload_capa |= RTE_ETH_RX_OFFLOAD_TCP_LRO;
if (bp->flags & BNXT_FLAG_PTP_SUPPORTED)
rx_offload_capa |= RTE_ETH_RX_OFFLOAD_TIMESTAMP;
- if (bp->vnic_cap_flags & BNXT_VNIC_CAP_VLAN_RX_STRIP)
- rx_offload_capa |= RTE_ETH_RX_OFFLOAD_VLAN_STRIP;
+ if (bp->vnic_cap_flags & BNXT_VNIC_CAP_VLAN_RX_STRIP) {
+ if (!(BNXT_TRUFLOW_EN(bp) && BNXT_CHIP_P7(bp)))
+ rx_offload_capa |= RTE_ETH_RX_OFFLOAD_VLAN_STRIP;
+ }
if (BNXT_TUNNELED_OFFLOADS_CAP_ALL_EN(bp))
rx_offload_capa |= RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM |
--
2.39.5 (Apple Git-154)
[PATCH v2 12/13] net/bnxt: add support for buffer split Rx offload
Add header and data split Rx offload support if the hardware supports
it. The packet will be split at fixed offset for IPv4 or IPv6 packets.
Signed-off-by: Ajit Khaparde
---
drivers/net/bnxt/bnxt.h| 5 +
drivers/net/bnxt/bnxt_ethdev.c | 5 +
drivers/net/bnxt/bnxt_hwrm.c | 29 -
drivers/net/bnxt/bnxt_rxq.c| 30 +++---
drivers/net/bnxt/bnxt_rxq.h| 4
drivers/net/bnxt/bnxt_rxr.c| 4 ++--
drivers/net/bnxt/bnxt_vnic.h | 1 +
7 files changed, 64 insertions(+), 14 deletions(-)
diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 3502481056..771349de6c 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -770,6 +770,11 @@ enum bnxt_session_type {
BNXT_SESSION_TYPE_LAST
};
+#define BNXT_MAX_BUFFER_SPLIT_SEGS 2
+#define BNXT_MULTI_POOL_BUF_SPLIT_CAP 1
+#define BNXT_BUF_SPLIT_OFFSET_CAP 1
+#define BNXT_BUF_SPLIT_ALIGN_CAP 0
+
struct bnxt {
void*bar0;
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index d3ea4ed539..09ee39b64d 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -1268,6 +1268,11 @@ static int bnxt_dev_info_get_op(struct rte_eth_dev
*eth_dev,
dev_info->vmdq_pool_base = 0;
dev_info->vmdq_queue_base = 0;
+ dev_info->rx_seg_capa.max_nseg = BNXT_MAX_BUFFER_SPLIT_SEGS;
+ dev_info->rx_seg_capa.multi_pools = BNXT_MULTI_POOL_BUF_SPLIT_CAP;
+ dev_info->rx_seg_capa.offset_allowed = BNXT_BUF_SPLIT_OFFSET_CAP;
+ dev_info->rx_seg_capa.offset_align_log2 = BNXT_BUF_SPLIT_ALIGN_CAP;
+
dev_info->err_handle_mode = RTE_ETH_ERROR_HANDLE_MODE_PROACTIVE;
return 0;
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 8dea446e60..351effb28f 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -3041,10 +3041,14 @@ int bnxt_hwrm_vnic_rss_cfg(struct bnxt *bp,
int bnxt_hwrm_vnic_plcmode_cfg(struct bnxt *bp,
struct bnxt_vnic_info *vnic)
{
- int rc = 0;
- struct hwrm_vnic_plcmodes_cfg_input req = {.req_type = 0 };
struct hwrm_vnic_plcmodes_cfg_output *resp = bp->hwrm_cmd_resp_addr;
+ struct rte_eth_conf *dev_conf = &bp->eth_dev->data->dev_conf;
+ struct hwrm_vnic_plcmodes_cfg_input req = {.req_type = 0 };
+ uint64_t rx_offloads = dev_conf->rxmode.offloads;
+ uint8_t rs = !!(rx_offloads & RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT);
+ uint32_t flags, enables;
uint16_t size;
+ int rc = 0;
if (vnic->fw_vnic_id == INVALID_HW_RING_ID) {
PMD_DRV_LOG_LINE(DEBUG, "VNIC ID %x", vnic->fw_vnic_id);
@@ -3052,19 +3056,26 @@ int bnxt_hwrm_vnic_plcmode_cfg(struct bnxt *bp,
}
HWRM_PREP(&req, HWRM_VNIC_PLCMODES_CFG, BNXT_USE_CHIMP_MB);
-
- req.flags = rte_cpu_to_le_32(
- HWRM_VNIC_PLCMODES_CFG_INPUT_FLAGS_JUMBO_PLACEMENT);
-
- req.enables = rte_cpu_to_le_32(
- HWRM_VNIC_PLCMODES_CFG_INPUT_ENABLES_JUMBO_THRESH_VALID);
+ flags = HWRM_VNIC_PLCMODES_CFG_INPUT_FLAGS_JUMBO_PLACEMENT;
+ enables = HWRM_VNIC_PLCMODES_CFG_INPUT_ENABLES_JUMBO_THRESH_VALID;
size = rte_pktmbuf_data_room_size(bp->rx_queues[0]->mb_pool);
size -= RTE_PKTMBUF_HEADROOM;
size = RTE_MIN(BNXT_MAX_PKT_LEN, size);
-
req.jumbo_thresh = rte_cpu_to_le_16(size);
+
+ if (rs & vnic->hds_threshold) {
+ flags |=
+ HWRM_VNIC_PLCMODES_CFG_INPUT_FLAGS_HDS_IPV4 |
+ HWRM_VNIC_PLCMODES_CFG_INPUT_FLAGS_HDS_IPV6;
+ req.hds_threshold = rte_cpu_to_le_16(vnic->hds_threshold);
+ enables |=
+ HWRM_VNIC_PLCMODES_CFG_INPUT_ENABLES_HDS_THRESHOLD_VALID;
+ }
+
req.vnic_id = rte_cpu_to_le_16(vnic->fw_vnic_id);
+ req.flags = rte_cpu_to_le_32(flags);
+ req.enables = rte_cpu_to_le_32(enables);
rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c
index 8b8bc6584a..41e1aa2a23 100644
--- a/drivers/net/bnxt/bnxt_rxq.c
+++ b/drivers/net/bnxt/bnxt_rxq.c
@@ -29,7 +29,8 @@ uint64_t bnxt_get_rx_port_offloads(struct bnxt *bp)
RTE_ETH_RX_OFFLOAD_TCP_CKSUM |
RTE_ETH_RX_OFFLOAD_KEEP_CRC|
RTE_ETH_RX_OFFLOAD_SCATTER |
- RTE_ETH_RX_OFFLOAD_RSS_HASH;
+ RTE_ETH_RX_OFFLOAD_RSS_HASH |
+ RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT;
/* In P7 platform if truflow is enabled then vlan offload is disabled*/
if (!(BNXT_TRUFLOW_EN(bp) && BNXT_CHIP_P7(bp)))
@@ -332,8 +333,12 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,
[PATCH v2 10/13] net/bnxt: remove the VNIC async event handler
From: Kishore Padmanabha
The VNIC async event handler is removed, it is no longer required if
during the port initialization if svif is used instead of VNIC which
could be invalid for rep port if the rep's VF port link is down.
Signed-off-by: Kishore Padmanabha
Reviewed-by: Shahaji Bhosle
---
drivers/net/bnxt/bnxt_cpr.c | 48
drivers/net/bnxt/bnxt_hwrm.c | 21 +---
drivers/net/bnxt/bnxt_reps.c | 4 +--
3 files changed, 19 insertions(+), 54 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_cpr.c b/drivers/net/bnxt/bnxt_cpr.c
index ac1d537bc9..c6606e19a8 100644
--- a/drivers/net/bnxt/bnxt_cpr.c
+++ b/drivers/net/bnxt/bnxt_cpr.c
@@ -47,51 +47,6 @@ void bnxt_wait_for_device_shutdown(struct bnxt *bp)
} while (timeout);
}
-static void
-bnxt_process_default_vnic_change(struct bnxt *bp,
-struct hwrm_async_event_cmpl *async_cmp)
-{
- uint16_t vnic_state, vf_fid, vf_id;
- struct bnxt_representor *vf_rep_bp;
- struct rte_eth_dev *eth_dev;
- bool vfr_found = false;
- uint32_t event_data;
-
- if (!BNXT_TRUFLOW_EN(bp))
- return;
-
- PMD_DRV_LOG_LINE(INFO, "Default vnic change async event received");
- event_data = rte_le_to_cpu_32(async_cmp->event_data1);
-
- vnic_state = (event_data & BNXT_DEFAULT_VNIC_STATE_MASK) >>
- BNXT_DEFAULT_VNIC_STATE_SFT;
- if (vnic_state != BNXT_DEFAULT_VNIC_ALLOC)
- return;
-
- if (!bp->rep_info)
- return;
-
- vf_fid = (event_data & BNXT_DEFAULT_VNIC_CHANGE_VF_ID_MASK) >>
- BNXT_DEFAULT_VNIC_CHANGE_VF_ID_SFT;
- PMD_DRV_LOG_LINE(INFO, "async event received vf_id 0x%x", vf_fid);
-
- for (vf_id = 0; vf_id < BNXT_MAX_VF_REPS(bp); vf_id++) {
- eth_dev = bp->rep_info[vf_id].vfr_eth_dev;
- if (!eth_dev)
- continue;
- vf_rep_bp = eth_dev->data->dev_private;
- if (vf_rep_bp &&
- vf_rep_bp->fw_fid == vf_fid) {
- vfr_found = true;
- break;
- }
- }
- if (!vfr_found)
- return;
-
- bnxt_rep_dev_start_op(eth_dev);
-}
-
static void bnxt_handle_event_error_report(struct bnxt *bp,
uint32_t data1,
uint32_t data2)
@@ -278,9 +233,6 @@ void bnxt_handle_async_event(struct bnxt *bp,
PMD_DRV_LOG_LINE(INFO, "Port: %u DNC event: data1 %#x data2
%#x",
port_id, data1, data2);
break;
- case HWRM_ASYNC_EVENT_CMPL_EVENT_ID_DEFAULT_VNIC_CHANGE:
- bnxt_process_default_vnic_change(bp, async_cmp);
- break;
case HWRM_ASYNC_EVENT_CMPL_EVENT_ID_ECHO_REQUEST:
PMD_DRV_LOG_LINE(INFO,
"Port %u: Received fw echo request: data1 %#x data2
%#x",
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 80f7c1a6a1..8dea446e60 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -4336,12 +4336,25 @@ int bnxt_hwrm_get_dflt_vnic_svif(struct bnxt *bp,
uint16_t fid,
HWRM_CHECK_RESULT();
- if (vnic_id)
- *vnic_id = rte_le_to_cpu_16(resp->dflt_vnic_id);
-
svif_info = rte_le_to_cpu_16(resp->svif_info);
- if (svif && (svif_info & HWRM_FUNC_QCFG_OUTPUT_SVIF_INFO_SVIF_VALID))
+ if (svif && (svif_info & HWRM_FUNC_QCFG_OUTPUT_SVIF_INFO_SVIF_VALID)) {
*svif = svif_info & HWRM_FUNC_QCFG_OUTPUT_SVIF_INFO_SVIF_MASK;
+ /* When the VF corresponding to the VFR is down at the time of
+* VFR conduit creation, the VFR rule will be programmed with
+* invalid vnic id because FW will return default vnic id as
+* INVALID when queried through FUNC_QCFG. As a result, when
+* the VF is brought up, VF won't receive packets because
+* INVALID vnic id is already programmed.
+*
+* Hence, use svif value as vnic id during VFR conduit creation
+* as both svif and default vnic id values are same and will
+* never change.
+*/
+ if (vnic_id)
+ *vnic_id = *svif;
+ } else {
+ rc = -EINVAL;
+ }
HWRM_UNLOCK();
diff --git a/drivers/net/bnxt/bnxt_reps.c b/drivers/net/bnxt/bnxt_reps.c
index 6c431c7dd8..6f5c3f80eb 100644
--- a/drivers/net/bnxt/bnxt_reps.c
+++ b/drivers/net/bnxt/bnxt_reps.c
@@ -540,12 +540,12 @@ static int bnxt_vfr_free(struct bnxt_representor *vfr)
return -ENOMEM;
}
- parent_bp = vfr->parent_dev->data->dev_private;
- if (!parent_bp) {
+ if (!bnxt_rep_check_parent(vfr)) {
PMD_
[PATCH v2 04/13] net/bnxt: add check for number of segs
From: Somnath Kotur
If the application passes incorrect number of segs for a Tx pkt i.e.
sets it to 5 while actually sending down only a single mbuf, this could
escape all the existing driver checks and driver could end up sending
down garbage TX BDs to the HW. This in turn could lead to a Tx pipeline
stall.
Fix it by validating the number of segs passed for the Tx pkt against
what is actually set by the application to prevent this.
Signed-off-by: Somnath Kotur
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/bnxt_txr.c | 18 ++
1 file changed, 18 insertions(+)
diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c
index 6d7e9962ce..51d3689e9c 100644
--- a/drivers/net/bnxt/bnxt_txr.c
+++ b/drivers/net/bnxt/bnxt_txr.c
@@ -194,6 +194,21 @@ bnxt_check_pkt_needs_ts(struct rte_mbuf *m)
return false;
}
+static bool
+bnxt_invalid_nb_segs(struct rte_mbuf *tx_pkt)
+{
+ uint16_t nb_segs = 1;
+ struct rte_mbuf *m_seg;
+
+ m_seg = tx_pkt->next;
+ while (m_seg) {
+ nb_segs++;
+ m_seg = m_seg->next;
+ }
+
+ return (nb_segs != tx_pkt->nb_segs);
+}
+
static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
struct bnxt_tx_queue *txq,
uint16_t *coal_pkts,
@@ -221,6 +236,9 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
if (unlikely(is_bnxt_in_error(txq->bp)))
return -EIO;
+ if (unlikely(bnxt_invalid_nb_segs(tx_pkt)))
+ return -EINVAL;
+
long_bd = bnxt_xmit_need_long_bd(tx_pkt, txq);
nr_bds = long_bd + tx_pkt->nb_segs;
--
2.39.5 (Apple Git-154)
[PATCH v2 07/13] net/bnxt: register for and handle RSS change event
From: Manish Kurup
1. Register for RSS change events. When an RSS change occurs
(especially for custom parsed tunnels), we need to update
the RSS flags in the VNIC QCAPS so that upstream drivers
don't send down the now unsupported bits
("config port all rss all" command). This will cause the
firmware to fail the HWRM command. This should be done by
the driver registering for said events, and re-reading the
VNIC QCAPS for that bp.
2. Add a call to update QCAPS upon async notifications
for the same.
3. Fix bug in PMD QCAPS update code The PMD QCAPS function
only "sets" the new QCAPS flags, but not clearing them,
if they were cleared due to some events. Fixed this by
clearing the flags first, so that we could correctly
set the new ones (for that bp).
Signed-off-by: Manish Kurup
Reviewed-by: Kalesh AP
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/bnxt_cpr.c | 6 ++
drivers/net/bnxt/bnxt_hwrm.c | 5 -
drivers/net/bnxt/bnxt_hwrm.h | 2 ++
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/net/bnxt/bnxt_cpr.c b/drivers/net/bnxt/bnxt_cpr.c
index 455240a09d..ac1d537bc9 100644
--- a/drivers/net/bnxt/bnxt_cpr.c
+++ b/drivers/net/bnxt/bnxt_cpr.c
@@ -294,6 +294,12 @@ void bnxt_handle_async_event(struct bnxt *bp,
case HWRM_ASYNC_EVENT_CMPL_EVENT_ID_VF_FLR:
bnxt_process_vf_flr(bp, data1);
break;
+ case HWRM_ASYNC_EVENT_CMPL_EVENT_ID_RSS_CHANGE:
+ /* RSS change notification, re-read QCAPS */
+ PMD_DRV_LOG_LINE(INFO, "Async event: RSS change event [%#x,
%#x]",
+data1, data2);
+ bnxt_hwrm_vnic_qcaps(bp);
+ break;
default:
PMD_DRV_LOG_LINE(DEBUG, "handle_async_event id = 0x%x",
event_id);
break;
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 1ac4b8cd58..80f7c1a6a1 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -1307,6 +1307,8 @@ int bnxt_hwrm_vnic_qcaps(struct bnxt *bp)
HWRM_CHECK_RESULT();
+ bp->vnic_cap_flags = 0;
+
flags = rte_le_to_cpu_32(resp->flags);
if (flags & HWRM_VNIC_QCAPS_OUTPUT_FLAGS_COS_ASSIGNMENT_CAP) {
@@ -1444,7 +1446,8 @@ int bnxt_hwrm_func_driver_register(struct bnxt *bp)
req.async_event_fwd[2] |=
rte_cpu_to_le_32(ASYNC_CMPL_EVENT_ID_ECHO_REQUEST |
-ASYNC_CMPL_EVENT_ID_ERROR_REPORT);
+ASYNC_CMPL_EVENT_ID_ERROR_REPORT |
+ASYNC_CMPL_EVENT_ID_RSS_CHANGE);
rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
diff --git a/drivers/net/bnxt/bnxt_hwrm.h b/drivers/net/bnxt/bnxt_hwrm.h
index 2346ae637d..ecb6335b3d 100644
--- a/drivers/net/bnxt/bnxt_hwrm.h
+++ b/drivers/net/bnxt/bnxt_hwrm.h
@@ -41,6 +41,8 @@ struct hwrm_func_qstats_output;
(1 << (HWRM_ASYNC_EVENT_CMPL_EVENT_ID_ECHO_REQUEST - 64))
#defineASYNC_CMPL_EVENT_ID_ERROR_REPORT\
(1 << (HWRM_ASYNC_EVENT_CMPL_EVENT_ID_ERROR_REPORT - 64))
+#defineASYNC_CMPL_EVENT_ID_RSS_CHANGE \
+ (1 << (HWRM_ASYNC_EVENT_CMPL_EVENT_ID_RSS_CHANGE - 64))
#define HWRM_QUEUE_SERVICE_PROFILE_LOSSY \
HWRM_QUEUE_QPORTCFG_OUTPUT_QUEUE_ID0_SERVICE_PROFILE_LOSSY
--
2.39.5 (Apple Git-154)
[PATCH v2 05/13] net/bnxt: add check for invalid mbuf passed by application
From: Kalesh AP
If the application passes invalid mbuf for a Tx pkt, this could
escape all the existing driver checks and driver could end up sending
down invalid TX BDs to the HW. This in turn could lead to a FW reset.
Fix by validating the "mbuf->buf_iova" or "mbuf->buf_addr" passed for
the Tx pkt by the application.
Signed-off-by: Kalesh AP
Reviewed-by: Somnath Kotur
---
drivers/net/bnxt/bnxt_txr.c | 22 ++
1 file changed, 22 insertions(+)
diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c
index 51d3689e9c..4e9e377d5b 100644
--- a/drivers/net/bnxt/bnxt_txr.c
+++ b/drivers/net/bnxt/bnxt_txr.c
@@ -209,6 +209,25 @@ bnxt_invalid_nb_segs(struct rte_mbuf *tx_pkt)
return (nb_segs != tx_pkt->nb_segs);
}
+static int bnxt_invalid_mbuf(struct rte_mbuf *mbuf)
+{
+ uint32_t mbuf_size = sizeof(struct rte_mbuf) + mbuf->priv_size;
+ const char *reason;
+
+ if (unlikely(rte_eal_iova_mode() != RTE_IOVA_VA &&
+rte_eal_iova_mode() != RTE_IOVA_PA))
+ return 0;
+
+ if (unlikely(rte_mbuf_check(mbuf, 1, &reason)))
+ return -EINVAL;
+
+ if (unlikely(mbuf->buf_iova < mbuf_size ||
+(mbuf->buf_iova != rte_mempool_virt2iova(mbuf) +
mbuf_size)))
+ return -EINVAL;
+
+ return 0;
+}
+
static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
struct bnxt_tx_queue *txq,
uint16_t *coal_pkts,
@@ -236,6 +255,9 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
if (unlikely(is_bnxt_in_error(txq->bp)))
return -EIO;
+ if (unlikely(bnxt_invalid_mbuf(tx_pkt)))
+ return -EINVAL;
+
if (unlikely(bnxt_invalid_nb_segs(tx_pkt)))
return -EINVAL;
--
2.39.5 (Apple Git-154)
[PATCH v2 06/13] net/bnxt: free and account a bad Tx mbuf
When the PMD gets a bad Tx mbuf from the application, it is not
freeing it currently. The PMD is depending on the application to
do it. but in most cases, the application may not know this.
Instead the Tx burst function now frees the mbuf and updates the
oerrors counter to indicate that the PMD encounteres a bad mbuf
during transmit.
Signed-off-by: Ajit Khaparde
Reviewed-by: Kalesh AP
---
drivers/net/bnxt/bnxt_stats.c | 9 +
drivers/net/bnxt/bnxt_txq.h | 1 +
drivers/net/bnxt/bnxt_txr.c | 65 +--
3 files changed, 57 insertions(+), 18 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_stats.c b/drivers/net/bnxt/bnxt_stats.c
index 5e59afe79f..9d7cdf925d 100644
--- a/drivers/net/bnxt/bnxt_stats.c
+++ b/drivers/net/bnxt/bnxt_stats.c
@@ -746,6 +746,9 @@ int bnxt_stats_get_op(struct rte_eth_dev *eth_dev,
return rc;
bnxt_fill_rte_eth_stats(bnxt_stats, &ring_stats, i, false);
+ bnxt_stats->oerrors +=
+ rte_atomic_load_explicit(&txq->tx_mbuf_drop,
+
rte_memory_order_relaxed);
}
return rc;
@@ -792,6 +795,12 @@ int bnxt_stats_reset_op(struct rte_eth_dev *eth_dev)
rxq->rx_mbuf_alloc_fail = 0;
}
+ for (i = 0; i < bp->tx_cp_nr_rings; i++) {
+ struct bnxt_tx_queue *txq = bp->tx_queues[i];
+
+ txq->tx_mbuf_drop = 0;
+ }
+
bnxt_clear_prev_stat(bp);
return ret;
diff --git a/drivers/net/bnxt/bnxt_txq.h b/drivers/net/bnxt/bnxt_txq.h
index 9e54985c4c..69652bbaaa 100644
--- a/drivers/net/bnxt/bnxt_txq.h
+++ b/drivers/net/bnxt/bnxt_txq.h
@@ -34,6 +34,7 @@ struct bnxt_tx_queue {
const struct rte_memzone *mz;
struct rte_mbuf **free;
uint64_t offloads;
+ RTE_ATOMIC(uint64_t)tx_mbuf_drop;
};
void bnxt_free_txq_stats(struct bnxt_tx_queue *txq);
diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c
index 4e9e377d5b..f88e214790 100644
--- a/drivers/net/bnxt/bnxt_txr.c
+++ b/drivers/net/bnxt/bnxt_txr.c
@@ -228,7 +228,7 @@ static int bnxt_invalid_mbuf(struct rte_mbuf *mbuf)
return 0;
}
-static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
+static int bnxt_start_xmit(struct rte_mbuf *tx_pkt,
struct bnxt_tx_queue *txq,
uint16_t *coal_pkts,
struct tx_bd_long **last_txbd)
@@ -251,27 +251,37 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
TX_BD_LONG_FLAGS_LHINT_LT2K,
TX_BD_LONG_FLAGS_LHINT_LT2K
};
+ int rc = 0;
- if (unlikely(is_bnxt_in_error(txq->bp)))
- return -EIO;
+ if (unlikely(is_bnxt_in_error(txq->bp))) {
+ rc = -EIO;
+ goto ret;
+ }
- if (unlikely(bnxt_invalid_mbuf(tx_pkt)))
- return -EINVAL;
+ if (unlikely(bnxt_invalid_mbuf(tx_pkt))) {
+ rc = -EINVAL;
+ goto drop;
+ }
- if (unlikely(bnxt_invalid_nb_segs(tx_pkt)))
- return -EINVAL;
+ if (unlikely(bnxt_invalid_nb_segs(tx_pkt))) {
+ rc = -EINVAL;
+ goto drop;
+ }
long_bd = bnxt_xmit_need_long_bd(tx_pkt, txq);
nr_bds = long_bd + tx_pkt->nb_segs;
- if (unlikely(bnxt_tx_avail(txq) < nr_bds))
- return -ENOMEM;
+ if (unlikely(bnxt_tx_avail(txq) < nr_bds)) {
+ rc = -ENOMEM;
+ goto ret;
+ }
/* Check if number of Tx descriptors is above HW limit */
if (unlikely(nr_bds > BNXT_MAX_TSO_SEGS)) {
PMD_DRV_LOG_LINE(ERR,
"Num descriptors %d exceeds HW limit", nr_bds);
- return -ENOSPC;
+ rc = -EINVAL;
+ goto drop;
}
/* If packet length is less than minimum packet size, pad it */
@@ -283,7 +293,8 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
PMD_DRV_LOG_LINE(ERR,
"Failed to pad mbuf by %d bytes",
pad);
- return -ENOMEM;
+ rc = -ENOMEM;
+ goto ret;
}
/* Note: data_len, pkt len are updated in rte_pktmbuf_append */
@@ -291,8 +302,10 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
}
/* Check non zero data_len */
- if (unlikely(bnxt_zero_data_len_tso_segsz(tx_pkt, true, false)))
- return -EIO;
+ if (unlikely(bnxt_zero_data_len_tso_segsz(tx_pkt, true, false))) {
+ rc = -EINVAL;
+ goto drop;
+ }
if (unlikely(txq->bp->ptp_cfg != NULL && txq->bp->ptp_all_rx_tstamp ==
1))
pkt_needs_ts = bnxt_check_pkt_needs_t
[PATCH v2 13/13] net/bnxt: remove unnecessary ifdef
Remove the unnecessary and useless compile-time option for IEEE 1588. Signed-off-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_rxr.c | 8 1 file changed, 8 deletions(-) diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c index 8f0a1b9cfd..5b43bcbea6 100644 --- a/drivers/net/bnxt/bnxt_rxr.c +++ b/drivers/net/bnxt/bnxt_rxr.c @@ -955,10 +955,6 @@ bnxt_set_ol_flags_crx(struct bnxt_rx_ring_info *rxr, ol_flags |= RTE_MBUF_F_RX_RSS_HASH; } -#ifdef RTE_LIBRTE_IEEE1588 - /* TODO: TIMESTAMP flags need to be parsed and set. */ -#endif - mbuf->ol_flags = ol_flags; } @@ -1080,10 +1076,6 @@ static int bnxt_crx_pkt(struct rte_mbuf **rx_pkt, mbuf->data_len = mbuf->pkt_len; mbuf->port = rxq->port_id; -#ifdef RTE_LIBRTE_IEEE1588 - /* TODO: Add timestamp support. */ -#endif - bnxt_set_ol_flags_crx(rxr, rxcmp, mbuf); mbuf->packet_type = bnxt_parse_pkt_type_crx(rxcmp); bnxt_set_vlan_crx(rxcmp, mbuf); -- 2.39.5 (Apple Git-154)
[PATCH v2 08/13] net/bnxt: fix LRO offload capability
Fix LRO offload capability for P7 devices.
Export the capability to the application only if compressed
Rx CQE mode is not enabled.
LRO aka TPA is not supported when compressed CQE mode is set.
Fixes: 3b56c3ffc182 ("net/bnxt: refactor code to support P7 devices")
Cc: sta...@dpdk.org
Signed-off-by: Ajit Khaparde
Reviewed-by: Vasuthevan Maheswaran
---
drivers/net/bnxt/bnxt_rxq.c | 7 ++-
drivers/net/bnxt/bnxt_rxr.c | 3 +++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c
index 1c25c57ca6..249fe7f6e5 100644
--- a/drivers/net/bnxt/bnxt_rxq.c
+++ b/drivers/net/bnxt/bnxt_rxq.c
@@ -30,10 +30,12 @@ uint64_t bnxt_get_rx_port_offloads(struct bnxt *bp)
RTE_ETH_RX_OFFLOAD_KEEP_CRC|
RTE_ETH_RX_OFFLOAD_VLAN_FILTER |
RTE_ETH_RX_OFFLOAD_VLAN_EXTEND |
- RTE_ETH_RX_OFFLOAD_TCP_LRO |
RTE_ETH_RX_OFFLOAD_SCATTER |
RTE_ETH_RX_OFFLOAD_RSS_HASH;
+ if ((BNXT_CHIP_P7(bp) && !bnxt_compressed_rx_cqe_mode_enabled(bp)) ||
+ BNXT_CHIP_P5(bp))
+ rx_offload_capa |= RTE_ETH_RX_OFFLOAD_TCP_LRO;
if (bp->flags & BNXT_FLAG_PTP_SUPPORTED)
rx_offload_capa |= RTE_ETH_RX_OFFLOAD_TIMESTAMP;
if (bp->vnic_cap_flags & BNXT_VNIC_CAP_VLAN_RX_STRIP)
@@ -244,6 +246,9 @@ void bnxt_rx_queue_release_mbufs(struct bnxt_rx_queue *rxq)
}
}
+ if (bnxt_compressed_rx_cqe_mode_enabled(rxq->bp))
+ return;
+
/* Free up mbufs in TPA */
tpa_info = rxq->rx_ring->tpa_info;
if (tpa_info) {
diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
index 0f3fd5326e..dc0bf6032b 100644
--- a/drivers/net/bnxt/bnxt_rxr.c
+++ b/drivers/net/bnxt/bnxt_rxr.c
@@ -1671,6 +1671,9 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq)
}
PMD_DRV_LOG_LINE(DEBUG, "AGG Done!");
+ if (bnxt_compressed_rx_cqe_mode_enabled(rxq->bp))
+ return 0;
+
if (rxr->tpa_info) {
unsigned int max_aggs = BNXT_TPA_MAX_AGGS(rxq->bp);
--
2.39.5 (Apple Git-154)
[PATCH v2 11/13] net/bnxt: remove some unnecessary logs
Remove some unnecessary logs messages when buffer allocation fails.
We already have stats to indicate such failures.
Signed-off-by: Ajit Khaparde
---
drivers/net/bnxt/bnxt_rxr.c | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
index dc0bf6032b..b8637ff57c 100644
--- a/drivers/net/bnxt/bnxt_rxr.c
+++ b/drivers/net/bnxt/bnxt_rxr.c
@@ -316,11 +316,8 @@ static int bnxt_prod_ag_mbuf(struct bnxt_rx_queue *rxq)
/* TODO batch allocation for better performance */
while (rte_bitmap_get(rxr->ag_bitmap, bmap_next)) {
- if (unlikely(bnxt_alloc_ag_data(rxq, rxr, raw_next))) {
- PMD_DRV_LOG_LINE(ERR, "agg mbuf alloc failed:
prod=0x%x",
- raw_next);
+ if (unlikely(bnxt_alloc_ag_data(rxq, rxr, raw_next)))
break;
- }
rte_bitmap_clear(rxr->ag_bitmap, bmap_next);
rxr->ag_raw_prod = raw_next;
raw_next = RING_NEXT(raw_next);
@@ -1092,8 +1089,6 @@ static int bnxt_crx_pkt(struct rte_mbuf **rx_pkt,
bnxt_set_vlan_crx(rxcmp, mbuf);
if (bnxt_alloc_rx_data(rxq, rxr, raw_prod)) {
- PMD_DRV_LOG_LINE(ERR, "mbuf alloc failed with prod=0x%x",
- raw_prod);
rc = -ENOMEM;
goto rx;
}
@@ -1271,8 +1266,6 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
*/
raw_prod = RING_NEXT(raw_prod);
if (bnxt_alloc_rx_data(rxq, rxr, raw_prod)) {
- PMD_DRV_LOG_LINE(ERR, "mbuf alloc failed with prod=0x%x",
- raw_prod);
rc = -ENOMEM;
goto rx;
}
--
2.39.5 (Apple Git-154)
[PATCH v30 00/13] Log library enhancements
Improvements and unification of logging library. This version works on all platforms: Linux, Windows and FreeBSD. This is update to rework patch set. It adds several new features to the console log output. * Putting a timestamp on console output which is useful for analyzing performance of startup codes. Timestamp is optional and must be enabled on command line. * Displaying console output with colors. It uses the standard conventions used by many other Linux commands for colorized display. The default is to enable color if the console output is going to a terminal. But it can be always on or disabled by command line flag. This default was chosen based on what dmesg(1) command does. Color is used by many tools (vi, iproute2, git) because it is helpful; DPDK drivers and libraries print lots of not very useful messages. And having error messages highlighted in bold face helps. This might also get users to pay more attention to error messages. Many bug reports have earlier messages that are lost because there are so many info messages. * Add support for automatic detection of systemd journal protocol. If running as systemd service will get enhanced logging. * Use of syslog is optional and the meaning of the --syslog flag has changed. The default is *not* to use unless requested. Add myself as maintainer for log because by now have added more than previous authors. v30 - add isatty() to windows os shim fix wording in release note etc. Stephen Hemminger (13): maintainers: add for log library windows: make getopt functions have const properties windows: update os shim eal: make eal_log_level_parse common eal: do not duplicate rte_init_alert() messages eal: change rte_exit() output to match rte_log() log: rework syslog handling eal: initialize log before everything else log: add hook for printing log messages log: add timestamp option log: add support for systemd journal log: colorize log output doc: add release note about log library MAINTAINERS | 1 + app/test/test_eal_flags.c | 66 - .../freebsd_gsg/freebsd_eal_parameters.rst| 27 ++ .../prog_guide/env_abstraction_layer.rst | 6 +- doc/guides/prog_guide/log_lib.rst | 60 - doc/guides/rel_notes/release_24_11.rst| 20 ++ lib/eal/common/eal_common_debug.c | 6 +- lib/eal/common/eal_common_options.c | 122 + lib/eal/common/eal_internal_cfg.h | 1 - lib/eal/common/eal_options.h | 5 + lib/eal/freebsd/eal.c | 65 ++--- lib/eal/linux/eal.c | 68 + lib/eal/windows/eal.c | 50 +--- lib/eal/windows/getopt.c | 23 +- lib/eal/windows/include/getopt.h | 8 +- lib/eal/windows/include/rte_os_shim.h | 12 + lib/log/log.c | 83 -- lib/log/log_color.c | 214 lib/log/log_freebsd.c | 12 - lib/log/log_internal.h| 22 +- lib/log/log_journal.c | 152 +++ lib/log/log_linux.c | 61 - lib/log/log_private.h | 53 lib/log/log_syslog.c | 108 lib/log/log_timestamp.c | 240 ++ lib/log/log_windows.c | 18 -- lib/log/meson.build | 12 +- lib/log/version.map | 5 +- 28 files changed, 1168 insertions(+), 352 deletions(-) create mode 100644 lib/log/log_color.c delete mode 100644 lib/log/log_freebsd.c create mode 100644 lib/log/log_journal.c delete mode 100644 lib/log/log_linux.c create mode 100644 lib/log/log_private.h create mode 100644 lib/log/log_syslog.c create mode 100644 lib/log/log_timestamp.c delete mode 100644 lib/log/log_windows.c -- 2.45.2
[PATCH v2 03/13] net/bnxt: add check to validate TSO segment size
From: Kalesh AP
Currently driver has a check to validate TSO seg_size for 0 which
is to detect corrupted packet. But user can set any value as the
TSO seg_size. Adding a check to validate the minimum TSO seg_size
in the driver.
Driver will drop a packet with TSO seg_size less than 4 when
TSO is requested in the MBUF flags.
Signed-off-by: Kalesh AP
Reviewed-by: Ajit Khaparde
Reviewed-by: Somnath Kotur
---
drivers/net/bnxt/bnxt_txr.c | 31 +--
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c
index c82b11e733..6d7e9962ce 100644
--- a/drivers/net/bnxt/bnxt_txr.c
+++ b/drivers/net/bnxt/bnxt_txr.c
@@ -129,23 +129,26 @@ bnxt_xmit_need_long_bd(struct rte_mbuf *tx_pkt, struct
bnxt_tx_queue *txq)
* segments or fragments in those cases.
*/
static bool
-bnxt_zero_data_len_tso_segsz(struct rte_mbuf *tx_pkt, uint8_t data_len_chk)
+bnxt_zero_data_len_tso_segsz(struct rte_mbuf *tx_pkt, bool data_len_chk, bool
tso_segsz_check)
{
- const char *type_str = "Data len";
- uint16_t len_to_check = tx_pkt->data_len;
+ const char *type_str;
- if (data_len_chk == 0) {
- type_str = "TSO Seg size";
- len_to_check = tx_pkt->tso_segsz;
+ /* Minimum TSO seg_size should be 4 */
+ if (tso_segsz_check && tx_pkt->tso_segsz < 4) {
+ type_str = "Unsupported TSO Seg size";
+ goto dump_pkt;
}
- if (len_to_check == 0) {
- PMD_DRV_LOG_LINE(ERR, "Error! Tx pkt %s == 0", type_str);
- rte_pktmbuf_dump(stdout, tx_pkt, 64);
- rte_dump_stack();
- return true;
+ if (data_len_chk && tx_pkt->data_len == 0) {
+ type_str = "Data len == 0";
+ goto dump_pkt;
}
return false;
+dump_pkt:
+ PMD_DRV_LOG_LINE(ERR, "Error! Tx pkt %s == 0", type_str);
+ rte_pktmbuf_dump(stdout, tx_pkt, 64);
+ rte_dump_stack();
+ return true;
}
static bool
@@ -248,7 +251,7 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
}
/* Check non zero data_len */
- if (unlikely(bnxt_zero_data_len_tso_segsz(tx_pkt, 1)))
+ if (unlikely(bnxt_zero_data_len_tso_segsz(tx_pkt, true, false)))
return -EIO;
if (unlikely(txq->bp->ptp_cfg != NULL && txq->bp->ptp_all_rx_tstamp ==
1))
@@ -338,7 +341,7 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
*/
txbd1->kid_or_ts_low_hdr_size = hdr_size >> 1;
txbd1->kid_or_ts_high_mss = tx_pkt->tso_segsz;
- if (unlikely(bnxt_zero_data_len_tso_segsz(tx_pkt, 0)))
+ if (unlikely(bnxt_zero_data_len_tso_segsz(tx_pkt,
false, true)))
return -EIO;
} else if ((tx_pkt->ol_flags & PKT_TX_OIP_IIP_TCP_UDP_CKSUM) ==
@@ -413,7 +416,7 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
m_seg = tx_pkt->next;
while (m_seg) {
/* Check non zero data_len */
- if (unlikely(bnxt_zero_data_len_tso_segsz(m_seg, 1)))
+ if (unlikely(bnxt_zero_data_len_tso_segsz(m_seg, true, false)))
return -EIO;
txr->tx_raw_prod = RING_NEXT(txr->tx_raw_prod);
--
2.39.5 (Apple Git-154)
[PATCH v2 00/13] patchset for bnxt PMD
This patchset contains changes to the BNXT PMD. Some of them are fixes. Please accept and apply. v1->v2: Fixed up coding style issues, spelling errors. Ajit Khaparde (6): net/bnxt: fix TCP and UDP checksum flags net/bnxt: free and account a bad Tx mbuf net/bnxt: fix LRO offload capability net/bnxt: remove some unnecessary logs net/bnxt: add support for buffer split Rx offload net/bnxt: remove unnecessary ifdef Kalesh AP (2): net/bnxt: add check to validate TSO segment size net/bnxt: add check for invalid mbuf passed by application Kishore Padmanabha (2): net/bnxt: disable VLAN filter when TF is enabled net/bnxt: remove the VNIC async event handler Manish Kurup (1): net/bnxt: register for and handle RSS change event Peter Spreadborough (1): net/bnxt: fix bad action offset in Tx bd Somnath Kotur (1): net/bnxt: add check for number of segs drivers/net/bnxt/bnxt.h| 5 ++ drivers/net/bnxt/bnxt_cpr.c| 54 ++--- drivers/net/bnxt/bnxt_ethdev.c | 11 ++- drivers/net/bnxt/bnxt_hwrm.c | 55 + drivers/net/bnxt/bnxt_hwrm.h | 2 + drivers/net/bnxt/bnxt_reps.c | 4 +- drivers/net/bnxt/bnxt_rxq.c| 50 ++-- drivers/net/bnxt/bnxt_rxq.h| 4 + drivers/net/bnxt/bnxt_rxr.c| 24 ++ drivers/net/bnxt/bnxt_stats.c | 9 +++ drivers/net/bnxt/bnxt_txq.h| 1 + drivers/net/bnxt/bnxt_txr.c| 139 ++--- drivers/net/bnxt/bnxt_vnic.h | 1 + 13 files changed, 238 insertions(+), 121 deletions(-) -- 2.39.5 (Apple Git-154)
[PATCH v2 02/13] net/bnxt: fix bad action offset in Tx bd
From: Peter Spreadborough
This change ensures that the high part of an action table entry
offset stored in the Tx BD is set correctly. A bad value will
cause the PDCU to abort a fetch an may stall the pipeline.
Fixes: 527b10089cc5 ("net/bnxt: optimize Tx completion handling")
Cc: sta...@dpdk.org
Signed-off-by: Peter Spreadborough
Reviewed-by: Kishore Padmanabha
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/bnxt_txr.c | 13 +
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c
index 38f858f27f..c82b11e733 100644
--- a/drivers/net/bnxt/bnxt_txr.c
+++ b/drivers/net/bnxt/bnxt_txr.c
@@ -308,10 +308,15 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
*/
txbd1->kid_or_ts_high_mss = 0;
- if (txq->vfr_tx_cfa_action)
- txbd1->cfa_action = txq->vfr_tx_cfa_action;
- else
- txbd1->cfa_action = txq->bp->tx_cfa_action;
+ if (txq->vfr_tx_cfa_action) {
+ txbd1->cfa_action = txq->vfr_tx_cfa_action & 0x;
+ txbd1->cfa_action_high = (txq->vfr_tx_cfa_action >> 16)
&
+ TX_BD_LONG_CFA_ACTION_HIGH_MASK;
+ } else {
+ txbd1->cfa_action = txq->bp->tx_cfa_action & 0x;
+ txbd1->cfa_action_high = (txq->bp->tx_cfa_action >> 16)
&
+ TX_BD_LONG_CFA_ACTION_HIGH_MASK;
+ }
if (tx_pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG ||
tx_pkt->ol_flags & RTE_MBUF_F_TX_UDP_SEG) {
--
2.39.5 (Apple Git-154)
[PATCH v2 01/13] net/bnxt: fix TCP and UDP checksum flags
Set TCP and UDP checksum flags explicitly for LSO capable packets.
In some older chip variants, this will enable the hardware compute
the checksum correctly for tunnel and non-tunnel packets.
Fixes: 1d76c878b21d ("net/bnxt: support updating IPID")
Cc: sta...@dpdk.org
Signed-off-by: Ajit Khaparde
Reviewed-by: Kalesh AP
Reviewed-by: Damodharam Ammepalli
---
drivers/net/bnxt/bnxt_txr.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c
index 12e4faa8fa..38f858f27f 100644
--- a/drivers/net/bnxt/bnxt_txr.c
+++ b/drivers/net/bnxt/bnxt_txr.c
@@ -319,7 +319,9 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
/* TSO */
txbd1->lflags |= TX_BD_LONG_LFLAGS_LSO |
-TX_BD_LONG_LFLAGS_T_IPID;
+TX_BD_LONG_LFLAGS_T_IPID |
+TX_BD_LONG_LFLAGS_TCP_UDP_CHKSUM |
+TX_BD_LONG_LFLAGS_T_IP_CHKSUM;
hdr_size = tx_pkt->l2_len + tx_pkt->l3_len +
tx_pkt->l4_len;
hdr_size += (tx_pkt->ol_flags &
RTE_MBUF_F_TX_TUNNEL_MASK) ?
--
2.39.5 (Apple Git-154)
Re: [PATCH v7 7/9] net/zxdh: add configure zxdh intr implementation
On Tue, 22 Oct 2024 20:20:40 +0800
Junlong Wang wrote:
> +/* Interrupt handler triggered by NIC for handling specific interrupt. */
> +static void zxdh_fromriscv_intr_handler(void *param)
> +{
> + struct rte_eth_dev *dev = param;
> + struct zxdh_hw *hw = dev->data->dev_private;
> + uint64_t virt_addr = 0;
> +
> + virt_addr = (uint64_t)(hw->bar_addr[ZXDH_BAR0_INDEX] +
> ZXDH_CTRLCH_OFFSET);
There is no need to initialize a variable like virt_addr which is set later.
[PATCH v30 04/13] eal: make eal_log_level_parse common
The code to parse for log-level option should be same on
all OS variants.
Signed-off-by: Stephen Hemminger
Acked-by: Tyler Retzlaff
Acked-by: Morten Brørup
Acked-by: Bruce Richardson
---
lib/eal/common/eal_common_options.c | 40 +++
lib/eal/common/eal_options.h| 1 +
lib/eal/freebsd/eal.c | 42 -
lib/eal/linux/eal.c | 39 ---
lib/eal/windows/eal.c | 35
5 files changed, 41 insertions(+), 116 deletions(-)
diff --git a/lib/eal/common/eal_common_options.c
b/lib/eal/common/eal_common_options.c
index f1a5e329a5..eb079a65a9 100644
--- a/lib/eal/common/eal_common_options.c
+++ b/lib/eal/common/eal_common_options.c
@@ -1640,6 +1640,46 @@ eal_parse_huge_unlink(const char *arg, struct
hugepage_file_discipline *out)
return -1;
}
+/* Parse the all arguments looking for log related ones */
+int
+eal_log_level_parse(int argc, char * const argv[])
+{
+ struct internal_config *internal_conf =
eal_get_internal_configuration();
+ int option_index, opt;
+ const int old_optind = optind;
+ const int old_optopt = optopt;
+ const int old_opterr = opterr;
+ char *old_optarg = optarg;
+#ifdef RTE_EXEC_ENV_FREEBSD
+ const int old_optreset = optreset;
+ optreset = 1;
+#endif
+
+ optind = 1;
+ opterr = 0;
+
+ while ((opt = getopt_long(argc, argv, eal_short_options,
+ eal_long_options, &option_index)) != EOF) {
+
+ switch (opt) {
+ case OPT_LOG_LEVEL_NUM:
+ if (eal_parse_common_option(opt, optarg, internal_conf)
< 0)
+ return -1;
+ break;
+ }
+ }
+
+ /* restore getopt lib */
+ optind = old_optind;
+ optopt = old_optopt;
+ optarg = old_optarg;
+ opterr = old_opterr;
+#ifdef RTE_EXEC_ENV_FREEBSD
+ optreset = old_optreset;
+#endif
+ return 0;
+}
+
int
eal_parse_common_option(int opt, const char *optarg,
struct internal_config *conf)
diff --git a/lib/eal/common/eal_options.h b/lib/eal/common/eal_options.h
index 3cc9cb6412..f3f2e104f6 100644
--- a/lib/eal/common/eal_options.h
+++ b/lib/eal/common/eal_options.h
@@ -96,6 +96,7 @@ enum {
extern const char eal_short_options[];
extern const struct option eal_long_options[];
+int eal_log_level_parse(int argc, char * const argv[]);
int eal_parse_common_option(int opt, const char *argv,
struct internal_config *conf);
int eal_option_device_parse(void);
diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c
index 1229230063..d3b40e81d8 100644
--- a/lib/eal/freebsd/eal.c
+++ b/lib/eal/freebsd/eal.c
@@ -363,48 +363,6 @@ eal_get_hugepage_mem_size(void)
return (size < SIZE_MAX) ? (size_t)(size) : SIZE_MAX;
}
-/* Parse the arguments for --log-level only */
-static void
-eal_log_level_parse(int argc, char **argv)
-{
- int opt;
- char **argvopt;
- int option_index;
- const int old_optind = optind;
- const int old_optopt = optopt;
- const int old_optreset = optreset;
- char * const old_optarg = optarg;
- struct internal_config *internal_conf =
- eal_get_internal_configuration();
-
- argvopt = argv;
- optind = 1;
- optreset = 1;
-
- while ((opt = getopt_long(argc, argvopt, eal_short_options,
- eal_long_options, &option_index)) != EOF) {
-
- int ret;
-
- /* getopt is not happy, stop right now */
- if (opt == '?')
- break;
-
- ret = (opt == OPT_LOG_LEVEL_NUM) ?
- eal_parse_common_option(opt, optarg, internal_conf) : 0;
-
- /* common parser is not happy */
- if (ret < 0)
- break;
- }
-
- /* restore getopt lib */
- optind = old_optind;
- optopt = old_optopt;
- optreset = old_optreset;
- optarg = old_optarg;
-}
-
/* Parse the argument given in the command line of the application */
static int
eal_parse_args(int argc, char **argv)
diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c
index 54577b7718..40d750ed0d 100644
--- a/lib/eal/linux/eal.c
+++ b/lib/eal/linux/eal.c
@@ -546,45 +546,6 @@ eal_parse_vfio_vf_token(const char *vf_token)
return -1;
}
-/* Parse the arguments for --log-level only */
-static void
-eal_log_level_parse(int argc, char **argv)
-{
- int opt;
- char **argvopt;
- int option_index;
- const int old_optind = optind;
- const int old_optopt = optopt;
- char * const old_optarg = optarg;
- struct internal_config *internal_conf =
- eal_get_internal_configuration();
-
- argvopt = argv;
- optind = 1;
-
- while ((opt =
[PATCH v30 02/13] windows: make getopt functions have const properties
Having different prototypes on different platforms can lead
to lots of unnecessary workarounds. Looks like the version of
getopt used from windows was based on an older out of date
version from FreeBSD.
This patch changes getopt, getopt_long, etc to have the same const
attributes as Linux and FreeBSD. The changes are derived from
the current FreeBSD version of getopt_long.
Signed-off-by: Stephen Hemminger
Acked-by: Tyler Retzlaff
Acked-by: Dmitry Kozlyuk
Acked-by: Morten Brørup
Acked-by: Bruce Richardson
Acked-by: Chengwen Feng
---
lib/eal/windows/getopt.c | 23 ---
lib/eal/windows/include/getopt.h | 8
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/lib/eal/windows/getopt.c b/lib/eal/windows/getopt.c
index a1f51c6c23..50ff71b930 100644
--- a/lib/eal/windows/getopt.c
+++ b/lib/eal/windows/getopt.c
@@ -20,7 +20,7 @@
#include
#include
-const char*optarg; /* argument associated with option */
+char*optarg; /* argument associated with option */
intopterr = 1; /* if error message should be printed */
intoptind = 1; /* index into parent argv vector */
intoptopt = '?'; /* character checked for validity */
@@ -39,9 +39,9 @@ static void pass(const char *a) {(void) a; }
#defineBADARG ((*options == ':') ? (int)':' : (int)'?')
#defineINORDER 1
-#defineEMSG""
+static char EMSG[] = "";
-static const char *place = EMSG; /* option letter processing */
+static char *place = EMSG; /* option letter processing */
/* XXX: set optreset to 1 rather than these two */
static int nonopt_start = -1; /* first non option argument (for permute) */
@@ -80,7 +80,7 @@ gcd(int a, int b)
*/
static void
permute_args(int panonopt_start, int panonopt_end, int opt_end,
- char **nargv)
+ char * const *nargv)
{
int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
char *swap;
@@ -101,11 +101,12 @@ permute_args(int panonopt_start, int panonopt_end, int
opt_end,
pos -= nnonopts;
else
pos += nopts;
+
swap = nargv[pos];
/* LINTED const cast */
- ((char **) nargv)[pos] = nargv[cstart];
+ ((char **)(uintptr_t)nargv)[pos] = nargv[cstart];
/* LINTED const cast */
- ((char **)nargv)[cstart] = swap;
+ ((char **)(uintptr_t)nargv)[cstart] = swap;
}
}
}
@@ -116,7 +117,7 @@ permute_args(int panonopt_start, int panonopt_end, int
opt_end,
* Returns -1 if short_too is set and the option does not match long_options.
*/
static int
-parse_long_options(char **nargv, const char *options,
+parse_long_options(char * const *nargv, const char *options,
const struct option *long_options, int *idx, int short_too)
{
const char *current_argv;
@@ -236,7 +237,7 @@ parse_long_options(char **nargv, const char *options,
* Parse argc/argv argument vector. Called by user level routines.
*/
static int
-getopt_internal(int nargc, char **nargv, const char *options,
+getopt_internal(int nargc, char *const nargv[], const char *options,
const struct option *long_options, int *idx, int flags)
{
char *oli; /* option letter list index */
@@ -434,7 +435,7 @@ getopt_internal(int nargc, char **nargv, const char
*options,
* Parse argc/argv argument vector.
*/
int
-getopt(int nargc, char *nargv[], const char *options)
+getopt(int nargc, char *const nargv[], const char *options)
{
return getopt_internal(nargc, nargv, options, NULL, NULL,
FLAG_PERMUTE);
@@ -445,7 +446,7 @@ getopt(int nargc, char *nargv[], const char *options)
* Parse argc/argv argument vector.
*/
int
-getopt_long(int nargc, char *nargv[], const char *options,
+getopt_long(int nargc, char *const nargv[], const char *options,
const struct option *long_options, int *idx)
{
@@ -458,7 +459,7 @@ getopt_long(int nargc, char *nargv[], const char *options,
* Parse argc/argv argument vector.
*/
int
-getopt_long_only(int nargc, char *nargv[], const char *options,
+getopt_long_only(int nargc, char *const nargv[], const char *options,
const struct option *long_options, int *idx)
{
diff --git a/lib/eal/windows/include/getopt.h b/lib/eal/windows/include/getopt.h
index 6f57af454b..e4cf6873cb 100644
--- a/lib/eal/windows/include/getopt.h
+++ b/lib/eal/windows/include/getopt.h
@@ -44,7 +44,7 @@
/** argument to current option, or NULL if it has none */
-extern const char *optarg;
+extern char *optarg;
/** Current position in arg string. Starts from 1.
* Setting to 0 resets state.
*/
@@ -80,14 +80,14 @@ struct option {
};
/** Compat: getopt */
-int getopt(i
[PATCH v30 06/13] eal: change rte_exit() output to match rte_log()
The rte_exit() output format confuses the timestamp and coloring options. Change it to use be a single line with proper prefix. Before: [ 0.006481] EAL: Error - exiting with code: 1 Cause: [ 0.006489] Cannot init EAL: Permission denied After: [ 0.006238] EAL: Error - exiting with code: 1 [ 0.006250] EAL: Cannot init EAL: Permission denied Signed-off-by: Stephen Hemminger Acked-by: Tyler Retzlaff Acked-by: Morten Brørup Acked-by: Bruce Richardson Acked-by: Chengwen Feng --- lib/eal/common/eal_common_debug.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/eal/common/eal_common_debug.c b/lib/eal/common/eal_common_debug.c index 3e77995896..bcfcd6df6f 100644 --- a/lib/eal/common/eal_common_debug.c +++ b/lib/eal/common/eal_common_debug.c @@ -36,15 +36,13 @@ rte_exit(int exit_code, const char *format, ...) va_list ap; if (exit_code != 0) - RTE_LOG(CRIT, EAL, "Error - exiting with code: %d\n" - " Cause: ", exit_code); + EAL_LOG(CRIT, "Error - exiting with code: %d", exit_code); va_start(ap, format); rte_vlog(RTE_LOG_CRIT, RTE_LOGTYPE_EAL, format, ap); va_end(ap); if (rte_eal_cleanup() != 0 && rte_errno != EALREADY) - EAL_LOG(CRIT, - "EAL could not release all resources"); + EAL_LOG(CRIT, "EAL could not release all resources"); exit(exit_code); } -- 2.45.2
[PATCH v30 03/13] windows: update os shim
Windows does not have localtime_r but it does have a similar
function that can be used instead.
Use rte_os_shim.h in lib/log instead of redefine of strdup.
Add fileno() and isatty() to the wrapper.
Signed-off-by: Stephen Hemminger
Acked-by: Tyler Retzlaff
Acked-by: Morten Brørup
Acked-by: Bruce Richardson
Acked-by: Chengwen Feng
---
lib/eal/windows/include/rte_os_shim.h | 12
lib/log/log.c | 7 +++
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/lib/eal/windows/include/rte_os_shim.h
b/lib/eal/windows/include/rte_os_shim.h
index eda8113662..0e74eb19c7 100644
--- a/lib/eal/windows/include/rte_os_shim.h
+++ b/lib/eal/windows/include/rte_os_shim.h
@@ -30,6 +30,8 @@
#define write(fd, buf, n) _write(fd, buf, n)
#define close(fd) _close(fd)
#define unlink(path) _unlink(path)
+#define fileno(f) _fileno(f)
+#define isatty(fd) _isatty(fd)
#define IPVERSION 4
@@ -110,4 +112,14 @@ rte_clock_gettime(clockid_t clock_id, struct timespec *tp)
}
#define clock_gettime(clock_id, tp) rte_clock_gettime(clock_id, tp)
+static inline struct tm *
+rte_localtime_r(const time_t *timep, struct tm *result)
+{
+ if (localtime_s(result, timep) == 0)
+ return result;
+ else
+ return NULL;
+}
+#define localtime_r(timep, result) rte_localtime_r(timep, result)
+
#endif /* _RTE_OS_SHIM_ */
diff --git a/lib/log/log.c b/lib/log/log.c
index 255f757d94..7416c82b34 100644
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -14,13 +14,12 @@
#include
#include
-
-#include "log_internal.h"
-
#ifdef RTE_EXEC_ENV_WINDOWS
-#define strdup _strdup
+#include
#endif
+#include "log_internal.h"
+
struct rte_log_dynamic_type {
const char *name;
uint32_t loglevel;
--
2.45.2
[PATCH v30 12/13] log: colorize log output
Like dmesg, colorize the log output (unless redirected to file).
Timestamp is green, the subsystem is in yellow and the message
is red if urgent, boldface if an error, and normal for info and
debug messages.
The default is to not use color since it may disturb
automatic tests and other embedded usage.
Signed-off-by: Stephen Hemminger
Acked-by: Morten Brørup
Acked-by: Bruce Richardson
Acked-by: Chengwen Feng
---
app/test/test_eal_flags.c | 24
doc/guides/prog_guide/log_lib.rst | 24
lib/eal/common/eal_common_options.c | 11 ++
lib/eal/common/eal_options.h| 2 +
lib/log/log.c | 21 ++-
lib/log/log_color.c | 214
lib/log/log_internal.h | 5 +
lib/log/log_private.h | 8 ++
lib/log/meson.build | 1 +
lib/log/version.map | 1 +
10 files changed, 307 insertions(+), 4 deletions(-)
create mode 100644 lib/log/log_color.c
diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c
index e24630edde..061ddaf97f 100644
--- a/app/test/test_eal_flags.c
+++ b/app/test/test_eal_flags.c
@@ -1067,6 +1067,18 @@ test_misc_flags(void)
const char * const argv25[] = {prgname, prefix, mp_flag,
"--log-timestamp=invalid" };
+ /* Try running with --log-color */
+ const char * const argv26[] = {prgname, prefix, mp_flag,
+ "--log-color" };
+
+ /* Try running with --log-color=never */
+ const char * const argv27[] = {prgname, prefix, mp_flag,
+ "--log-color=never" };
+
+ /* Try running with --log-color=invalid */
+ const char * const argv28[] = {prgname, prefix, mp_flag,
+ "--log-color=invalid" };
+
/* run all tests also applicable to FreeBSD first */
@@ -1187,6 +1199,18 @@ test_misc_flags(void)
printf("Error - process did run ok with --log-timestamp=invalid
parameter\n");
goto fail;
}
+ if (launch_proc(argv26) != 0) {
+ printf("Error - process did not run ok with --log-color
parameter\n");
+ goto fail;
+ }
+ if (launch_proc(argv27) != 0) {
+ printf("Error - process did not run ok with --log-color=never
parameter\n");
+ goto fail;
+ }
+ if (launch_proc(argv28) == 0) {
+ printf("Error - process did run ok with --log-timestamp=invalid
parameter\n");
+ goto fail;
+ }
rmdir(hugepath_dir3);
diff --git a/doc/guides/prog_guide/log_lib.rst
b/doc/guides/prog_guide/log_lib.rst
index 3843b70016..748d3836dc 100644
--- a/doc/guides/prog_guide/log_lib.rst
+++ b/doc/guides/prog_guide/log_lib.rst
@@ -60,6 +60,7 @@ For example::
Within an application, the same result can be got using the
``rte_log_set_level_pattern()`` or ``rte_log_set_level_regex()`` APIs.
+
Using Logging APIs to Generate Log Messages
---
@@ -140,3 +141,26 @@ To prefix all console messages with ISO format time the
syntax is::
Timestamp option has no effect if using syslog because the ``syslog()``
service already does timestamping internally.
+
+
+Color output
+
+
+The log library will highlight important messages.
+This is controlled by the ``--log-color`` option.
+The optional argument describes when color is enabled:
+
+:never: Do not enable color. This is the default behavior.
+
+:auto: Enable color only when printing to a terminal.
+ This is the same as ``--log-color`` with no argument
+
+:always: Always print color
+
+For example to enable color in logs if using terminal::
+
+ /path/to/app --log-color
+
+.. note::
+
+ Color output is never used for syslog or systemd journal logging.
diff --git a/lib/eal/common/eal_common_options.c
b/lib/eal/common/eal_common_options.c
index a70d63479a..6965666a7c 100644
--- a/lib/eal/common/eal_common_options.c
+++ b/lib/eal/common/eal_common_options.c
@@ -73,6 +73,7 @@ eal_long_options[] = {
{OPT_HUGE_UNLINK, 2, NULL, OPT_HUGE_UNLINK_NUM },
{OPT_IOVA_MODE, 1, NULL, OPT_IOVA_MODE_NUM},
{OPT_LCORES,1, NULL, OPT_LCORES_NUM },
+ {OPT_LOG_COLOR, 2, NULL, OPT_LOG_COLOR_NUM},
{OPT_LOG_LEVEL, 1, NULL, OPT_LOG_LEVEL_NUM},
{OPT_LOG_TIMESTAMP, 2, NULL, OPT_LOG_TIMESTAMP_NUM},
{OPT_TRACE, 1, NULL, OPT_TRACE_NUM},
@@ -1620,6 +1621,7 @@ eal_log_level_parse(int argc, char * const argv[])
case OPT_LOG_LEVEL_NUM:
case OPT_SYSLOG_NUM:
case OPT_LOG_TIMESTAMP_NUM:
+ case OPT_LOG_COLOR_NUM:
if (eal_parse_common_option(opt, optarg, internal_conf)
< 0)
[PATCH v30 08/13] eal: initialize log before everything else
In order for all log messages (including CPU mismatch) to
come out through the logging library, it must be initialized
as early in rte_eal_init() as possible on all platforms.
Where it was done before was likely historical based on
the support of non-OS isolated CPU's which required a shared
memory buffer; that support was dropped before DPDK was
publicly released.
Signed-off-by: Stephen Hemminger
Acked-by: Tyler Retzlaff
Acked-by: Morten Brørup
Acked-by: Bruce Richardson
Acked-by: Chengwen Feng
---
lib/eal/freebsd/eal.c | 13 ++---
lib/eal/linux/eal.c| 14 +-
lib/eal/windows/eal.c | 8 ++--
lib/log/log_internal.h | 6 ++
4 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c
index a609d40ee0..8631a20eae 100644
--- a/lib/eal/freebsd/eal.c
+++ b/lib/eal/freebsd/eal.c
@@ -52,6 +52,7 @@
#include "eal_options.h"
#include "eal_memcfg.h"
#include "eal_trace.h"
+#include "log_internal.h"
#define MEMSIZE_IF_NO_HUGE_PAGE (64ULL * 1024ULL * 1024ULL)
@@ -546,6 +547,15 @@ rte_eal_init(int argc, char **argv)
bool has_phys_addr;
enum rte_iova_mode iova_mode;
+ /* setup log as early as possible */
+ if (eal_log_level_parse(argc, argv) < 0) {
+ rte_eal_init_alert("invalid log arguments.");
+ rte_errno = EINVAL;
+ return -1;
+ }
+
+ eal_log_init(getprogname());
+
/* checks if the machine is adequate */
if (!rte_cpu_is_supported()) {
rte_eal_init_alert("unsupported cpu type.");
@@ -572,9 +582,6 @@ rte_eal_init(int argc, char **argv)
/* clone argv to report out later in telemetry */
eal_save_args(argc, argv);
- /* set log level as early as possible */
- eal_log_level_parse(argc, argv);
-
if (rte_eal_cpu_init() < 0) {
rte_eal_init_alert("Cannot detect lcores.");
rte_errno = ENOTSUP;
diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c
index 0c44d0b6e3..62d3d281c4 100644
--- a/lib/eal/linux/eal.c
+++ b/lib/eal/linux/eal.c
@@ -926,6 +926,15 @@ rte_eal_init(int argc, char **argv)
struct internal_config *internal_conf =
eal_get_internal_configuration();
+ /* setup log as early as possible */
+ if (eal_log_level_parse(argc, argv) < 0) {
+ rte_eal_init_alert("invalid log arguments.");
+ rte_errno = EINVAL;
+ return -1;
+ }
+
+ eal_log_init(program_invocation_short_name);
+
/* checks if the machine is adequate */
if (!rte_cpu_is_supported()) {
rte_eal_init_alert("unsupported cpu type.");
@@ -949,9 +958,6 @@ rte_eal_init(int argc, char **argv)
eal_reset_internal_config(internal_conf);
- /* set log level as early as possible */
- eal_log_level_parse(argc, argv);
-
/* clone argv to report out later in telemetry */
eal_save_args(argc, argv);
@@ -1103,8 +1109,6 @@ rte_eal_init(int argc, char **argv)
#endif
}
- eal_log_init(program_invocation_short_name);
-
#ifdef VFIO_PRESENT
if (rte_vfio_enable("vfio")) {
rte_eal_init_alert("Cannot init VFIO");
diff --git a/lib/eal/windows/eal.c b/lib/eal/windows/eal.c
index cd8420a82c..33f044d7cc 100644
--- a/lib/eal/windows/eal.c
+++ b/lib/eal/windows/eal.c
@@ -249,9 +249,13 @@ rte_eal_init(int argc, char **argv)
char cpuset[RTE_CPU_AFFINITY_STR_LEN];
char thread_name[RTE_THREAD_NAME_SIZE];
- eal_log_init(NULL);
+ if (eal_log_level_parse(argc, argv) < 0) {
+ rte_eal_init_alert("invalid log arguments.");
+ rte_errno = EINVAL;
+ return -1;
+ }
- eal_log_level_parse(argc, argv);
+ eal_log_init(NULL);
if (eal_create_cpu_map() < 0) {
rte_eal_init_alert("Cannot discover CPU and NUMA.");
diff --git a/lib/log/log_internal.h b/lib/log/log_internal.h
index 3c46328e7b..d5fabd7ef7 100644
--- a/lib/log/log_internal.h
+++ b/lib/log/log_internal.h
@@ -16,6 +16,12 @@
__rte_internal
void eal_log_init(const char *id);
+/*
+ * Determine where log data is written when no call to rte_openlog_stream.
+ */
+__rte_internal
+void eal_log_set_default(FILE *default_log);
+
/*
* Save a log option for later.
*/
--
2.45.2
[PATCH v30 13/13] doc: add release note about log library
Significant enough to warrant a release note. Signed-off-by: Stephen Hemminger Acked-by: Morten Brørup Acked-by: Bruce Richardson Acked-by: Chengwen Feng --- doc/guides/rel_notes/release_24_11.rst | 20 1 file changed, 20 insertions(+) diff --git a/doc/guides/rel_notes/release_24_11.rst b/doc/guides/rel_notes/release_24_11.rst index 53a5ffebe5..b96042ea14 100644 --- a/doc/guides/rel_notes/release_24_11.rst +++ b/doc/guides/rel_notes/release_24_11.rst @@ -353,6 +353,26 @@ API Changes and replaced it with a new shared devarg ``llq_policy`` that keeps the same logic. +* **Logging library changes** + + * The log is initialized earlier in startup so all messages go through the library. + + * Added a new option to timestamp log messages, which is useful for +debugging delays in application and driver startup. + + * If the application is a systemd service and the log output is being +sent to standard error then DPDK will switch to journal native protocol. +This allows the more data such as severity to be sent. + + * The syslog option has changed. By default, messages are no longer sent +to syslog unless the *--syslog* option is specified. +Syslog is also supported on FreeBSD (but not on Windows). + + * Log messages can be timestamped with *--log-timestamp* option. + + * Log messages can be colorized with the *--log-color* option. + + ABI Changes --- -- 2.45.2
[PATCH v30 10/13] log: add timestamp option
When debugging driver or startup issues, it is useful to have
a timestamp on each message printed. The messages in syslog
already have a timestamp, but often syslog is not available
during testing.
There are multiple timestamp formats similar to Linux dmesg.
The default is time relative since startup (when first
step of logging initialization is done by constructor).
Other alternative formats are delta, ctime, reltime and iso formats.
Example:
$ dpdk-testpmd --log-timestamp -- -i
[ 0.008610] EAL: Detected CPU lcores: 8
[ 0.008634] EAL: Detected NUMA nodes: 1
[ 0.008792] EAL: Detected static linkage of DPDK
[ 0.010620] EAL: Multi-process socket /var/run/dpdk/rte/mp_socket
[ 0.012618] EAL: Selected IOVA mode 'VA'
[ 0.016675] testpmd: No probed ethernet devices
Interactive-mode selected
Signed-off-by: Stephen Hemminger
Acked-by: Morten Brørup
Acked-by: Bruce Richardson
---
app/test/test_eal_flags.c | 26 +++
doc/guides/prog_guide/log_lib.rst | 29
lib/eal/common/eal_common_options.c | 14 +-
lib/eal/common/eal_options.h| 2 +
lib/eal/freebsd/eal.c | 6 +-
lib/eal/linux/eal.c | 4 +-
lib/eal/windows/eal.c | 4 +-
lib/log/log.c | 5 +
lib/log/log_internal.h | 9 ++
lib/log/log_private.h | 6 +
lib/log/log_timestamp.c | 240
lib/log/meson.build | 1 +
lib/log/version.map | 1 +
13 files changed, 341 insertions(+), 6 deletions(-)
create mode 100644 lib/log/log_timestamp.c
diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c
index 9fcf0d56e6..e24630edde 100644
--- a/app/test/test_eal_flags.c
+++ b/app/test/test_eal_flags.c
@@ -1055,6 +1055,19 @@ test_misc_flags(void)
const char * const argv22[] = {prgname, prefix, mp_flag,
"--huge-worker-stack=512"};
+ /* Try running with --log-timestamp */
+ const char * const argv23[] = {prgname, prefix, mp_flag,
+ "--log-timestamp" };
+
+ /* Try running with --log-timestamp=iso */
+ const char * const argv24[] = {prgname, prefix, mp_flag,
+ "--log-timestamp=iso" };
+
+ /* Try running with invalid timestamp */
+ const char * const argv25[] = {prgname, prefix, mp_flag,
+ "--log-timestamp=invalid" };
+
+
/* run all tests also applicable to FreeBSD first */
if (launch_proc(argv0) == 0) {
@@ -1162,6 +1175,19 @@ test_misc_flags(void)
printf("Error - process did not run ok with
--huge-worker-stack=size parameter\n");
goto fail;
}
+ if (launch_proc(argv23) != 0) {
+ printf("Error - process did not run ok with --log-timestamp
parameter\n");
+ goto fail;
+ }
+ if (launch_proc(argv24) != 0) {
+ printf("Error - process did not run ok with --log-timestamp=iso
parameter\n");
+ goto fail;
+ }
+ if (launch_proc(argv25) == 0) {
+ printf("Error - process did run ok with --log-timestamp=invalid
parameter\n");
+ goto fail;
+ }
+
rmdir(hugepath_dir3);
rmdir(hugepath_dir2);
diff --git a/doc/guides/prog_guide/log_lib.rst
b/doc/guides/prog_guide/log_lib.rst
index a77ba939a9..3843b70016 100644
--- a/doc/guides/prog_guide/log_lib.rst
+++ b/doc/guides/prog_guide/log_lib.rst
@@ -111,3 +111,32 @@ Throughout the cfgfile library, all logging calls are
therefore of the form:
CFG_LOG(ERR, "invalid comment characters %c",
params->comment_character);
+
+Log timestamp
+~
+
+An optional timestamp can be added before each message
+by adding the ``--log-timestamp`` option.
+For example::
+
+ /path/to/app --log-level=lib.*:debug --log-timestamp
+
+Multiple timestamp alternative timestamp formats are available:
+
+.. csv-table:: Log time stamp format
+ :header: "Format", "Description", "Example"
+ :widths: 6, 30, 32
+
+ "ctime", "Unix ctime", "``[Wed Mar 20 07:26:12 2024]``"
+ "delta", "Offset since last", "``[<3.162373>]``"
+ "reltime", "Seconds since last or time if minute changed", "``[
+3.001791]`` or ``[Mar20 07:26:12]``"
+ "iso", "ISO-8601", "``[2024-03-20T07:26:12−07:00]``"
+
+To prefix all console messages with ISO format time the syntax is::
+
+ /path/to/app --log-timestamp=iso
+
+.. note::
+
+ Timestamp option has no effect if using syslog because the ``syslog()``
+ service already does timestamping internally.
diff --git a/lib/eal/common/eal_common_options.c
b/lib/eal/common/eal_common_options.c
index ca7b702e03..a70d63479a 100644
--- a/lib/eal/common/eal_common_options.c
+++ b/lib/eal/common/eal_common_options.c
@@ -74,6 +74,7 @@ eal_long_options[] = {
{OPT_IOVA_MODE, 1, NULL
[PATCH v30 11/13] log: add support for systemd journal
If DPDK application is being run as a systemd service, then
it can use the journal protocol which allows putting more information
in the log such as priority and other information.
The use of journal protocol is automatically detected and
handled. Rather than having a dependency on libsystemd,
just use the protocol directly as defined in:
https://systemd.io/JOURNAL_NATIVE_PROTOCOL/
Signed-off-by: Stephen Hemminger
Acked-by: Morten Brørup
Acked-by: Bruce Richardson
---
lib/log/log.c | 32 +
lib/log/log_internal.h | 3 +
lib/log/log_journal.c | 152 +
lib/log/log_private.h | 14
lib/log/log_syslog.c | 9 +++
lib/log/meson.build| 4 ++
lib/log/version.map| 1 +
7 files changed, 203 insertions(+), 12 deletions(-)
create mode 100644 lib/log/log_journal.c
diff --git a/lib/log/log.c b/lib/log/log.c
index 854d77887b..db18690055 100644
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -505,18 +505,26 @@ rte_log(uint32_t level, uint32_t logtype, const char
*format, ...)
void
eal_log_init(const char *id)
{
- FILE *logf = NULL;
-
- if (log_syslog_enabled())
- logf = log_syslog_open(id);
-
- if (logf)
- rte_openlog_stream(logf);
-
- if (log_timestamp_enabled())
- rte_logs.print_func = log_print_with_timestamp;
- else
- rte_logs.print_func = vfprintf;
+ /* If user has already set a log stream, then use it. */
+ if (rte_logs.file == NULL) {
+ FILE *logf = NULL;
+
+ /* if stderr is assocated with systemd environment */
+ if (log_journal_enabled())
+ logf = log_journal_open(id);
+ /* If --syslog option was passed */
+ else if (log_syslog_enabled())
+ logf = log_syslog_open(id);
+
+ /* if either syslog or journal is used, then no special
handling */
+ if (logf)
+ rte_openlog_stream(logf);
+
+ else if (log_timestamp_enabled())
+ rte_logs.print_func = log_print_with_timestamp;
+ else
+ rte_logs.print_func = vfprintf;
+ }
#if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG
RTE_LOG(NOTICE, EAL,
diff --git a/lib/log/log_internal.h b/lib/log/log_internal.h
index 8ef195a6ec..731c099984 100644
--- a/lib/log/log_internal.h
+++ b/lib/log/log_internal.h
@@ -35,6 +35,9 @@ int eal_log_save_pattern(const char *pattern, uint32_t level);
__rte_internal
int eal_log_syslog(const char *name);
+__rte_internal
+int eal_log_journal(const char *opt);
+
/*
* Convert log level to string.
*/
diff --git a/lib/log/log_journal.c b/lib/log/log_journal.c
new file mode 100644
index 00..f163dc12ae
--- /dev/null
+++ b/lib/log/log_journal.c
@@ -0,0 +1,152 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include "log_private.h"
+
+/*
+ * Send structured message using journal protocol
+ * See: https://systemd.io/JOURNAL_NATIVE_PROTOCOL/
+ *
+ * Uses writev() to ensure that whole log message is in one datagram
+ */
+static int
+journal_send(int fd, const char *buf, size_t len)
+{
+ struct iovec iov[4];
+ unsigned int n = 0;
+ int priority = rte_log_cur_msg_loglevel() - 1;
+ char msg[] = "MESSAGE=";
+ char newline = '\n';
+ char pbuf[32]; /* "PRIORITY=N\n" */
+
+ iov[n].iov_base = msg;
+ iov[n++].iov_len = strlen(msg);
+
+ iov[n].iov_base = (char *)(uintptr_t)buf;
+ iov[n++].iov_len = len;
+
+ /* if message doesn't end with newline, one will be applied. */
+ if (buf[len - 1] != '\n') {
+ iov[n].iov_base = &newline;
+ iov[n++].iov_len = 1;
+ }
+
+ /* priority value between 0 ("emerg") and 7 ("debug") */
+ iov[n].iov_base = pbuf;
+ iov[n++].iov_len = snprintf(pbuf, sizeof(pbuf),
+ "PRIORITY=%d\n", priority);
+ return writev(fd, iov, n);
+}
+
+
+/* wrapper for log stream to put messages into journal */
+static ssize_t
+journal_log_write(void *c, const char *buf, size_t size)
+{
+ int fd = (uintptr_t)c;
+
+ return journal_send(fd, buf, size);
+}
+
+static int
+journal_log_close(void *c)
+{
+ int fd = (uintptr_t)c;
+
+ close(fd);
+ return 0;
+}
+
+static cookie_io_functions_t journal_log_func = {
+ .write = journal_log_write,
+ .close = journal_log_close,
+};
+
+/*
+ * Check if stderr is going to system journal.
+ * This is the documented way to handle systemd journal
+ *
+ * See: https://systemd.io/JOURNAL_NATIVE_PROTOCOL/
+ */
+bool
+log_journal_enabled(void)
+{
+ char *jenv, *endp = NULL;
+ struct stat st;
+ unsigned long dev, ino;
+
+ jenv = getenv("JOURNA
[PATCH v30 09/13] log: add hook for printing log messages
This is useful for when decorating log output for console
or journal. Provide basic version in this patch.
Signed-off-by: Stephen Hemminger
Acked-by: Morten Brørup
Acked-by: Bruce Richardson
Acked-by: Chengwen Feng
---
lib/log/log.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/lib/log/log.c b/lib/log/log.c
index 511ab3b30b..cc0c61cb22 100644
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -29,16 +29,21 @@ struct rte_log_dynamic_type {
uint32_t loglevel;
};
+/* Note: same as vfprintf() */
+typedef int (*log_print_t)(FILE *f, const char *fmt, va_list ap);
+
/** The rte_log structure. */
static struct rte_logs {
uint32_t type; /**< Bitfield with enabled logs. */
uint32_t level; /**< Log level. */
FILE *file; /**< Output file set by rte_openlog_stream, or NULL. */
+ log_print_t print_func;
size_t dynamic_types_len;
struct rte_log_dynamic_type *dynamic_types;
} rte_logs = {
.type = UINT32_MAX,
.level = RTE_LOG_DEBUG,
+ .print_func = vfprintf,
};
struct rte_eal_opt_loglevel {
@@ -75,6 +80,7 @@ int
rte_openlog_stream(FILE *f)
{
rte_logs.file = f;
+ rte_logs.print_func = vfprintf;
return 0;
}
@@ -471,7 +477,7 @@ rte_vlog(uint32_t level, uint32_t logtype, const char
*format, va_list ap)
RTE_PER_LCORE(log_cur_msg).loglevel = level;
RTE_PER_LCORE(log_cur_msg).logtype = logtype;
- ret = vfprintf(f, format, ap);
+ ret = (*rte_logs.print_func)(f, format, ap);
fflush(f);
return ret;
}
--
2.45.2
[PATCH v30 05/13] eal: do not duplicate rte_init_alert() messages
The message already goes through logging, and does not need
to be printed on stderr. Message level should be ALERT
to match function name.
Signed-off-by: Stephen Hemminger
Acked-by: Tyler Retzlaff
Acked-by: Morten Brørup
Acked-by: Bruce Richardson
Acked-by: Chengwen Feng
---
lib/eal/freebsd/eal.c | 3 +--
lib/eal/linux/eal.c | 3 +--
lib/eal/windows/eal.c | 1 -
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c
index d3b40e81d8..7b974608e4 100644
--- a/lib/eal/freebsd/eal.c
+++ b/lib/eal/freebsd/eal.c
@@ -529,8 +529,7 @@ rte_eal_iopl_init(void)
static void rte_eal_init_alert(const char *msg)
{
- fprintf(stderr, "EAL: FATAL: %s\n", msg);
- EAL_LOG(ERR, "%s", msg);
+ EAL_LOG(ALERT, "%s", msg);
}
/* Launch threads, called at application init(). */
diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c
index 40d750ed0d..c53a051405 100644
--- a/lib/eal/linux/eal.c
+++ b/lib/eal/linux/eal.c
@@ -830,8 +830,7 @@ rte_eal_iopl_init(void)
static void rte_eal_init_alert(const char *msg)
{
- fprintf(stderr, "EAL: FATAL: %s\n", msg);
- EAL_LOG(ERR, "%s", msg);
+ EAL_LOG(ALERT, "%s", msg);
}
/*
diff --git a/lib/eal/windows/eal.c b/lib/eal/windows/eal.c
index a77e590a72..93f099a968 100644
--- a/lib/eal/windows/eal.c
+++ b/lib/eal/windows/eal.c
@@ -181,7 +181,6 @@ sync_func(void *arg __rte_unused)
static void
rte_eal_init_alert(const char *msg)
{
- fprintf(stderr, "EAL: FATAL: %s\n", msg);
EAL_LOG(ERR, "%s", msg);
}
--
2.45.2
[PATCH v30 07/13] log: rework syslog handling
Refactor how syslog is handled, make it common to Linux and FreeBSD
The syslog facility property is better handled in lib/log
rather than in eal. This also add syslog support to FreeBSD.
Log to syslog only if option is specified.
If no --syslog is given then use only standard error.
Signed-off-by: Stephen Hemminger
Acked-by: Morten Brørup
Acked-by: Bruce Richardson
Acked-by: Chengwen Feng
---
app/test/test_eal_flags.c | 16 +--
.../freebsd_gsg/freebsd_eal_parameters.rst| 27 +
.../prog_guide/env_abstraction_layer.rst | 6 +-
doc/guides/prog_guide/log_lib.rst | 7 +-
lib/eal/common/eal_common_options.c | 57 ++-
lib/eal/common/eal_internal_cfg.h | 1 -
lib/eal/freebsd/eal.c | 5 +-
lib/eal/linux/eal.c | 12 +--
lib/eal/windows/eal.c | 6 +-
lib/log/log.c | 44 -
lib/log/log_freebsd.c | 12 ---
lib/log/log_internal.h| 11 +--
lib/log/log_linux.c | 61
lib/log/log_private.h | 25 +
lib/log/log_syslog.c | 99 +++
lib/log/log_windows.c | 18
lib/log/meson.build | 6 +-
lib/log/version.map | 2 +-
18 files changed, 211 insertions(+), 204 deletions(-)
delete mode 100644 lib/log/log_freebsd.c
delete mode 100644 lib/log/log_linux.c
create mode 100644 lib/log/log_private.h
create mode 100644 lib/log/log_syslog.c
delete mode 100644 lib/log/log_windows.c
diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c
index 71d8dba731..9fcf0d56e6 100644
--- a/app/test/test_eal_flags.c
+++ b/app/test/test_eal_flags.c
@@ -985,12 +985,12 @@ test_misc_flags(void)
/* With -v */
const char *argv2[] = {prgname, prefix, mp_flag, "-v"};
/* With valid --syslog */
- const char *argv3[] = {prgname, prefix, mp_flag,
- "--syslog", "syslog"};
- /* With empty --syslog (should fail) */
+ const char *argv3[] = {prgname, prefix, mp_flag, "--syslog=user"};
+ /* With empty --syslog (now defaults) */
const char *argv4[] = {prgname, prefix, mp_flag, "--syslog"};
/* With invalid --syslog */
- const char *argv5[] = {prgname, prefix, mp_flag, "--syslog", "error"};
+ const char *argv5[] = {prgname, prefix, mp_flag, "--syslog=invalid"};
+
/* With no-sh-conf, also use no-huge to ensure this test runs on BSD */
const char *argv6[] = {prgname, "-m", DEFAULT_MEM_SIZE,
no_shconf, nosh_prefix, no_huge};
@@ -1080,15 +1080,15 @@ test_misc_flags(void)
#endif
if (launch_proc(argv3) != 0) {
- printf("Error - process did not run ok with --syslog flag\n");
+ printf("Error - process did not run ok with --syslog=user
flag\n");
goto fail;
}
- if (launch_proc(argv4) == 0) {
- printf("Error - process run ok with empty --syslog flag\n");
+ if (launch_proc(argv4) != 0) {
+ printf("Error - process did not run ok with --syslog flag\n");
goto fail;
}
if (launch_proc(argv5) == 0) {
- printf("Error - process run ok with invalid --syslog flag\n");
+ printf("Error - process run ok with --syslog=invalid flag\n");
goto fail;
}
if (launch_proc(argv7) != 0) {
diff --git a/doc/guides/freebsd_gsg/freebsd_eal_parameters.rst
b/doc/guides/freebsd_gsg/freebsd_eal_parameters.rst
index fba467a2ce..9270d9fa3b 100644
--- a/doc/guides/freebsd_gsg/freebsd_eal_parameters.rst
+++ b/doc/guides/freebsd_gsg/freebsd_eal_parameters.rst
@@ -18,3 +18,30 @@ FreeBSD-specific EAL parameters
---
There are currently no FreeBSD-specific EAL command-line parameters available.
+
+Other options
+~
+
+* ``--syslog ``
+
+Set syslog facility. Valid syslog facilities are::
+
+auth
+cron
+daemon
+ftp
+kern
+lpr
+mail
+news
+syslog
+user
+uucp
+local0
+local1
+local2
+local3
+local4
+local5
+local6
+local7
diff --git a/doc/guides/prog_guide/env_abstraction_layer.rst
b/doc/guides/prog_guide/env_abstraction_layer.rst
index b9fac1839d..9bafa30a0e 100644
--- a/doc/guides/prog_guide/env_abstraction_layer.rst
+++ b/doc/guides/prog_guide/env_abstraction_layer.rst
@@ -851,9 +851,9 @@ Signal Safety
Other functions are not signal safe because they use one or more
library routines that are not themselves signal safe.
For example, calling ``rte_panic()`` is not safe in a signal handler
- because it uses ``rte_log()`` and ``rte_log()`` calls the
-
[PATCH v30 01/13] maintainers: add for log library
"You touch it you own it" Add myself as maintainer for log library. Signed-off-by: Stephen Hemminger Acked-by: Tyler Retzlaff Acked-by: Morten Brørup Acked-by: Chengwen Feng Acked-by: Bruce Richardson --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index e25e9465b5..411b948649 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -187,6 +187,7 @@ F: app/test/test_threads.c F: app/test/test_version.c Logging +M: Stephen Hemminger F: lib/log/ F: doc/guides/prog_guide/log_lib.rst F: app/test/test_logs.c -- 2.45.2
[PATCH] net/mlx5: validate HWS context in meter operations
HWS context is created during port configuration.
PMD allowed meter operations before port configuration.
The patch rejects HWS meter operations before port configuration.
Signed-off-by: Gregory Etelson
Acked-by: Dariusz Sosnowski
---
drivers/net/mlx5/mlx5.h| 18 ++
drivers/net/mlx5/mlx5_flow_hw.c| 7 +-
drivers/net/mlx5/mlx5_flow_meter.c | 40 ++
3 files changed, 64 insertions(+), 1 deletion(-)
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 0e026f7bbb..503366580b 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -2682,4 +2682,22 @@ int mlx5_quota_query(struct rte_eth_dev *dev, uint32_t
queue,
int mlx5_alloc_srh_flex_parser(struct rte_eth_dev *dev);
void mlx5_free_srh_flex_parser(struct rte_eth_dev *dev);
+
+/* mlx5_flow_hw.c */
+struct rte_pmd_mlx5_host_action;
+
+struct mlx5dr_action *
+mlx5_flow_hw_get_dr_action(struct rte_eth_dev *dev,
+ struct rte_pmd_mlx5_host_action *action,
+ void **release_data);
+
+void
+mlx5_flow_hw_put_dr_action(struct rte_eth_dev *dev,
+ enum rte_flow_action_type type,
+ void *release_data);
+
+bool
+mlx5_hw_ctx_validate(const struct rte_eth_dev *dev,
+struct rte_flow_error *error);
+
#endif /* RTE_PMD_MLX5_H_ */
diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index 5b34154bf1..9c33004c09 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -208,7 +208,12 @@ mlx5_destroy_multi_pattern_segment(struct
mlx5_multi_pattern_segment *segment);
static __rte_always_inline enum mlx5_indirect_list_type
flow_hw_inlist_type_get(const struct rte_flow_action *actions);
-static bool
+static int
+flow_hw_allocate_actions(struct rte_eth_dev *dev,
+uint64_t action_flags,
+struct rte_flow_error *error);
+
+bool
mlx5_hw_ctx_validate(const struct rte_eth_dev *dev, struct rte_flow_error
*error)
{
const struct mlx5_priv *priv = dev->data->dev_private;
diff --git a/drivers/net/mlx5/mlx5_flow_meter.c
b/drivers/net/mlx5/mlx5_flow_meter.c
index 19d8607070..299265f8bc 100644
--- a/drivers/net/mlx5/mlx5_flow_meter.c
+++ b/drivers/net/mlx5/mlx5_flow_meter.c
@@ -745,6 +745,10 @@ mlx5_flow_mtr_cap_get(struct rte_eth_dev *dev,
struct mlx5_priv *priv = dev->data->dev_private;
struct mlx5_hca_qos_attr *qattr = &priv->sh->cdev->config.hca_attr.qos;
+ if (mlx5_hws_active(dev) && !mlx5_hw_ctx_validate(dev, NULL))
+ return -rte_mtr_error_set(error, EINVAL,
+ RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
+ "non-template flow engine was not
configured");
if (!priv->mtr_en)
return -rte_mtr_error_set(error, ENOTSUP,
RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
@@ -903,6 +907,12 @@ mlx5_flow_meter_profile_get(struct rte_eth_dev *dev,
{
struct mlx5_priv *priv = dev->data->dev_private;
+ if (mlx5_hws_active(dev) && !mlx5_hw_ctx_validate(dev, NULL)) {
+ rte_mtr_error_set(error, EINVAL,
+ RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
+ "non-template flow engine was not
configured");
+ return NULL;
+ }
if (!priv->mtr_en) {
rte_mtr_error_set(error, ENOTSUP,
RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
@@ -939,6 +949,10 @@ mlx5_flow_meter_profile_hws_add(struct rte_eth_dev *dev,
struct mlx5_flow_meter_profile *fmp;
int ret;
+ if (mlx5_hws_active(dev) && !mlx5_hw_ctx_validate(dev, NULL))
+ return -rte_mtr_error_set(error, EINVAL,
+ RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
+ "non-template flow engine was not
configured");
if (priv->shared_host)
return -rte_mtr_error_set(error, ENOTSUP,
RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
"Meter profiles cannot be created on
guest port");
@@ -1167,6 +1181,10 @@ mlx5_flow_meter_policy_hws_validate(struct rte_eth_dev
*dev,
int ret;
int i;
+ if (mlx5_hws_active(dev) && !mlx5_hw_ctx_validate(dev, NULL))
+ return -rte_mtr_error_set(error, EINVAL,
+ RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
+ "non-template flow engine was not
configured");
if (!priv->mtr_en || !priv->sh->meter_aso_en)
return -rte_mtr_error_set(error, ENOTSUP,
RTE_MTR_ERROR_TYPE_METER_POLICY,
@@ -1496,6 +1514,12 @@ mlx5_flow_meter_policy_get(struct rte_eth_dev *dev,
struct mlx5_priv *priv = dev->da
[PATCH] net/mlx5: fix SWS meter state initialization
The PMD uses METER `state` variable to monitor ASO object
availability.
The patch updates SWS meter object state.
Fixes: 4359d9d1f76b ("net/mlx5: fix sync meter processing in HWS")
Cc: sta...@dpdk.org
Signed-off-by: Gregory Etelson
Acked-by: Dariusz Sosnowski
---
drivers/net/mlx5/mlx5_flow_meter.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/mlx5/mlx5_flow_meter.c
b/drivers/net/mlx5/mlx5_flow_meter.c
index 19d8607070..c605597662 100644
--- a/drivers/net/mlx5/mlx5_flow_meter.c
+++ b/drivers/net/mlx5/mlx5_flow_meter.c
@@ -1914,6 +1914,7 @@ mlx5_flow_meter_action_modify(struct mlx5_priv *priv,
if (sh->meter_aso_en) {
fm->is_enable = !!is_enable;
aso_mtr = container_of(fm, struct mlx5_aso_mtr, fm);
+ aso_mtr->state = ASO_METER_WAIT;
ret = mlx5_aso_meter_update_by_wqe(priv, MLX5_HW_INV_QUEUE,
aso_mtr, &priv->mtr_bulk,
NULL, true);
@@ -2165,6 +2166,7 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t
meter_id,
/* If ASO meter supported, update ASO flow meter by wqe. */
if (priv->sh->meter_aso_en) {
aso_mtr = container_of(fm, struct mlx5_aso_mtr, fm);
+ aso_mtr->state = ASO_METER_WAIT;
ret = mlx5_aso_meter_update_by_wqe(priv, MLX5_HW_INV_QUEUE,
aso_mtr, &priv->mtr_bulk,
NULL, true);
if (ret)
--
2.43.0
Re: [PATCH] dumpcap: check return value from adding interface
Acked-by: Chengwen Feng On 2024/10/28 2:28, Stephen Hemminger wrote: > The rte_pcapng_add_interface could fail. > For example: running out of space for the file. > > Covertity issue: 446742 > Signed-off-by: Stephen Hemminger
[PATCH] net/mlx5: fix internal SQ item definition
When DPDK copies flow items with the `rte_flow_conv` call, it assumes
that size of PMD private data has pointer size - see patch [1]
MLX5 PMD defined `struct mlx5_rte_flow_item_sq` as 32 bits.
As the result, on 64 bits systems, when DPDK copied
MLX5_RTE_FLOW_ITEM_TYPE_SQ item, the target buffer was assigned
additional 32 bits.
The patch expands size of `struct mlx5_rte_flow_item_sq` to 64 bits
on 64 bits systems.
[1]:
commit 6cf72047332b ("ethdev: support flow elements with variable length")
Fixes: 75a00812b18f ("net/mlx5: add hardware steering item translation")
Cc: sta...@dpdk.org
Signed-off-by: Gregory Etelson
Acked-by: Dariusz Sosnowski
---
drivers/net/mlx5/mlx5_flow.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index db56ae051d..9cf54c3a6a 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -168,6 +168,9 @@ struct mlx5_flow_action_copy_mreg {
/* Matches on source queue. */
struct mlx5_rte_flow_item_sq {
uint32_t queue; /* DevX SQ number */
+#ifdef RTE_ARCH_64
+ uint32_t reserved;
+#endif
};
/* Map from registers to modify fields. */
--
2.43.0
Re: [PATCH v4 02/18] net/r8169: add logging structure
On Fri, 25 Oct 2024 11:35:13 +0800 Howard Wang wrote: > Implement logging macros for debug purposes. > > Signed-off-by: Howard Wang Did you see this from checkpatch? Probably not because it was buried in all the CamelCase warnings. Warning in drivers/net/r8169/r8169_logs.h: Prefer RTE_LOG_LINE/RTE_LOG_DP_LINE Warning in drivers/net/r8169/r8169_logs.h: Do not use variadic argument pack in macros
[PATCH v2 02/13] net/txgbe: fix VF-PF mbox interrupt
There was a incorrect bit to define TXGBE_ICRMISC_VFMBX that prevents the
interrupt from being handled correctly.
Fixes: a6712cd029a4 ("net/txgbe: add PF module init and uninit for SRIOV")
Cc: sta...@dpdk.org
Signed-off-by: Jiawen Wu
---
drivers/net/txgbe/base/txgbe_regs.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/txgbe/base/txgbe_regs.h
b/drivers/net/txgbe/base/txgbe_regs.h
index 4ea4a2e3d8..b46d65331e 100644
--- a/drivers/net/txgbe/base/txgbe_regs.h
+++ b/drivers/net/txgbe/base/txgbe_regs.h
@@ -1197,7 +1197,7 @@ enum txgbe_5tuple_protocol {
#define TXGBE_ICRMISC_ANDONE MS(19, 0x1) /* link auto-nego done */
#define TXGBE_ICRMISC_ERRIG MS(20, 0x1) /* integrity error */
#define TXGBE_ICRMISC_SPIMS(21, 0x1) /* SPI interface */
-#define TXGBE_ICRMISC_VFMBX MS(22, 0x1) /* VF-PF message box */
+#define TXGBE_ICRMISC_VFMBX MS(23, 0x1) /* VF-PF message box */
#define TXGBE_ICRMISC_GPIO MS(26, 0x1) /* GPIO interrupt */
#define TXGBE_ICRMISC_ERRPCI MS(27, 0x1) /* pcie request error */
#define TXGBE_ICRMISC_HEAT MS(28, 0x1) /* overheat detection */
--
2.27.0
Re: [PATCH v4 05/18] net/r8169: add support for hw config
On Fri, 25 Oct 2024 11:35:16 +0800 Howard Wang wrote: > Implement the rtl_hw_config function to configure the hardware. > > Signed-off-by: Howard Wang If you send a new version, this should be fixed. ### [PATCH] net/r8169: add support for hw config WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #976: FILE: drivers/net/r8169/r8169_phy.c:2: + * Copyright(c) 2024 Realtek Corporation. All rights reserved */
[PATCH] net/mlx5: fix non-template API actions template validation
HWS actions template validation checks actions parameters in actions
masks.
Non-template API does not have actions masks.
Actions templates in the non-template API are artificial and
created internally by the PMD.
The patch removes HWS actions template validation in non-template
setup.
Fixes: 04a4de756e14 ("net/mlx5: support flow age action with HWS")
Cc: sta...@dpdk.org
Signed-off-by: Gregory Etelson
Acked-by: Dariusz Sosnowski
---
drivers/net/mlx5/mlx5_flow_hw.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index 5b34154bf1..c9bd9f229b 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -7873,8 +7873,8 @@ __flow_hw_actions_template_create(struct rte_eth_dev *dev,
uint32_t tmpl_flags = 0;
int ret;
- if (mlx5_flow_hw_actions_validate(dev, attr, actions, masks,
- &action_flags, error))
+ if (!nt_mode && mlx5_flow_hw_actions_validate(dev, attr, actions, masks,
+ &action_flags, error))
return NULL;
for (i = 0; ra[i].type != RTE_FLOW_ACTION_TYPE_END; ++i) {
switch (ra[i].type) {
--
2.43.0
[PATCH] net/mlx5: increase number of supported DV sub-flows
Testpmd example that could not work with existing number of DV
sub-flows:
dpdk-testpmd -a PCI,dv_xmeta_en=1,l3_vxlan_en=1,dv_flow_en=1 -- \
-i --nb-cores=4 --rxq=5 --txq=5
set sample_actions 1 mark id 43704 / \
rss queues 3 0 1 1 end types ipv4 ipv4-other udp tcp ipv4-udp end / \
end
flow create 0 priority 15 group 271 ingress \
pattern mark id spec 16777184 id mask 0xff / end \
actions sample ratio 1 index 1 / queue index 0 / end
Increase number of supported DV sub-flows to 64
Signed-off-by: Gregory Etelson
Acked-by: Dariusz Sosnowski
---
drivers/net/mlx5/mlx5_flow.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index db56ae051d..9a8eccdd25 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -974,7 +974,7 @@ struct mlx5_flow_verbs_workspace {
#define MLX5_SCALE_JUMP_FLOW_GROUP_BIT 1
/** Maximal number of device sub-flows supported. */
-#define MLX5_NUM_MAX_DEV_FLOWS 32
+#define MLX5_NUM_MAX_DEV_FLOWS 64
/**
* tunnel offload rules type
--
2.43.0
[PATCH] net/mlx5: fix error notifications in counter initialization
If counter action initialization failed, the PMD used integer values,
primarily (-1) or errno, to notify upper layers.
The patch uses the `rte_flow_error` structure for counter
initialization failure notifications.
Fixes: 4d368e1da3a4 ("net/mlx5: support flow counter action for HWS")
Cc: sta...@dpdk.org
Signed-off-by: Gregory Etelson
Acked-by: Dariusz Sosnowski
---
drivers/net/mlx5/mlx5_flow_hw.c | 31 ++--
drivers/net/mlx5/mlx5_hws_cnt.c | 123
drivers/net/mlx5/mlx5_hws_cnt.h | 5 +-
drivers/net/mlx5/mlx5_trigger.c | 10 ++-
4 files changed, 128 insertions(+), 41 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index 5b34154bf1..6081ebc7e2 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -11669,6 +11669,7 @@ __flow_hw_configure(struct rte_eth_dev *dev,
uint32_t action_flags;
bool strict_queue = false;
+ error->type = RTE_FLOW_ERROR_TYPE_NONE;
if (mlx5dr_rule_get_handle_size() != MLX5_DR_RULE_SIZE) {
rte_errno = EINVAL;
goto err;
@@ -11906,9 +11907,11 @@ __flow_hw_configure(struct rte_eth_dev *dev,
goto err;
}
if (port_attr->nb_counters || (host_priv && host_priv->hws_cpool)) {
- if (mlx5_hws_cnt_pool_create(dev, port_attr->nb_counters,
- nb_queue,
- (host_priv ?
host_priv->hws_cpool : NULL)))
+ struct mlx5_hws_cnt_pool *hws_cpool = host_priv ?
host_priv->hws_cpool : NULL;
+
+ ret = mlx5_hws_cnt_pool_create(dev, port_attr->nb_counters,
+ nb_queue, hws_cpool, error);
+ if (ret)
goto err;
}
if (port_attr->nb_aging_objects) {
@@ -11957,7 +11960,7 @@ __flow_hw_configure(struct rte_eth_dev *dev,
if (_queue_attr)
mlx5_free(_queue_attr);
/* Do not overwrite the internal errno information. */
- if (ret)
+ if (ret && error->type != RTE_FLOW_ERROR_TYPE_NONE)
return ret;
return rte_flow_error_set(error, rte_errno,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
@@ -11988,6 +11991,10 @@ flow_hw_configure(struct rte_eth_dev *dev,
const struct rte_flow_queue_attr *queue_attr[],
struct rte_flow_error *error)
{
+ struct rte_flow_error shadow_error = {0, };
+
+ if (!error)
+ error = &shadow_error;
return __flow_hw_configure(dev, port_attr, nb_queue, queue_attr, false,
error);
}
@@ -12852,6 +12859,10 @@ flow_hw_action_validate(struct rte_eth_dev *dev,
const struct rte_flow_action *action,
struct rte_flow_error *err)
{
+ struct rte_flow_error shadow_error = {0, };
+
+ if (!err)
+ err = &shadow_error;
return flow_hw_action_handle_validate(dev, MLX5_HW_INV_QUEUE, NULL,
conf, action, NULL, err);
}
@@ -13606,6 +13617,7 @@ flow_hw_allocate_actions(struct rte_eth_dev *dev,
int ret;
uint obj_num;
+ error->type = RTE_FLOW_ERROR_TYPE_NONE;
if (action_flags & MLX5_FLOW_ACTION_AGE) {
/* If no age objects were previously allocated. */
if (!priv->hws_age_req) {
@@ -13613,7 +13625,8 @@ flow_hw_allocate_actions(struct rte_eth_dev *dev,
if (!priv->hws_cpool) {
obj_num = MLX5_CNT_NT_MAX(priv);
ret = mlx5_hws_cnt_pool_create(dev, obj_num,
- priv->nb_queue,
NULL);
+ priv->nb_queue,
+ NULL, error);
if (ret)
goto err;
}
@@ -13629,7 +13642,8 @@ flow_hw_allocate_actions(struct rte_eth_dev *dev,
if (!priv->hws_cpool) {
obj_num = MLX5_CNT_NT_MAX(priv);
ret = mlx5_hws_cnt_pool_create(dev, obj_num,
- priv->nb_queue, NULL);
+ priv->nb_queue, NULL,
+ error);
if (ret)
goto err;
}
@@ -13655,6 +13669,8 @@ flow_hw_allocate_actions(struct rte_eth_dev *dev,
}
return 0;
err:
+ if (ret && error->type != RTE_FLOW_ERROR_TYPE_NONE)
+ return ret;
return rte_flow_error_set(error, ret,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
[PATCH] net/mlx5/hws: fix range definer error recovery
PMD did not assign rte_errno value after it discovered an error in
matcher range parameters.
As a result, the calling function was not notified about the fault.
The patch assigns EINVAL to rte_errno if matcher range definition was
invalid.
Fixes: 9732ffe13bd6 ("net/mlx5/hws: add range definer creation")
Cc: sta...@dpdk.org
Signed-off-by: Gregory Etelson
Acked-by: Dariusz Sosnowski
---
drivers/net/mlx5/hws/mlx5dr_definer.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c
b/drivers/net/mlx5/hws/mlx5dr_definer.c
index a9fa5d06ed..fd0a9b15d8 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.c
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.c
@@ -4056,6 +4056,7 @@ mlx5dr_definer_matcher_range_init(struct mlx5dr_context
*ctx,
if (i && ((is_range && !has_range) || (!is_range &&
has_range))) {
DR_LOG(ERR, "Using range and non range templates is not
allowed");
+ rte_errno = EINVAL;
goto free_definers;
}
--
2.43.0
Re: [PATCH v2 00/10] net/mlx5: improve MAC address and VLAN add latency
24/10/2024 16:11, Raslan Darawsheh: > Series applied to next-net-mlx, This series fails to build on MinGW because of the weak stubs. Please check why. Note: I'm off for a week.
[PATCH] dumpcap: check return value from adding interface
The rte_pcapng_add_interface could fail.
For example: running out of space for the file.
Covertity issue: 446742
Signed-off-by: Stephen Hemminger
---
app/dumpcap/main.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/dumpcap/main.c b/app/dumpcap/main.c
index fcfaa19951..260ca72dc6 100644
--- a/app/dumpcap/main.c
+++ b/app/dumpcap/main.c
@@ -800,9 +800,9 @@ static dumpcap_out_t create_output(void)
free(os);
TAILQ_FOREACH(intf, &interfaces, next) {
- rte_pcapng_add_interface(ret.pcapng, intf->port,
-intf->ifname, intf->ifdescr,
-intf->opts.filter);
+ if (rte_pcapng_add_interface(ret.pcapng, intf->port,
intf->ifname,
+intf->ifdescr,
intf->opts.filter) < 0)
+ rte_exit(EXIT_FAILURE, "pcapng_add_interface %u
failed\n", intf->port);
}
} else {
pcap_t *pcap;
--
2.45.2
RE: [PATCH] dumpcap: check return value from adding interface
Acked-by: Morten Brørup
[PATCH] net/mlx5: fix GRE item translation for root table
Flow items translations for the root tables reuses DV code.
DV GRE item translation did not initiate item mask for HWS template.
Fixes: cd4ab742064a ("net/mlx5: split flow item matcher and value translation")
Cc: sta...@dpdk.org
Signed-off-by: Gregory Etelson
Acked-by: Suanming Mou
---
drivers/net/mlx5/mlx5_flow_dv.c | 23 ---
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 201e215e4b..7c3a1d537a 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -9829,22 +9829,23 @@ flow_dv_translate_item_gre(void *key, const struct
rte_flow_item *item,
} gre_crks_rsvd0_ver_m, gre_crks_rsvd0_ver_v;
uint16_t protocol_m, protocol_v;
- if (key_type & MLX5_SET_MATCHER_M)
+ if (key_type & MLX5_SET_MATCHER_M) {
MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_protocol, 0xff);
- else
+ if (!gre_m)
+ gre_m = &rte_flow_item_gre_mask;
+ gre_v = gre_m;
+ } else {
MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_protocol,
IPPROTO_GRE);
- if (!gre_v) {
- gre_v = &empty_gre;
- gre_m = &empty_gre;
- } else {
- if (!gre_m)
+ if (!gre_v) {
+ gre_v = &empty_gre;
+ gre_m = &empty_gre;
+ } else if (!gre_m) {
gre_m = &rte_flow_item_gre_mask;
+ }
+ if (key_type == MLX5_SET_MATCHER_HS_V)
+ gre_m = gre_v;
}
- if (key_type & MLX5_SET_MATCHER_M)
- gre_v = gre_m;
- else if (key_type == MLX5_SET_MATCHER_HS_V)
- gre_m = gre_v;
gre_crks_rsvd0_ver_m.value = rte_be_to_cpu_16(gre_m->c_rsvd0_ver);
gre_crks_rsvd0_ver_v.value = rte_be_to_cpu_16(gre_v->c_rsvd0_ver);
MLX5_SET(fte_match_set_misc, misc_v, gre_c_present,
--
2.43.0
