net: ena: xdp: add queue counters for xdp actions

When using XDP every ingress packet is passed to an eBPF (xdp) program
which returns an action for this packet.

This patch adds counters for the number of times each such action was
received. It also counts all the invalid actions received from the eBPF
program.

Signed-off-by: Shay Agroskin <shayagr@amazon.com>
Signed-off-by: Sameeh Jubran <sameehj@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/amazon/ena/ena_ethtool.c b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
index 137a36a6bd5fdb31d4f1b1d467aed7afeb4093d7..1e6457dd662a52de3be8150f6e41cf9d4fd4f072 100644 (file)
--- a/drivers/net/ethernet/amazon/ena/ena_ethtool.c
+++ b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
@@ -116,6 +116,11 @@ static const struct ena_stats ena_stats_rx_strings[] = {
        ENA_STAT_RX_ENTRY(bad_req_id),
        ENA_STAT_RX_ENTRY(empty_rx_ring),
        ENA_STAT_RX_ENTRY(csum_unchecked),
+       ENA_STAT_RX_ENTRY(xdp_aborted),
+       ENA_STAT_RX_ENTRY(xdp_drop),
+       ENA_STAT_RX_ENTRY(xdp_pass),
+       ENA_STAT_RX_ENTRY(xdp_tx),
+       ENA_STAT_RX_ENTRY(xdp_invalid),
 };
 
 static const struct ena_stats ena_stats_ena_com_strings[] = {

diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
index 08474db755aaaff07822bc33c0cd7abe08eee290..b52e8d0c7951ef32bc79fbbc4c02c3ea54801f8b 100644 (file)
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@ -365,6 +365,7 @@ static int ena_xdp_execute(struct ena_ring *rx_ring,
 {
        struct bpf_prog *xdp_prog;
        u32 verdict = XDP_PASS;
+       u64 *xdp_stat;
 
        rcu_read_lock();
        xdp_prog = READ_ONCE(rx_ring->xdp_bpf_prog);
@@ -374,17 +375,31 @@ static int ena_xdp_execute(struct ena_ring *rx_ring,
 
        verdict = bpf_prog_run_xdp(xdp_prog, xdp);
 
-       if (verdict == XDP_TX)
+       if (verdict == XDP_TX) {
                ena_xdp_xmit_buff(rx_ring->netdev,
                                  xdp,
                                  rx_ring->qid + rx_ring->adapter->num_io_queues,
                                  rx_info);
-       else if (unlikely(verdict == XDP_ABORTED))
+
+               xdp_stat = &rx_ring->rx_stats.xdp_tx;
+       } else if (unlikely(verdict == XDP_ABORTED)) {
                trace_xdp_exception(rx_ring->netdev, xdp_prog, verdict);
-       else if (unlikely(verdict > XDP_TX))
+               xdp_stat = &rx_ring->rx_stats.xdp_aborted;
+       } else if (unlikely(verdict == XDP_DROP)) {
+               xdp_stat = &rx_ring->rx_stats.xdp_drop;
+       } else if (unlikely(verdict == XDP_PASS)) {
+               xdp_stat = &rx_ring->rx_stats.xdp_pass;
+       } else {
                bpf_warn_invalid_xdp_action(verdict);
+               xdp_stat = &rx_ring->rx_stats.xdp_invalid;
+       }
+
+       u64_stats_update_begin(&rx_ring->syncp);
+       (*xdp_stat)++;
+       u64_stats_update_end(&rx_ring->syncp);
 out:
        rcu_read_unlock();
+
        return verdict;
 }
 

diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.h b/drivers/net/ethernet/amazon/ena/ena_netdev.h
index 4c95a4d93e5c17d443b6d3231fa14c31292cdbd8..52abb6a4f87e6b87109a23cc8aecc2f02aa7ba5b 100644 (file)
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.h
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.h
@@ -261,6 +261,11 @@ struct ena_stats_rx {
        u64 bad_req_id;
        u64 empty_rx_ring;
        u64 csum_unchecked;
+       u64 xdp_aborted;
+       u64 xdp_drop;
+       u64 xdp_pass;
+       u64 xdp_tx;
+       u64 xdp_invalid;
 };
 
 struct ena_ring {