ss: add AF_XDP support
AF_XDP is an address family that is optimized for high performance
packet processing.
This patch adds AF_XDP support to ss(8) so that sockets can be queried
and monitored.
Example:
$ sudo ss --xdp -e -p -m
Recv-Q Send-Q Local Address:Port Peer Address:Port
0 0 enp134s0f0:q20 *
users:(("xdpsock",pid=17787,fd=3)) ino:39424 sk:4
rx(entries:2048)
tx(entries:2048)
umem(id:1,size:8388608,num_pages:2048,chunk_size:2048,headroom:0,ifindex:7,
qid:20,zc:0,refs:1)
fr(entries:2048)
cr(entries:2048) skmem:(r0,rb212992,t0,tb212992,f0,w0,o0,bl0,d0)
0 0 enp24s0f0:q0 *
users:(("xdpsock",pid=17780,fd=3)) ino:37384 sk:5
rx(entries:2048)
tx(entries:2048)
umem(id:0,size:8388608,num_pages:2048,chunk_size:2048,headroom:0,ifindex:6,
qid:0,zc:1,refs:1)
fr(entries:2048)
cr(entries:2048) skmem:(r0,rb212992,t0,tb212992,f0,w0,o0,bl0,d0)
Signed-off-by: Björn Töpel <bjorn.topel@intel.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
Björn Töpel
David Ahern
parent
f79b7733b4
commit
2abc3d76e3
|
|
@ -127,6 +127,14 @@ struct dn_naddr
|
|||
# define CLOCK_TAI 11
|
||||
#endif
|
||||
|
||||
#ifndef AF_XDP
|
||||
# define AF_XDP 44
|
||||
# if AF_MAX < 45
|
||||
# undef AF_MAX
|
||||
# define AF_MAX 45
|
||||
# endif
|
||||
#endif
|
||||
|
||||
__u32 get_addr32(const char *name);
|
||||
int get_addr_1(inet_prefix *dst, const char *arg, int family);
|
||||
int get_prefix_1(inet_prefix *dst, char *arg, int family);
|
||||
|
|
|
|||
|
|
@ -324,16 +324,19 @@ Display SCTP sockets.
|
|||
.B \-\-vsock
|
||||
Display vsock sockets (alias for -f vsock).
|
||||
.TP
|
||||
.B \-\-xdp
|
||||
Display XDP sockets (alias for -f xdp).
|
||||
.TP
|
||||
.B \-f FAMILY, \-\-family=FAMILY
|
||||
Display sockets of type FAMILY.
|
||||
Currently the following families are supported: unix, inet, inet6, link, netlink, vsock.
|
||||
Currently the following families are supported: unix, inet, inet6, link, netlink, vsock, xdp.
|
||||
.TP
|
||||
.B \-A QUERY, \-\-query=QUERY, \-\-socket=QUERY
|
||||
List of socket tables to dump, separated by commas. The following identifiers
|
||||
are understood: all, inet, tcp, udp, raw, unix, packet, netlink, unix_dgram,
|
||||
unix_stream, unix_seqpacket, packet_raw, packet_dgram, dccp, sctp,
|
||||
vsock_stream, vsock_dgram. Any item in the list may optionally be prefixed by
|
||||
an exclamation mark
|
||||
vsock_stream, vsock_dgram, xdp Any item in the list may optionally be
|
||||
prefixed by an exclamation mark
|
||||
.RB ( ! )
|
||||
to exclude that socket table from being dumped.
|
||||
.TP
|
||||
|
|
|
|||
168
misc/ss.c
168
misc/ss.c
|
|
@ -42,6 +42,7 @@
|
|||
#include <linux/unix_diag.h>
|
||||
#include <linux/netdevice.h> /* for MAX_ADDR_LEN */
|
||||
#include <linux/filter.h>
|
||||
#include <linux/xdp_diag.h>
|
||||
#include <linux/packet_diag.h>
|
||||
#include <linux/netlink_diag.h>
|
||||
#include <linux/sctp.h>
|
||||
|
|
@ -198,6 +199,7 @@ enum {
|
|||
VSOCK_ST_DB,
|
||||
VSOCK_DG_DB,
|
||||
TIPC_DB,
|
||||
XDP_DB,
|
||||
MAX_DB
|
||||
};
|
||||
|
||||
|
|
@ -309,6 +311,10 @@ static const struct filter default_dbs[MAX_DB] = {
|
|||
.states = TIPC_SS_CONN,
|
||||
.families = FAMILY_MASK(AF_TIPC),
|
||||
},
|
||||
[XDP_DB] = {
|
||||
.states = (1 << SS_CLOSE),
|
||||
.families = FAMILY_MASK(AF_XDP),
|
||||
},
|
||||
};
|
||||
|
||||
static const struct filter default_afs[AF_MAX] = {
|
||||
|
|
@ -340,6 +346,10 @@ static const struct filter default_afs[AF_MAX] = {
|
|||
.dbs = (1 << TIPC_DB),
|
||||
.states = TIPC_SS_CONN,
|
||||
},
|
||||
[AF_XDP] = {
|
||||
.dbs = (1 << XDP_DB),
|
||||
.states = (1 << SS_CLOSE),
|
||||
},
|
||||
};
|
||||
|
||||
static int do_default = 1;
|
||||
|
|
@ -366,7 +376,7 @@ static int filter_db_parse(struct filter *f, const char *s)
|
|||
ENTRY(all, UDP_DB, DCCP_DB, TCP_DB, RAW_DB,
|
||||
UNIX_ST_DB, UNIX_DG_DB, UNIX_SQ_DB,
|
||||
PACKET_R_DB, PACKET_DG_DB, NETLINK_DB,
|
||||
SCTP_DB, VSOCK_ST_DB, VSOCK_DG_DB),
|
||||
SCTP_DB, VSOCK_ST_DB, VSOCK_DG_DB, XDP_DB),
|
||||
ENTRY(inet, UDP_DB, DCCP_DB, TCP_DB, SCTP_DB, RAW_DB),
|
||||
ENTRY(udp, UDP_DB),
|
||||
ENTRY(dccp, DCCP_DB),
|
||||
|
|
@ -391,6 +401,7 @@ static int filter_db_parse(struct filter *f, const char *s)
|
|||
ENTRY(v_str, VSOCK_ST_DB), /* alias for vsock_stream */
|
||||
ENTRY(vsock_dgram, VSOCK_DG_DB),
|
||||
ENTRY(v_dgr, VSOCK_DG_DB), /* alias for vsock_dgram */
|
||||
ENTRY(xdp, XDP_DB),
|
||||
#undef ENTRY
|
||||
};
|
||||
bool enable = true;
|
||||
|
|
@ -1331,6 +1342,9 @@ static void sock_state_print(struct sockstat *s)
|
|||
case AF_VSOCK:
|
||||
sock_name = vsock_netid_name(s->type);
|
||||
break;
|
||||
case AF_XDP:
|
||||
sock_name = "xdp";
|
||||
break;
|
||||
default:
|
||||
sock_name = "unknown";
|
||||
}
|
||||
|
|
@ -4055,6 +4069,142 @@ static int packet_show(struct filter *f)
|
|||
return rc;
|
||||
}
|
||||
|
||||
static int xdp_stats_print(struct sockstat *s, const struct filter *f)
|
||||
{
|
||||
const char *addr, *port;
|
||||
char q_str[16];
|
||||
|
||||
s->local.family = s->remote.family = AF_XDP;
|
||||
|
||||
if (f->f) {
|
||||
if (run_ssfilter(f->f, s) == 0)
|
||||
return 1;
|
||||
}
|
||||
|
||||
sock_state_print(s);
|
||||
|
||||
if (s->iface) {
|
||||
addr = xll_index_to_name(s->iface);
|
||||
snprintf(q_str, sizeof(q_str), "q%d", s->lport);
|
||||
port = q_str;
|
||||
sock_addr_print(addr, ":", port, NULL);
|
||||
} else {
|
||||
sock_addr_print("", "*", "", NULL);
|
||||
}
|
||||
|
||||
sock_addr_print("", "*", "", NULL);
|
||||
|
||||
proc_ctx_print(s);
|
||||
|
||||
if (show_details)
|
||||
sock_details_print(s);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void xdp_show_ring(const char *name, struct xdp_diag_ring *ring)
|
||||
{
|
||||
out("\n\t%s(", name);
|
||||
out("entries:%u", ring->entries);
|
||||
out(")");
|
||||
}
|
||||
|
||||
static void xdp_show_umem(struct xdp_diag_umem *umem, struct xdp_diag_ring *fr,
|
||||
struct xdp_diag_ring *cr)
|
||||
{
|
||||
out("\n\tumem(");
|
||||
out("id:%u", umem->id);
|
||||
out(",size:%llu", umem->size);
|
||||
out(",num_pages:%u", umem->num_pages);
|
||||
out(",chunk_size:%u", umem->chunk_size);
|
||||
out(",headroom:%u", umem->headroom);
|
||||
out(",ifindex:%u", umem->ifindex);
|
||||
out(",qid:%u", umem->queue_id);
|
||||
out(",zc:%u", umem->flags & XDP_DU_F_ZEROCOPY);
|
||||
out(",refs:%u", umem->refs);
|
||||
out(")");
|
||||
|
||||
if (fr)
|
||||
xdp_show_ring("fr", fr);
|
||||
if (cr)
|
||||
xdp_show_ring("cr", cr);
|
||||
}
|
||||
|
||||
static int xdp_show_sock(struct nlmsghdr *nlh, void *arg)
|
||||
{
|
||||
struct xdp_diag_ring *rx = NULL, *tx = NULL, *fr = NULL, *cr = NULL;
|
||||
struct xdp_diag_msg *msg = NLMSG_DATA(nlh);
|
||||
struct rtattr *tb[XDP_DIAG_MAX + 1];
|
||||
struct xdp_diag_info *info = NULL;
|
||||
struct xdp_diag_umem *umem = NULL;
|
||||
const struct filter *f = arg;
|
||||
struct sockstat stat = {};
|
||||
|
||||
parse_rtattr(tb, XDP_DIAG_MAX, (struct rtattr *)(msg + 1),
|
||||
nlh->nlmsg_len - NLMSG_LENGTH(sizeof(*msg)));
|
||||
|
||||
stat.type = msg->xdiag_type;
|
||||
stat.ino = msg->xdiag_ino;
|
||||
stat.state = SS_CLOSE;
|
||||
stat.sk = cookie_sk_get(&msg->xdiag_cookie[0]);
|
||||
|
||||
if (tb[XDP_DIAG_INFO]) {
|
||||
info = RTA_DATA(tb[XDP_DIAG_INFO]);
|
||||
stat.iface = info->ifindex;
|
||||
stat.lport = info->queue_id;
|
||||
}
|
||||
|
||||
if (tb[XDP_DIAG_UID])
|
||||
stat.uid = rta_getattr_u32(tb[XDP_DIAG_UID]);
|
||||
if (tb[XDP_DIAG_RX_RING])
|
||||
rx = RTA_DATA(tb[XDP_DIAG_RX_RING]);
|
||||
if (tb[XDP_DIAG_TX_RING])
|
||||
tx = RTA_DATA(tb[XDP_DIAG_TX_RING]);
|
||||
if (tb[XDP_DIAG_UMEM])
|
||||
umem = RTA_DATA(tb[XDP_DIAG_UMEM]);
|
||||
if (tb[XDP_DIAG_UMEM_FILL_RING])
|
||||
fr = RTA_DATA(tb[XDP_DIAG_UMEM_FILL_RING]);
|
||||
if (tb[XDP_DIAG_UMEM_COMPLETION_RING])
|
||||
cr = RTA_DATA(tb[XDP_DIAG_UMEM_COMPLETION_RING]);
|
||||
if (tb[XDP_DIAG_MEMINFO]) {
|
||||
__u32 *skmeminfo = RTA_DATA(tb[XDP_DIAG_MEMINFO]);
|
||||
|
||||
stat.rq = skmeminfo[SK_MEMINFO_RMEM_ALLOC];
|
||||
}
|
||||
|
||||
if (xdp_stats_print(&stat, f))
|
||||
return 0;
|
||||
|
||||
if (show_details) {
|
||||
if (rx)
|
||||
xdp_show_ring("rx", rx);
|
||||
if (tx)
|
||||
xdp_show_ring("tx", tx);
|
||||
if (umem)
|
||||
xdp_show_umem(umem, fr, cr);
|
||||
}
|
||||
|
||||
if (show_mem)
|
||||
print_skmeminfo(tb, XDP_DIAG_MEMINFO); // really?
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int xdp_show(struct filter *f)
|
||||
{
|
||||
DIAG_REQUEST(req, struct xdp_diag_req r);
|
||||
|
||||
if (!filter_af_get(f, AF_XDP) || !(f->states & (1 << SS_CLOSE)))
|
||||
return 0;
|
||||
|
||||
req.r.sdiag_family = AF_XDP;
|
||||
req.r.xdiag_show = XDP_SHOW_INFO | XDP_SHOW_RING_CFG | XDP_SHOW_UMEM |
|
||||
XDP_SHOW_MEMINFO;
|
||||
|
||||
return handle_netlink_request(f, &req.nlh, sizeof(req), xdp_show_sock);
|
||||
}
|
||||
|
||||
static int netlink_show_one(struct filter *f,
|
||||
int prot, int pid, unsigned int groups,
|
||||
int state, int dst_pid, unsigned int dst_group,
|
||||
|
|
@ -4442,6 +4592,9 @@ static int generic_show_sock(struct nlmsghdr *nlh, void *arg)
|
|||
case AF_VSOCK:
|
||||
ret = vsock_show_sock(nlh, arg);
|
||||
break;
|
||||
case AF_XDP:
|
||||
ret = xdp_show_sock(nlh, arg);
|
||||
break;
|
||||
default:
|
||||
ret = -1;
|
||||
}
|
||||
|
|
@ -4679,7 +4832,7 @@ static void _usage(FILE *dest)
|
|||
" --tipc display only TIPC sockets\n"
|
||||
" --vsock display only vsock sockets\n"
|
||||
" -f, --family=FAMILY display sockets of type FAMILY\n"
|
||||
" FAMILY := {inet|inet6|link|unix|netlink|vsock|tipc|help}\n"
|
||||
" FAMILY := {inet|inet6|link|unix|netlink|vsock|tipc|xdp|help}\n"
|
||||
"\n"
|
||||
" -K, --kill forcibly close sockets, display what was closed\n"
|
||||
" -H, --no-header Suppress header line\n"
|
||||
|
|
@ -4765,6 +4918,9 @@ static int scan_state(const char *state)
|
|||
#define OPT_TIPCSOCK 257
|
||||
#define OPT_TIPCINFO 258
|
||||
|
||||
/* Values of 'x' are already used so a non-character is used */
|
||||
#define OPT_XDPSOCK 259
|
||||
|
||||
static const struct option long_opts[] = {
|
||||
{ "numeric", 0, 0, 'n' },
|
||||
{ "resolve", 0, 0, 'r' },
|
||||
|
|
@ -4802,6 +4958,7 @@ static const struct option long_opts[] = {
|
|||
{ "tipcinfo", 0, 0, OPT_TIPCINFO},
|
||||
{ "kill", 0, 0, 'K' },
|
||||
{ "no-header", 0, 0, 'H' },
|
||||
{ "xdp", 0, 0, OPT_XDPSOCK},
|
||||
{ 0 }
|
||||
|
||||
};
|
||||
|
|
@ -4889,6 +5046,9 @@ int main(int argc, char *argv[])
|
|||
case '0':
|
||||
filter_af_set(¤t_filter, AF_PACKET);
|
||||
break;
|
||||
case OPT_XDPSOCK:
|
||||
filter_af_set(¤t_filter, AF_XDP);
|
||||
break;
|
||||
case 'f':
|
||||
if (strcmp(optarg, "inet") == 0)
|
||||
filter_af_set(¤t_filter, AF_INET);
|
||||
|
|
@ -4904,6 +5064,8 @@ int main(int argc, char *argv[])
|
|||
filter_af_set(¤t_filter, AF_TIPC);
|
||||
else if (strcmp(optarg, "vsock") == 0)
|
||||
filter_af_set(¤t_filter, AF_VSOCK);
|
||||
else if (strcmp(optarg, "xdp") == 0)
|
||||
filter_af_set(¤t_filter, AF_XDP);
|
||||
else if (strcmp(optarg, "help") == 0)
|
||||
help();
|
||||
else {
|
||||
|
|
@ -5101,6 +5263,8 @@ int main(int argc, char *argv[])
|
|||
vsock_show(¤t_filter);
|
||||
if (current_filter.dbs & (1<<TIPC_DB))
|
||||
tipc_show(¤t_filter);
|
||||
if (current_filter.dbs & (1<<XDP_DB))
|
||||
xdp_show(¤t_filter);
|
||||
|
||||
if (show_users || show_proc_ctx || show_sock_ctx)
|
||||
user_ent_destroy();
|
||||
|
|
|
|||
Loading…
Reference in New Issue