Commit 10d30e30 authored by Kevin Laatz's avatar Kevin Laatz Committed by Daniel Borkmann
Browse files

libbpf: add flags to umem config 



This patch adds a 'flags' field to the umem_config and umem_reg structs.
This will allow for more options to be added for configuring umems.

The first use for the flags field is to add a flag for unaligned chunks
mode. These flags can either be user-provided or filled with a default.

Since we change the size of the xsk_umem_config struct, we need to version
the ABI. This patch includes the ABI versioning for xsk_umem__create. The
Makefile was also updated to handle multiple function versions in
check-abi.

Signed-off-by: default avatarKevin Laatz <kevin.laatz@intel.com>
Signed-off-by: default avatarCiara Loftus <ciara.loftus@intel.com>
Acked-by: default avatarJonathan Lemon <jonathan.lemon@gmail.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 282c0c79

tools/include/uapi/linux/if_xdp.h

+9 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ 
 */

#define XDP_USE_NEED_WAKEUP (1 << 3)



/* Flags for xsk_umem_config flags */

#define XDP_UMEM_UNALIGNED_CHUNK_FLAG (1 << 0)



struct sockaddr_xdp {

	__u16 sxdp_family;

	__u16 sxdp_flags;
@@ -66,6 +69,7 @@ struct xdp_umem_reg { 
	__u64 len; /* Length of packet data area */

	__u32 chunk_size;

	__u32 headroom;

	__u32 flags;

};



struct xdp_statistics {
@@ -87,6 +91,11 @@ struct xdp_options { 
#define XDP_UMEM_PGOFF_FILL_RING	0x100000000ULL

#define XDP_UMEM_PGOFF_COMPLETION_RING	0x180000000ULL



/* Masks for unaligned chunks mode */

#define XSK_UNALIGNED_BUF_OFFSET_SHIFT 48

#define XSK_UNALIGNED_BUF_ADDR_MASK \

	((1ULL << XSK_UNALIGNED_BUF_OFFSET_SHIFT) - 1)



/* Rx/Tx descriptor */

struct xdp_desc {

	__u64 addr;

tools/lib/bpf/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -134,7 +134,9 @@ LIB_FILE := $(addprefix $(OUTPUT),$(LIB_FILE)) 
PC_FILE		:= $(addprefix $(OUTPUT),$(PC_FILE))



GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN) | \

			   awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {s++} END{print s}')

			   cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \

			   awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$8}' | \

			   sort -u | wc -l)

VERSIONED_SYM_COUNT = $(shell readelf -s --wide $(OUTPUT)libbpf.so | \

			      grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | sort -u | wc -l)
@@ -201,6 +203,7 @@ check_abi: $(OUTPUT)libbpf.so 
		     "Please make sure all LIBBPF_API symbols are"	 \

		     "versioned in $(VERSION_SCRIPT)." >&2;		 \

		readelf -s --wide $(OUTPUT)libbpf-in.o |		 \

		    cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' |	 \

		    awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$8}'|   \

		    sort -u > $(OUTPUT)libbpf_global_syms.tmp;		 \

		readelf -s --wide $(OUTPUT)libbpf.so |			 \

tools/lib/bpf/libbpf.map

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ LIBBPF_0.0.4 { 
		perf_buffer__new;

		perf_buffer__new_raw;

		perf_buffer__poll;

		xsk_umem__create;

} LIBBPF_0.0.3;



