Commit 2640d3c8 authored by Maxim Mikityanskiy's avatar Maxim Mikityanskiy Committed by Daniel Borkmann
Browse files

xsk: Add getsockopt XDP_OPTIONS 



Make it possible for the application to determine whether the AF_XDP
socket is running in zero-copy mode. To achieve this, add a new
getsockopt option XDP_OPTIONS that returns flags. The only flag
supported for now is the zero-copy mode indicator.

Signed-off-by: default avatarMaxim Mikityanskiy <maximmi@mellanox.com>
Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
Acked-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Acked-by: default avatarBjörn Töpel <bjorn.topel@intel.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent d57d7642

include/uapi/linux/if_xdp.h

+8 −0
Original line number Original line Diff line number Diff line
@@ -46,6 +46,7 @@ struct xdp_mmap_offsets { 
#define XDP_UMEM_FILL_RING		5

#define XDP_UMEM_FILL_RING		5

#define XDP_UMEM_COMPLETION_RING	6

#define XDP_UMEM_COMPLETION_RING	6

#define XDP_STATISTICS			7

#define XDP_STATISTICS			7

#define XDP_OPTIONS			8





struct xdp_umem_reg {

struct xdp_umem_reg {

	__u64 addr; /* Start of packet data area */

	__u64 addr; /* Start of packet data area */
@@ -60,6 +61,13 @@ struct xdp_statistics { 
	__u64 tx_invalid_descs; /* Dropped due to invalid descriptor */

	__u64 tx_invalid_descs; /* Dropped due to invalid descriptor */

};

};





struct xdp_options {

	__u32 flags;

};



/* Flags for the flags field of struct xdp_options */

#define XDP_OPTIONS_ZEROCOPY (1 << 0)



/* Pgoff for mmaping the rings */

/* Pgoff for mmaping the rings */

#define XDP_PGOFF_RX_RING			  0

#define XDP_PGOFF_RX_RING			  0

#define XDP_PGOFF_TX_RING		 0x80000000

#define XDP_PGOFF_TX_RING		 0x80000000

net/xdp/xsk.c

+20 −0
Original line number Original line Diff line number Diff line
@@ -650,6 +650,26 @@ static int xsk_getsockopt(struct socket *sock, int level, int optname, 




		return 0;

		return 0;

	}

	}

	case XDP_OPTIONS:

	{

		struct xdp_options opts = {};



		if (len < sizeof(opts))

			return -EINVAL;



		mutex_lock(&xs->mutex);

		if (xs->zc)

			opts.flags |= XDP_OPTIONS_ZEROCOPY;

		mutex_unlock(&xs->mutex);



		len = sizeof(opts);

		if (copy_to_user(optval, &opts, len))

			return -EFAULT;

		if (put_user(len, optlen))

			return -EFAULT;



		return 0;

	}

	default:

	default:

		break;

		break;

	}

	}

tools/include/uapi/linux/if_xdp.h

+8 −0
Original line number Original line Diff line number Diff line
@@ -46,6 +46,7 @@ struct xdp_mmap_offsets { 
#define XDP_UMEM_FILL_RING		5

#define XDP_UMEM_FILL_RING		5

#define XDP_UMEM_COMPLETION_RING	6

#define XDP_UMEM_COMPLETION_RING	6

#define XDP_STATISTICS			7

#define XDP_STATISTICS			7

#define XDP_OPTIONS			8





struct xdp_umem_reg {

struct xdp_umem_reg {

	__u64 addr; /* Start of packet data area */

	__u64 addr; /* Start of packet data area */
@@ -60,6 +61,13 @@ struct xdp_statistics { 
	__u64 tx_invalid_descs; /* Dropped due to invalid descriptor */

	__u64 tx_invalid_descs; /* Dropped due to invalid descriptor */

};

};





struct xdp_options {

	__u32 flags;

};



/* Flags for the flags field of struct xdp_options */

#define XDP_OPTIONS_ZEROCOPY (1 << 0)



/* Pgoff for mmaping the rings */

/* Pgoff for mmaping the rings */

#define XDP_PGOFF_RX_RING			  0

#define XDP_PGOFF_RX_RING			  0

#define XDP_PGOFF_TX_RING		 0x80000000

#define XDP_PGOFF_TX_RING		 0x80000000

CRA Git | Maintained and supported by SUSTech CRA and CCSE