diff options
author | Ciara Loftus <ciara.loftus@intel.com> | 2020-07-08 07:28:35 +0000 |
---|---|---|
committer | Alexei Starovoitov <ast@kernel.org> | 2020-07-13 15:32:56 -0700 |
commit | 0d80cb4612aa32dc0faa17fa3ab6f96f33e2b4a7 (patch) | |
tree | e623617e4cb293fd0a0c98047493c580de65f9a6 /net/xdp | |
parent | b36c3206f9ef3ea2844e9092c12d29c0d1f56c54 (diff) | |
download | lwn-0d80cb4612aa32dc0faa17fa3ab6f96f33e2b4a7.tar.gz lwn-0d80cb4612aa32dc0faa17fa3ab6f96f33e2b4a7.zip |
xsk: Add xdp statistics to xsk_diag
Add xdp statistics to the information dumped through the xsk_diag interface
Signed-off-by: Ciara Loftus <ciara.loftus@intel.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20200708072835.4427-4-ciara.loftus@intel.com
Diffstat (limited to 'net/xdp')
-rw-r--r-- | net/xdp/xsk_diag.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/net/xdp/xsk_diag.c b/net/xdp/xsk_diag.c index 0163b26aaf63..21e9c2d123ee 100644 --- a/net/xdp/xsk_diag.c +++ b/net/xdp/xsk_diag.c @@ -76,6 +76,19 @@ static int xsk_diag_put_umem(const struct xdp_sock *xs, struct sk_buff *nlskb) return err; } +static int xsk_diag_put_stats(const struct xdp_sock *xs, struct sk_buff *nlskb) +{ + struct xdp_diag_stats du = {}; + + du.n_rx_dropped = xs->rx_dropped; + du.n_rx_invalid = xskq_nb_invalid_descs(xs->rx); + du.n_rx_full = xs->rx_queue_full; + du.n_fill_ring_empty = xs->umem ? xskq_nb_queue_empty_descs(xs->umem->fq) : 0; + du.n_tx_invalid = xskq_nb_invalid_descs(xs->tx); + du.n_tx_ring_empty = xskq_nb_queue_empty_descs(xs->tx); + return nla_put(nlskb, XDP_DIAG_STATS, sizeof(du), &du); +} + static int xsk_diag_fill(struct sock *sk, struct sk_buff *nlskb, struct xdp_diag_req *req, struct user_namespace *user_ns, @@ -118,6 +131,10 @@ static int xsk_diag_fill(struct sock *sk, struct sk_buff *nlskb, sock_diag_put_meminfo(sk, nlskb, XDP_DIAG_MEMINFO)) goto out_nlmsg_trim; + if ((req->xdiag_show & XDP_SHOW_STATS) && + xsk_diag_put_stats(xs, nlskb)) + goto out_nlmsg_trim; + mutex_unlock(&xs->mutex); nlmsg_end(nlskb, nlh); return 0; |