Commit dbbd79ae authored by Daniel Borkmann's avatar Daniel Borkmann
Browse files

Merge branch 'af-xdp-sock-diag' 



Björn Töpel says:

====================
This series adds an AF_XDP sock_diag interface for querying sockets
from user-space. Tools like iproute2 ss(8) can use this interface to
list open AF_XDP sockets.

The diagnostic provides information about the Rx/Tx/fill/completetion
rings, umem, memory usage and such. For a complete list, please refer
to the xsk_diag.c file.

The AF_XDP sock_diag interface is optional, and can be built as a
module. A separate patch series, adding ss(8) iproute2 support, will
follow.

v1->v2:
  * Removed extra newline
  * Zero-out all user-space facing structures prior setting the
    members
  * Added explicit "pad" member in _msg struct
  * Removed unused variable "req" in xsk_diag_handler_dump()

Thanks to Daniel for reviewing the series!
====================

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parents 2f092126 a36b38aa

include/net/net_namespace.h

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <net/netns/xfrm.h>

#include <net/netns/mpls.h>

#include <net/netns/can.h>

#include <net/netns/xdp.h>

#include <linux/ns_common.h>

#include <linux/idr.h>

#include <linux/skbuff.h>
@@ -160,6 +161,9 @@ struct net { 
#endif

#if IS_ENABLED(CONFIG_CAN)

	struct netns_can	can;

#endif

#ifdef CONFIG_XDP_SOCKETS

	struct netns_xdp	xdp;

#endif

	struct sock		*diag_nlsk;

	atomic_t		fnhe_genid;

include/net/netns/xdp.h

0 → 100644
+13 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __NETNS_XDP_H__

#define __NETNS_XDP_H__



#include <linux/rculist.h>

#include <linux/mutex.h>



struct netns_xdp {

	struct mutex		lock;

	struct hlist_head	list;

};



#endif /* __NETNS_XDP_H__ */

include/net/xdp_sock.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ struct xdp_umem { 
	struct work_struct work;

	struct page **pgs;

	u32 npgs;

	int id;

	struct net_device *dev;

	struct xdp_umem_fq_reuse *fq_reuse;

	u16 queue_id;

include/uapi/linux/xdp_diag.h

0 → 100644
+72 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

/*

 * xdp_diag: interface for query/monitor XDP sockets

 * Copyright(c) 2019 Intel Corporation.

 */



#ifndef _LINUX_XDP_DIAG_H

#define _LINUX_XDP_DIAG_H



#include <linux/types.h>



struct xdp_diag_req {

	__u8	sdiag_family;

	__u8	sdiag_protocol;

	__u16	pad;

	__u32	xdiag_ino;

	__u32	xdiag_show;

	__u32	xdiag_cookie[2];

};



struct xdp_diag_msg {

	__u8	xdiag_family;

	__u8	xdiag_type;

	__u16	pad;

	__u32	xdiag_ino;

	__u32	xdiag_cookie[2];

};



#define XDP_SHOW_INFO		(1 << 0) /* Basic information */

#define XDP_SHOW_RING_CFG	(1 << 1)

#define XDP_SHOW_UMEM		(1 << 2)

#define XDP_SHOW_MEMINFO	(1 << 3)



enum {

	XDP_DIAG_NONE,

	XDP_DIAG_INFO,

	XDP_DIAG_UID,

	XDP_DIAG_RX_RING,

	XDP_DIAG_TX_RING,

	XDP_DIAG_UMEM,

	XDP_DIAG_UMEM_FILL_RING,

	XDP_DIAG_UMEM_COMPLETION_RING,

	XDP_DIAG_MEMINFO,

	__XDP_DIAG_MAX,

};



#define XDP_DIAG_MAX (__XDP_DIAG_MAX - 1)



struct xdp_diag_info {

	__u32	ifindex;

	__u32	queue_id;

};



struct xdp_diag_ring {

	__u32	entries; /*num descs */

};



#define XDP_DU_F_ZEROCOPY (1 << 0)



struct xdp_diag_umem {

	__u64	size;

	__u32	id;

	__u32	num_pages;

	__u32	chunk_size;

	__u32	headroom;

	__u32	ifindex;

	__u32	queue_id;

	__u32	flags;

	__u32	refs;

};



#endif /* _LINUX_XDP_DIAG_H */

net/xdp/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -5,3 +5,11 @@ config XDP_SOCKETS 
	help

	  XDP sockets allows a channel between XDP programs and

	  userspace applications.



config XDP_SOCKETS_DIAG

	tristate "XDP sockets: monitoring interface"

	depends on XDP_SOCKETS

	default n

	help

	  Support for PF_XDP sockets monitoring interface used by the ss tool.

	  If unsure, say Y.

CRA Git | Maintained and supported by SUSTech CRA and CCSE