xsk: Move defines only used by AF_XDP internals to xsk.h (89e4a376) · Commits · 戴 / test

include/net/xdp_sock.h

+0 −14

Original line number	Diff line number	Diff line
		@@ -17,13 +17,6 @@ struct net_device;
		struct xsk_queue;
		struct xdp_buff;

		/* Masks for xdp_umem_page flags.
		* The low 12-bits of the addr will be 0 since this is the page address, so we
		* can use them for flags.
		*/
		#define XSK_NEXT_PG_CONTIG_SHIFT 0
		#define XSK_NEXT_PG_CONTIG_MASK (1ULL << XSK_NEXT_PG_CONTIG_SHIFT)

		struct xdp_umem_page {
		void *addr;
		dma_addr_t dma;
		@@ -35,13 +28,6 @@ struct xdp_umem_fq_reuse {
		u64 handles[];
		};

		/* Flags for the umem flags field.
		*
		* The NEED_WAKEUP flag is 1 due to the reuse of the flags field for public
		* flags. See inlude/uapi/include/linux/if_xdp.h.
		*/
		#define XDP_UMEM_USES_NEED_WAKEUP (1 << 1)

		struct xdp_umem {
		struct xsk_queue *fq;
		struct xsk_queue *cq;

+14 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,20 @@
		#ifndef XSK_H_
		#define XSK_H_

		/* Masks for xdp_umem_page flags.
		* The low 12-bits of the addr will be 0 since this is the page address, so we
		* can use them for flags.
		*/
		#define XSK_NEXT_PG_CONTIG_SHIFT 0
		#define XSK_NEXT_PG_CONTIG_MASK BIT_ULL(XSK_NEXT_PG_CONTIG_SHIFT)

		/* Flags for the umem flags field.
		*
		* The NEED_WAKEUP flag is 1 due to the reuse of the flags field for public
		* flags. See inlude/uapi/include/linux/if_xdp.h.
		*/
		#define XDP_UMEM_USES_NEED_WAKEUP BIT(1)

		struct xdp_ring_offset_v1 {
		__u64 producer;
		__u64 consumer;

+2 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,8 @@
		#include <linux/if_xdp.h>
		#include <net/xdp_sock.h>

		#include "xsk.h"

		struct xdp_ring {
		u32 producer ____cacheline_aligned_in_smp;
		u32 consumer ____cacheline_aligned_in_smp;