Count the rx_l3_l4_xsum_error statistic in Rx path. Since this hardware
register counter is missing, resulted in the count always showing as 0
in error.
Fixes: 8b433d04adc9 ("net/ngbe: support device xstats")
Cc: [email protected]
Signed-off-by: Jiawen Wu <[email protected]>
---
drivers/net/ngbe/ngbe_ethdev.c | 17 +++++++++++++++++
drivers/net/ngbe/ngbe_rxtx.c | 21 ++++++++++++++-------
drivers/net/ngbe/ngbe_rxtx.h | 1 +
drivers/net/ngbe/ngbe_rxtx_vec_neon.c | 9 ++++++++-
drivers/net/ngbe/ngbe_rxtx_vec_sse.c | 9 ++++++++-
5 files changed, 48 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c
index adb7785498..8b9d6371fb 100644
--- a/drivers/net/ngbe/ngbe_ethdev.c
+++ b/drivers/net/ngbe/ngbe_ethdev.c
@@ -1704,6 +1704,8 @@ ngbe_dev_xstats_get(struct rte_eth_dev *dev, struct
rte_eth_xstat *xstats,
{
struct ngbe_hw *hw = ngbe_dev_hw(dev);
struct ngbe_hw_stats *hw_stats = NGBE_DEV_STATS(dev);
+ struct ngbe_rx_queue *rxq;
+ uint64_t rx_csum_err = 0;
unsigned int i, count;
ngbe_read_stats_registers(hw, hw_stats);
@@ -1717,6 +1719,13 @@ ngbe_dev_xstats_get(struct rte_eth_dev *dev, struct
rte_eth_xstat *xstats,
limit = min(limit, ngbe_xstats_calc_num(dev));
+ /* Rx Checksum Errors */
+ for (i = 0; i < dev->data->nb_rx_queues; i++) {
+ rxq = dev->data->rx_queues[i];
+ rx_csum_err += rxq->csum_err;
+ }
+ hw_stats->rx_l3_l4_xsum_error = rx_csum_err;
+
/* Extended stats from ngbe_hw_stats */
for (i = 0; i < limit; i++) {
uint32_t offset = 0;
@@ -1793,6 +1802,8 @@ ngbe_dev_xstats_reset(struct rte_eth_dev *dev)
{
struct ngbe_hw *hw = ngbe_dev_hw(dev);
struct ngbe_hw_stats *hw_stats = NGBE_DEV_STATS(dev);
+ struct ngbe_rx_queue *rxq;
+ int i = 0;
/* HW registers are cleared on read */
hw->offset_loaded = 0;
@@ -1802,6 +1813,12 @@ ngbe_dev_xstats_reset(struct rte_eth_dev *dev)
/* Reset software totals */
memset(hw_stats, 0, sizeof(*hw_stats));
+ /* Reset rxq checksum errors */
+ for (i = 0; i < dev->data->nb_rx_queues; i++) {
+ rxq = dev->data->rx_queues[i];
+ rxq->csum_err = 0;
+ }
+
return 0;
}
diff --git a/drivers/net/ngbe/ngbe_rxtx.c b/drivers/net/ngbe/ngbe_rxtx.c
index 95e2172ee4..a60421293b 100644
--- a/drivers/net/ngbe/ngbe_rxtx.c
+++ b/drivers/net/ngbe/ngbe_rxtx.c
@@ -972,22 +972,28 @@ rx_desc_status_to_pkt_flags(uint32_t rx_status, uint64_t
vlan_flags)
}
static inline uint64_t
-rx_desc_error_to_pkt_flags(uint32_t rx_status)
+rx_desc_error_to_pkt_flags(uint32_t rx_status, struct ngbe_rx_queue *rxq)
{
uint64_t pkt_flags = 0;
/* checksum offload can't be disabled */
- if (rx_status & NGBE_RXD_STAT_IPCS)
+ if (rx_status & NGBE_RXD_STAT_IPCS) {
pkt_flags |= (rx_status & NGBE_RXD_ERR_IPCS
? RTE_MBUF_F_RX_IP_CKSUM_BAD :
RTE_MBUF_F_RX_IP_CKSUM_GOOD);
+ rxq->csum_err += !!(rx_status & NGBE_RXD_ERR_IPCS);
+ }
- if (rx_status & NGBE_RXD_STAT_L4CS)
+ if (rx_status & NGBE_RXD_STAT_L4CS) {
pkt_flags |= (rx_status & NGBE_RXD_ERR_L4CS
? RTE_MBUF_F_RX_L4_CKSUM_BAD :
RTE_MBUF_F_RX_L4_CKSUM_GOOD);
+ rxq->csum_err += !!(rx_status & NGBE_RXD_ERR_L4CS);
+ }
if (rx_status & NGBE_RXD_STAT_EIPCS &&
- rx_status & NGBE_RXD_ERR_EIPCS)
+ rx_status & NGBE_RXD_ERR_EIPCS) {
pkt_flags |= RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD;
+ rxq->csum_err += !!(rx_status & NGBE_RXD_ERR_EIPCS);
+ }
return pkt_flags;
}
@@ -1060,7 +1066,7 @@ ngbe_rx_scan_hw_ring(struct ngbe_rx_queue *rxq)
/* convert descriptor fields to rte mbuf flags */
pkt_flags = rx_desc_status_to_pkt_flags(s[j],
rxq->vlan_flags);
- pkt_flags |= rx_desc_error_to_pkt_flags(s[j]);
+ pkt_flags |= rx_desc_error_to_pkt_flags(s[j], rxq);
pkt_flags |=
ngbe_rxd_pkt_info_to_pkt_flags(pkt_info[j]);
mb->ol_flags = pkt_flags;
@@ -1393,7 +1399,7 @@ ngbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
pkt_flags = rx_desc_status_to_pkt_flags(staterr,
rxq->vlan_flags);
- pkt_flags |= rx_desc_error_to_pkt_flags(staterr);
+ pkt_flags |= rx_desc_error_to_pkt_flags(staterr, rxq);
pkt_flags |= ngbe_rxd_pkt_info_to_pkt_flags(pkt_info);
rxm->ol_flags = pkt_flags;
rxm->packet_type = ngbe_rxd_pkt_info_to_pkt_type(pkt_info,
@@ -1464,7 +1470,7 @@ ngbe_fill_cluster_head_buf(struct rte_mbuf *head, struct
ngbe_rx_desc *desc,
head->vlan_tci = rte_le_to_cpu_16(desc->qw1.hi.tag);
pkt_info = rte_le_to_cpu_32(desc->qw0.dw0);
pkt_flags = rx_desc_status_to_pkt_flags(staterr, rxq->vlan_flags);
- pkt_flags |= rx_desc_error_to_pkt_flags(staterr);
+ pkt_flags |= rx_desc_error_to_pkt_flags(staterr, rxq);
pkt_flags |= ngbe_rxd_pkt_info_to_pkt_flags(pkt_info);
head->ol_flags = pkt_flags;
head->packet_type = ngbe_rxd_pkt_info_to_pkt_type(pkt_info,
@@ -2266,6 +2272,7 @@ ngbe_reset_rx_queue(struct ngbe_adapter *adapter, struct
ngbe_rx_queue *rxq)
rxq->rx_free_trigger = (uint16_t)(rxq->rx_free_thresh - 1);
rxq->rx_tail = 0;
rxq->nb_rx_hold = 0;
+ rxq->csum_err = 0;
rte_pktmbuf_free(rxq->pkt_first_seg);
rxq->pkt_first_seg = NULL;
rxq->pkt_last_seg = NULL;
diff --git a/drivers/net/ngbe/ngbe_rxtx.h b/drivers/net/ngbe/ngbe_rxtx.h
index 8534ec123a..7b96b837ca 100644
--- a/drivers/net/ngbe/ngbe_rxtx.h
+++ b/drivers/net/ngbe/ngbe_rxtx.h
@@ -292,6 +292,7 @@ struct ngbe_rx_queue {
/** hold packets to return to application */
struct rte_mbuf *rx_stage[RTE_PMD_NGBE_RX_MAX_BURST * 2];
const struct rte_memzone *mz;
+ uint64_t csum_err;
};
/**
diff --git a/drivers/net/ngbe/ngbe_rxtx_vec_neon.c
b/drivers/net/ngbe/ngbe_rxtx_vec_neon.c
index 46391c9400..79685de181 100644
--- a/drivers/net/ngbe/ngbe_rxtx_vec_neon.c
+++ b/drivers/net/ngbe/ngbe_rxtx_vec_neon.c
@@ -222,7 +222,7 @@ _recv_raw_pkts_vec(struct ngbe_rx_queue *rxq, struct
rte_mbuf **rx_pkts,
volatile struct ngbe_rx_desc *rxdp;
struct ngbe_rx_entry *sw_ring;
uint16_t nb_pkts_recd;
- int pos;
+ int pos, i;
uint8x16_t shuf_msk = {
0xFF, 0xFF,
0xFF, 0xFF, /* skip 32 bits pkt_type */
@@ -331,6 +331,13 @@ _recv_raw_pkts_vec(struct ngbe_rx_queue *rxq, struct
rte_mbuf **rx_pkts,
desc_to_olflags_v(sterr_tmp1, sterr_tmp2, staterr, vlan_flags,
&rx_pkts[pos]);
+ for (i = 0; i < RTE_NGBE_DESCS_PER_LOOP; i++) {
+ if (rx_pkts[pos + i]->ol_flags &
+ (RTE_MBUF_F_RX_IP_CKSUM_BAD |
+ RTE_MBUF_F_RX_L4_CKSUM_BAD))
+ rxq->csum_err++;
+ }
+
/* D.2 pkt 3,4 set in_port/nb_seg and remove crc */
tmp = vsubq_u16(vreinterpretq_u16_u8(pkt_mb4), crc_adjust);
pkt_mb4 = vreinterpretq_u8_u16(tmp);
diff --git a/drivers/net/ngbe/ngbe_rxtx_vec_sse.c
b/drivers/net/ngbe/ngbe_rxtx_vec_sse.c
index 19c69cdfa6..474101c600 100644
--- a/drivers/net/ngbe/ngbe_rxtx_vec_sse.c
+++ b/drivers/net/ngbe/ngbe_rxtx_vec_sse.c
@@ -244,7 +244,7 @@ _recv_raw_pkts_vec(struct ngbe_rx_queue *rxq, struct
rte_mbuf **rx_pkts,
volatile struct ngbe_rx_desc *rxdp;
struct ngbe_rx_entry *sw_ring;
uint16_t nb_pkts_recd;
- int pos;
+ int pos, i;
uint64_t var;
__m128i shuf_msk;
__m128i crc_adjust = _mm_set_epi16(0, 0, 0, /* ignore non-length fields
*/
@@ -412,6 +412,13 @@ _recv_raw_pkts_vec(struct ngbe_rx_queue *rxq, struct
rte_mbuf **rx_pkts,
/* set ol_flags with vlan packet type */
desc_to_olflags_v(descs, mbuf_init, vlan_flags, &rx_pkts[pos]);
+ for (i = 0; i < RTE_NGBE_DESCS_PER_LOOP; i++) {
+ if (rx_pkts[pos + i]->ol_flags &
+ (RTE_MBUF_F_RX_IP_CKSUM_BAD |
+ RTE_MBUF_F_RX_L4_CKSUM_BAD))
+ rxq->csum_err++;
+ }
+
/* D.2 pkt 3,4 set in_port/nb_seg and remove crc */
pkt_mb4 = _mm_add_epi16(pkt_mb4, crc_adjust);
pkt_mb3 = _mm_add_epi16(pkt_mb3, crc_adjust);
--
2.48.1