LIBBPF_0.0.5 {

tools/lib/bpf/xsk.c

+30 −3
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ static void xsk_set_umem_config(struct xsk_umem_config *cfg, 
		cfg->comp_size = XSK_RING_CONS__DEFAULT_NUM_DESCS;

		cfg->frame_size = XSK_UMEM__DEFAULT_FRAME_SIZE;

		cfg->frame_headroom = XSK_UMEM__DEFAULT_FRAME_HEADROOM;

		cfg->flags = XSK_UMEM__DEFAULT_FLAGS;

		return;

	}
@@ -106,6 +107,7 @@ static void xsk_set_umem_config(struct xsk_umem_config *cfg, 
	cfg->comp_size = usr_cfg->comp_size;

	cfg->frame_size = usr_cfg->frame_size;

	cfg->frame_headroom = usr_cfg->frame_headroom;

	cfg->flags = usr_cfg->flags;

}



static int xsk_set_xdp_socket_config(struct xsk_socket_config *cfg,
@@ -132,8 +134,9 @@ static int xsk_set_xdp_socket_config(struct xsk_socket_config *cfg, 
	return 0;

}



int xsk_umem__create(struct xsk_umem **umem_ptr, void *umem_area, __u64 size,

		     struct xsk_ring_prod *fill, struct xsk_ring_cons *comp,

int xsk_umem__create_v0_0_4(struct xsk_umem **umem_ptr, void *umem_area,

			    __u64 size, struct xsk_ring_prod *fill,

			    struct xsk_ring_cons *comp,

			    const struct xsk_umem_config *usr_config)

{

	struct xdp_mmap_offsets off;
@@ -165,6 +168,7 @@ int xsk_umem__create(struct xsk_umem **umem_ptr, void *umem_area, __u64 size, 
	mr.len = size;

	mr.chunk_size = umem->config.frame_size;

	mr.headroom = umem->config.frame_headroom;

	mr.flags = umem->config.flags;



	err = setsockopt(umem->fd, SOL_XDP, XDP_UMEM_REG, &mr, sizeof(mr));

	if (err) {
@@ -238,6 +242,29 @@ out_umem_alloc: 
	return err;

}



struct xsk_umem_config_v1 {

	__u32 fill_size;

	__u32 comp_size;

	__u32 frame_size;

	__u32 frame_headroom;

};



int xsk_umem__create_v0_0_2(struct xsk_umem **umem_ptr, void *umem_area,

			    __u64 size, struct xsk_ring_prod *fill,

			    struct xsk_ring_cons *comp,

			    const struct xsk_umem_config *usr_config)

{

	struct xsk_umem_config config;



	memcpy(&config, usr_config, sizeof(struct xsk_umem_config_v1));

	config.flags = 0;



	return xsk_umem__create_v0_0_4(umem_ptr, umem_area, size, fill, comp,

					&config);

}

asm(".symver xsk_umem__create_v0_0_2, xsk_umem__create@LIBBPF_0.0.2");

asm(".symver xsk_umem__create_v0_0_4, xsk_umem__create@@LIBBPF_0.0.4");



static int xsk_load_xdp_prog(struct xsk_socket *xsk)

{

	static const int log_buf_size = 16 * 1024;

tools/lib/bpf/xsk.h

+27 −0
Original line number Diff line number Diff line
@@ -168,6 +168,21 @@ static inline void *xsk_umem__get_data(void *umem_area, __u64 addr) 
	return &((char *)umem_area)[addr];

}



static inline __u64 xsk_umem__extract_addr(__u64 addr)

{

	return addr & XSK_UNALIGNED_BUF_ADDR_MASK;

}



static inline __u64 xsk_umem__extract_offset(__u64 addr)

{

	return addr >> XSK_UNALIGNED_BUF_OFFSET_SHIFT;

}



static inline __u64 xsk_umem__add_offset_to_addr(__u64 addr)

{

	return xsk_umem__extract_addr(addr) + xsk_umem__extract_offset(addr);

}



LIBBPF_API int xsk_umem__fd(const struct xsk_umem *umem);

LIBBPF_API int xsk_socket__fd(const struct xsk_socket *xsk);
@@ -176,12 +191,14 @@ LIBBPF_API int xsk_socket__fd(const struct xsk_socket *xsk); 
#define XSK_UMEM__DEFAULT_FRAME_SHIFT    12 /* 4096 bytes */

#define XSK_UMEM__DEFAULT_FRAME_SIZE     (1 << XSK_UMEM__DEFAULT_FRAME_SHIFT)

#define XSK_UMEM__DEFAULT_FRAME_HEADROOM 0

#define XSK_UMEM__DEFAULT_FLAGS 0



struct xsk_umem_config {

	__u32 fill_size;

	__u32 comp_size;

	__u32 frame_size;

	__u32 frame_headroom;

	__u32 flags;

};



/* Flags for the libbpf_flags field. */
@@ -201,6 +218,16 @@ LIBBPF_API int xsk_umem__create(struct xsk_umem **umem, 
				struct xsk_ring_prod *fill,

				struct xsk_ring_cons *comp,

				const struct xsk_umem_config *config);

LIBBPF_API int xsk_umem__create_v0_0_2(struct xsk_umem **umem,

				       void *umem_area, __u64 size,

				       struct xsk_ring_prod *fill,

				       struct xsk_ring_cons *comp,

				       const struct xsk_umem_config *config);

LIBBPF_API int xsk_umem__create_v0_0_4(struct xsk_umem **umem,

				       void *umem_area, __u64 size,

				       struct xsk_ring_prod *fill,

				       struct xsk_ring_cons *comp,

				       const struct xsk_umem_config *config);

LIBBPF_API int xsk_socket__create(struct xsk_socket **xsk,

				  const char *ifname, __u32 queue_id,

				  struct xsk_umem *umem,

CRA Git | Maintained and supported by SUSTech CRA and CCSE