| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20250228012534.3460918-10-kuba@kernel.org>
Date: Thu, 27 Feb 2025 17:25:34 -0800
From: Jakub Kicinski <kuba@...nel.org>
To: davem@...emloft.net
Cc: netdev@...r.kernel.org,
edumazet@...gle.com,
pabeni@...hat.com,
andrew+netdev@...n.ch,
horms@...nel.org,
michael.chan@...adcom.com,
pavan.chebbi@...adcom.com,
przemyslaw.kitszel@...el.com,
Jakub Kicinski <kuba@...nel.org>
Subject: [PATCH net-next v2 9/9] eth: bnxt: count xdp xmit packets
Count XDP_TX and XDP_REDIRECT packets. Since the Tx rings are separate
we count the packets sent to the base stats, not per-queues stats.
The XDP stats are protected by the Rx syncp since they are in NAPI
context. Feels slightly less ugly than having a Tx stats in Rx struct.
But neither is ideal.
Signed-off-by: Jakub Kicinski <kuba@...nel.org>
---
v2:
- move tx_buf init sooner so that shinfo handling can access it
v1: https://lore.kernel.org/20250226211003.2790916-10-kuba@kernel.org
---
drivers/net/ethernet/broadcom/bnxt/bnxt.h | 7 +++++-
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 23 +++++++++++++++--
drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 25 +++++++++++++++----
3 files changed, 47 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index d5f617fd5beb..415dda512329 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -880,7 +880,10 @@ struct bnxt_sw_tx_bd {
struct page *page;
DEFINE_DMA_UNMAP_ADDR(mapping);
DEFINE_DMA_UNMAP_LEN(len);
- u16 extra_segs;
+ union {
+ u16 extra_segs;
+ u16 xdp_len;
+ };
u8 hdr_size;
u8 is_ts_pkt;
u8 is_push;
@@ -1134,6 +1137,8 @@ struct bnxt_tx_sw_stats {
/* non-ethtool stats follow */
u64 tx_packets;
u64 tx_bytes;
+ u64 xdp_packets; /* under rx syncp */
+ u64 xdp_bytes; /* under rx syncp */
struct u64_stats_sync syncp;
};
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index f6308e4e8360..7dbb940c0591 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -13160,6 +13160,8 @@ static void bnxt_get_ring_stats(struct bnxt *bp,
stats->tx_packets += sw_stats.tx.tx_packets;
stats->tx_bytes += sw_stats.tx.tx_bytes;
+ stats->tx_packets += sw_stats.tx.xdp_packets;
+ stats->tx_bytes += sw_stats.tx.xdp_bytes;
stats->rx_missed_errors +=
BNXT_GET_RING_STATS64(sw, rx_discard_pkts);
@@ -13251,8 +13253,9 @@ static void bnxt_get_one_ring_drv_stats(struct bnxt *bp,
stats->rx_total_bytes += sw_stats.rx.rx_bytes;
stats->rx_total_ring_discards +=
BNXT_GET_RING_STATS64(hw_stats, rx_discard_pkts);
- stats->tx_total_packets += sw_stats.tx.tx_packets;
- stats->tx_total_bytes += sw_stats.tx.tx_bytes;
+ stats->tx_total_packets +=
+ sw_stats.tx.tx_packets + sw_stats.tx.xdp_packets;
+ stats->tx_total_bytes += sw_stats.tx.tx_bytes + sw_stats.tx.xdp_bytes;
stats->tx_total_resets += sw_stats.tx.tx_resets;
stats->tx_total_ring_discards +=
BNXT_GET_RING_STATS64(hw_stats, tx_discard_pkts);
@@ -15677,6 +15680,7 @@ static void bnxt_get_base_stats(struct net_device *dev,
struct netdev_queue_stats_tx *tx)
{
struct bnxt *bp = netdev_priv(dev);
+ int i;
rx->packets = bp->ring_drv_stats_prev.rx_total_packets;
rx->bytes = bp->ring_drv_stats_prev.rx_total_bytes;
@@ -15684,6 +15688,21 @@ static void bnxt_get_base_stats(struct net_device *dev,
tx->packets = bp->ring_drv_stats_prev.tx_total_packets;
tx->bytes = bp->ring_drv_stats_prev.tx_total_bytes;
+
+ for (i = 0; i < bp->cp_nr_rings; i++) {
+ struct bnxt_sw_stats *sw_stats = bp->bnapi[i]->cp_ring.sw_stats;
+ unsigned int seq;
+ u64 pkts, bytes;
+
+ do {
+ seq = u64_stats_fetch_begin(&sw_stats->rx.syncp);
+ pkts = sw_stats->tx.xdp_packets;
+ bytes = sw_stats->tx.xdp_bytes;
+ } while (u64_stats_fetch_retry(&sw_stats->rx.syncp, seq));
+
+ tx->packets += pkts;
+ tx->bytes += bytes;
+ }
}
static const struct netdev_stat_ops bnxt_stat_ops = {
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c
index 16d3698cf0e9..644e4a7818a2 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c
@@ -35,14 +35,17 @@ struct bnxt_sw_tx_bd *bnxt_xmit_bd(struct bnxt *bp,
u16 prod;
int i;
- if (xdp && xdp_buff_has_frags(xdp)) {
- sinfo = xdp_get_shared_info_from_buff(xdp);
- num_frags = sinfo->nr_frags;
- }
-
/* fill up the first buffer */
prod = txr->tx_prod;
tx_buf = &txr->tx_buf_ring[RING_TX(bp, prod)];
+ tx_buf->xdp_len = len;
+
+ if (xdp && xdp_buff_has_frags(xdp)) {
+ sinfo = xdp_get_shared_info_from_buff(xdp);
+ tx_buf->xdp_len += sinfo->xdp_frags_size;
+ num_frags = sinfo->nr_frags;
+ }
+
tx_buf->nr_frags = num_frags;
if (xdp)
tx_buf->page = virt_to_head_page(xdp->data);
@@ -120,9 +123,11 @@ static void __bnxt_xmit_xdp_redirect(struct bnxt *bp,
void bnxt_tx_int_xdp(struct bnxt *bp, struct bnxt_napi *bnapi, int budget)
{
+ struct bnxt_sw_stats *sw_stats = bnapi->cp_ring.sw_stats;
struct bnxt_tx_ring_info *txr = bnapi->tx_ring[0];
struct bnxt_rx_ring_info *rxr = bnapi->rx_ring;
u16 tx_hw_cons = txr->tx_hw_cons;
+ unsigned int pkts = 0, bytes = 0;
bool rx_doorbell_needed = false;
struct bnxt_sw_tx_bd *tx_buf;
u16 tx_cons = txr->tx_cons;
@@ -135,6 +140,10 @@ void bnxt_tx_int_xdp(struct bnxt *bp, struct bnxt_napi *bnapi, int budget)
while (RING_TX(bp, tx_cons) != tx_hw_cons) {
tx_buf = &txr->tx_buf_ring[RING_TX(bp, tx_cons)];
+ pkts++;
+ bytes += tx_buf->xdp_len;
+ tx_buf->xdp_len = 0;
+
if (tx_buf->action == XDP_REDIRECT) {
struct pci_dev *pdev = bp->pdev;
@@ -163,6 +172,12 @@ void bnxt_tx_int_xdp(struct bnxt *bp, struct bnxt_napi *bnapi, int budget)
tx_cons = NEXT_TX(tx_cons);
}
+ /* Note: Rx sync here, because Rx == NAPI context */
+ u64_stats_update_begin(&sw_stats->rx.syncp);
+ sw_stats->tx.xdp_packets += pkts;
+ sw_stats->tx.xdp_bytes += bytes;
+ u64_stats_update_end(&sw_stats->rx.syncp);
+
bnapi->events &= ~BNXT_TX_CMP_EVENT;
WRITE_ONCE(txr->tx_cons, tx_cons);
if (rx_doorbell_needed) {
--
2.48.1
Powered by blists - more mailing lists