TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: mana: Add counter for XDP_TX

Browse Source 
This counter will show up in ethtool stat. It is the
number of packets received and forwarded by XDP program.

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Haiyang Zhang
2022-01-28 18:03:37 -08:00
committed by David S. Miller
parent f90f84201e
commit d356abb95b
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/ethernet/microsoft/mana/mana.h
+1
View File
@@ -52,6 +52,7 @@ struct mana_stats_rx {
u64 packets; u64 packets;
u64 bytes; u64 bytes;
u64 xdp_drop; u64 xdp_drop;
u64 xdp_tx;
struct u64_stats_sync syncp; struct u64_stats_sync syncp;
}; };
drivers/net/ethernet/microsoft/mana/mana_en.c
+8 -4
View File
@@ -1035,6 +1035,14 @@ static void mana_rx_skb(void *buf_va, struct mana_rxcomp_oob *cqe,
skb_set_hash(skb, hash_value, PKT_HASH_TYPE_L3); skb_set_hash(skb, hash_value, PKT_HASH_TYPE_L3);
} }
u64_stats_update_begin(&rx_stats->syncp);
rx_stats->packets++;
rx_stats->bytes += pkt_len;
if (act == XDP_TX)
rx_stats->xdp_tx++;
u64_stats_update_end(&rx_stats->syncp);
if (act == XDP_TX) { if (act == XDP_TX) {
skb_set_queue_mapping(skb, rxq_idx); skb_set_queue_mapping(skb, rxq_idx);
mana_xdp_tx(skb, ndev); mana_xdp_tx(skb, ndev);
@@ -1043,10 +1051,6 @@ static void mana_rx_skb(void *buf_va, struct mana_rxcomp_oob *cqe,
napi_gro_receive(napi, skb); napi_gro_receive(napi, skb);
u64_stats_update_begin(&rx_stats->syncp);
rx_stats->packets++;
rx_stats->bytes += pkt_len;
u64_stats_update_end(&rx_stats->syncp);
return; return;
drop_xdp: drop_xdp:
drivers/net/ethernet/microsoft/mana/mana_ethtool.c
+6 -1
View File
@@ -23,7 +23,7 @@ static int mana_get_sset_count(struct net_device *ndev, int stringset)
if (stringset != ETH_SS_STATS) if (stringset != ETH_SS_STATS)
return -EINVAL; return -EINVAL;
return ARRAY_SIZE(mana_eth_stats) + num_queues * 5; return ARRAY_SIZE(mana_eth_stats) + num_queues * 6;
} }
static void mana_get_strings(struct net_device *ndev, u32 stringset, u8 *data) static void mana_get_strings(struct net_device *ndev, u32 stringset, u8 *data)
@@ -48,6 +48,8 @@ static void mana_get_strings(struct net_device *ndev, u32 stringset, u8 *data)
p += ETH_GSTRING_LEN; p += ETH_GSTRING_LEN;
sprintf(p, "rx_%d_xdp_drop", i); sprintf(p, "rx_%d_xdp_drop", i);
p += ETH_GSTRING_LEN; p += ETH_GSTRING_LEN;
sprintf(p, "rx_%d_xdp_tx", i);
p += ETH_GSTRING_LEN;
} }
for (i = 0; i < num_queues; i++) { for (i = 0; i < num_queues; i++) {
@@ -69,6 +71,7 @@ static void mana_get_ethtool_stats(struct net_device *ndev,
unsigned int start; unsigned int start;
u64 packets, bytes; u64 packets, bytes;
u64 xdp_drop; u64 xdp_drop;
u64 xdp_tx;
int q, i = 0; int q, i = 0;
if (!apc->port_is_up) if (!apc->port_is_up)
@@ -85,11 +88,13 @@ static void mana_get_ethtool_stats(struct net_device *ndev,
packets = rx_stats->packets; packets = rx_stats->packets;
bytes = rx_stats->bytes; bytes = rx_stats->bytes;
xdp_drop = rx_stats->xdp_drop; xdp_drop = rx_stats->xdp_drop;
xdp_tx = rx_stats->xdp_tx;
} while (u64_stats_fetch_retry_irq(&rx_stats->syncp, start)); } while (u64_stats_fetch_retry_irq(&rx_stats->syncp, start));
data[i++] = packets; data[i++] = packets;
data[i++] = bytes; data[i++] = bytes;
data[i++] = xdp_drop; data[i++] = xdp_drop;
data[i++] = xdp_tx;
} }
for (q = 0; q < num_queues; q++) { for (q = 0; q < num_queues; q++) {