Commit 0807892e authored by Björn Töpel's avatar Björn Töpel Committed by Alexei Starovoitov
Browse files

xsk: Remove MEM_TYPE_ZERO_COPY and corresponding code 



There are no users of MEM_TYPE_ZERO_COPY. Remove all corresponding
code, including the "handle" member of struct xdp_buff.

rfc->v1: Fixed spelling in commit message. (Björn)

Signed-off-by: default avatarBjörn Töpel <bjorn.topel@intel.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20200520192103.355233-13-bjorn.topel@gmail.com
parent 39d6443c

drivers/net/hyperv/netvsc_bpf.c

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ u32 netvsc_run_xdp(struct net_device *ndev, struct netvsc_channel *nvchan, 
	xdp->data_end = xdp->data + len;

	xdp->rxq = &nvchan->xdp_rxq;

	xdp->frame_sz = PAGE_SIZE;

	xdp->handle = 0;



	memcpy(xdp->data, data, len);

include/net/xdp.h

+1 −8
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ enum xdp_mem_type { 
	MEM_TYPE_PAGE_SHARED = 0, /* Split-page refcnt based model */

	MEM_TYPE_PAGE_ORDER0,     /* Orig XDP full page model */

	MEM_TYPE_PAGE_POOL,

	MEM_TYPE_ZERO_COPY,

	MEM_TYPE_XSK_BUFF_POOL,

	MEM_TYPE_MAX,

};
@@ -55,10 +54,6 @@ struct xdp_mem_info { 


struct page_pool;



struct zero_copy_allocator {

	void (*free)(struct zero_copy_allocator *zca, unsigned long handle);

};



struct xdp_rxq_info {

	struct net_device *dev;

	u32 queue_index;
@@ -71,7 +66,6 @@ struct xdp_buff { 
	void *data_end;

	void *data_meta;

	void *data_hard_start;

	unsigned long handle;

	struct xdp_rxq_info *rxq;

	u32 frame_sz; /* frame size to deduce data_hard_end/reserved tailroom*/

};
@@ -120,8 +114,7 @@ struct xdp_frame *convert_to_xdp_frame(struct xdp_buff *xdp) 
	int metasize;

	int headroom;



	if (xdp->rxq->mem.type == MEM_TYPE_ZERO_COPY ||

	    xdp->rxq->mem.type == MEM_TYPE_XSK_BUFF_POOL)

	if (xdp->rxq->mem.type == MEM_TYPE_XSK_BUFF_POOL)

		return xdp_convert_zc_to_xdp_frame(xdp);



	/* Assure headroom is available for storing info */

include/net/xdp_sock.h

+0 −45
Original line number Diff line number Diff line
@@ -17,26 +17,12 @@ struct net_device; 
struct xsk_queue;

struct xdp_buff;



struct xdp_umem_page {

	void *addr;

	dma_addr_t dma;

};



struct xdp_umem_fq_reuse {

	u32 nentries;

	u32 length;

	u64 handles[];

};



struct xdp_umem {

	struct xsk_queue *fq;

	struct xsk_queue *cq;

	struct xsk_buff_pool *pool;

	struct xdp_umem_page *pages;

	u64 chunk_mask;

	u64 size;

	u32 headroom;

	u32 chunk_size_nohr;

	u32 chunk_size;

	struct user_struct *user;

	refcount_t users;
@@ -48,7 +34,6 @@ struct xdp_umem { 
	u8 flags;

	int id;

	struct net_device *dev;

	struct xdp_umem_fq_reuse *fq_reuse;

	bool zc;

	spinlock_t xsk_tx_list_lock;

	struct list_head xsk_tx_list;
@@ -109,21 +94,6 @@ static inline struct xdp_sock *__xsk_map_lookup_elem(struct bpf_map *map, 
	return xs;

}



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);

}



#else



static inline int xsk_generic_rcv(struct xdp_sock *xs, struct xdp_buff *xdp)
@@ -146,21 +116,6 @@ static inline struct xdp_sock *__xsk_map_lookup_elem(struct bpf_map *map, 
	return NULL;

}



static inline u64 xsk_umem_extract_addr(u64 addr)

{

	return 0;

}



static inline u64 xsk_umem_extract_offset(u64 addr)

{

	return 0;

}



static inline u64 xsk_umem_add_offset_to_addr(u64 addr)

{

	return 0;

}



#endif /* CONFIG_XDP_SOCKETS */



#endif /* _LINUX_XDP_SOCK_H */

include/net/xdp_sock_drv.h

+0 −149
Original line number Diff line number Diff line
@@ -11,16 +11,9 @@ 


#ifdef CONFIG_XDP_SOCKETS



bool xsk_umem_has_addrs(struct xdp_umem *umem, u32 cnt);

bool xsk_umem_peek_addr(struct xdp_umem *umem, u64 *addr);

void xsk_umem_release_addr(struct xdp_umem *umem);

void xsk_umem_complete_tx(struct xdp_umem *umem, u32 nb_entries);

bool xsk_umem_consume_tx(struct xdp_umem *umem, struct xdp_desc *desc);

void xsk_umem_consume_tx_done(struct xdp_umem *umem);

struct xdp_umem_fq_reuse *xsk_reuseq_prepare(u32 nentries);

struct xdp_umem_fq_reuse *xsk_reuseq_swap(struct xdp_umem *umem,

					  struct xdp_umem_fq_reuse *newq);

void xsk_reuseq_free(struct xdp_umem_fq_reuse *rq);

struct xdp_umem *xdp_get_umem_from_qid(struct net_device *dev, u16 queue_id);

void xsk_set_rx_need_wakeup(struct xdp_umem *umem);

void xsk_set_tx_need_wakeup(struct xdp_umem *umem);
@@ -28,80 +21,6 @@ void xsk_clear_rx_need_wakeup(struct xdp_umem *umem); 
void xsk_clear_tx_need_wakeup(struct xdp_umem *umem);

bool xsk_umem_uses_need_wakeup(struct xdp_umem *umem);



static inline char *xdp_umem_get_data(struct xdp_umem *umem, u64 addr)

{

	unsigned long page_addr;



	addr = xsk_umem_add_offset_to_addr(addr);

	page_addr = (unsigned long)umem->pages[addr >> PAGE_SHIFT].addr;



	return (char *)(page_addr & PAGE_MASK) + (addr & ~PAGE_MASK);

}



static inline dma_addr_t xdp_umem_get_dma(struct xdp_umem *umem, u64 addr)

{

	addr = xsk_umem_add_offset_to_addr(addr);



	return umem->pages[addr >> PAGE_SHIFT].dma + (addr & ~PAGE_MASK);

}



/* Reuse-queue aware version of FILL queue helpers */

static inline bool xsk_umem_has_addrs_rq(struct xdp_umem *umem, u32 cnt)

{

	struct xdp_umem_fq_reuse *rq = umem->fq_reuse;



	if (rq->length >= cnt)

		return true;



	return xsk_umem_has_addrs(umem, cnt - rq->length);

}



static inline bool xsk_umem_peek_addr_rq(struct xdp_umem *umem, u64 *addr)

{

	struct xdp_umem_fq_reuse *rq = umem->fq_reuse;



	if (!rq->length)

		return xsk_umem_peek_addr(umem, addr);



	*addr = rq->handles[rq->length - 1];

	return addr;

}



static inline void xsk_umem_release_addr_rq(struct xdp_umem *umem)

{

	struct xdp_umem_fq_reuse *rq = umem->fq_reuse;



	if (!rq->length)

		xsk_umem_release_addr(umem);

	else

		rq->length--;

}



static inline void xsk_umem_fq_reuse(struct xdp_umem *umem, u64 addr)

{

	struct xdp_umem_fq_reuse *rq = umem->fq_reuse;



	rq->handles[rq->length++] = addr;

}



/* Handle the offset appropriately depending on aligned or unaligned mode.

 * For unaligned mode, we store the offset in the upper 16-bits of the address.

 * For aligned mode, we simply add the offset to the address.

 */

static inline u64 xsk_umem_adjust_offset(struct xdp_umem *umem, u64 address,

					 u64 offset)

{

	if (umem->flags & XDP_UMEM_UNALIGNED_CHUNK_FLAG)

		return address + (offset << XSK_UNALIGNED_BUF_OFFSET_SHIFT);

	else

		return address + offset;

}



static inline u32 xsk_umem_xdp_frame_sz(struct xdp_umem *umem)

{

	return umem->chunk_size_nohr;

}



static inline u32 xsk_umem_get_headroom(struct xdp_umem *umem)

{

	return XDP_PACKET_HEADROOM + umem->headroom;
@@ -192,20 +111,6 @@ static inline void xsk_buff_raw_dma_sync_for_device(struct xdp_umem *umem, 


#else



static inline bool xsk_umem_has_addrs(struct xdp_umem *umem, u32 cnt)

{

	return false;

}



static inline u64 *xsk_umem_peek_addr(struct xdp_umem *umem, u64 *addr)

{

	return NULL;

}



static inline void xsk_umem_release_addr(struct xdp_umem *umem)

{

}



static inline void xsk_umem_complete_tx(struct xdp_umem *umem, u32 nb_entries)

{

}
@@ -220,55 +125,12 @@ static inline void xsk_umem_consume_tx_done(struct xdp_umem *umem) 
{

}



static inline struct xdp_umem_fq_reuse *xsk_reuseq_prepare(u32 nentries)

{

	return NULL;

}



static inline struct xdp_umem_fq_reuse *xsk_reuseq_swap(

	struct xdp_umem *umem, struct xdp_umem_fq_reuse *newq)

{

	return NULL;

}



static inline void xsk_reuseq_free(struct xdp_umem_fq_reuse *rq)

{

}



static inline struct xdp_umem *xdp_get_umem_from_qid(struct net_device *dev,

						     u16 queue_id)

{

	return NULL;

}



static inline char *xdp_umem_get_data(struct xdp_umem *umem, u64 addr)

{

	return NULL;

}



static inline dma_addr_t xdp_umem_get_dma(struct xdp_umem *umem, u64 addr)

{

	return 0;

}



static inline bool xsk_umem_has_addrs_rq(struct xdp_umem *umem, u32 cnt)

{

	return false;

}



static inline u64 *xsk_umem_peek_addr_rq(struct xdp_umem *umem, u64 *addr)

{

	return NULL;

}



static inline void xsk_umem_release_addr_rq(struct xdp_umem *umem)

{

}



static inline void xsk_umem_fq_reuse(struct xdp_umem *umem, u64 addr)

{

}



static inline void xsk_set_rx_need_wakeup(struct xdp_umem *umem)

{

}
@@ -290,17 +152,6 @@ static inline bool xsk_umem_uses_need_wakeup(struct xdp_umem *umem) 
	return false;

}



static inline u64 xsk_umem_adjust_offset(struct xdp_umem *umem, u64 handle,

					 u64 offset)

{

	return 0;

}



static inline u32 xsk_umem_xdp_frame_sz(struct xdp_umem *umem)

{

	return 0;

}



static inline u32 xsk_umem_get_headroom(struct xdp_umem *umem)

{

	return 0;

include/trace/events/xdp.h

+0 −1
Original line number Diff line number Diff line
@@ -287,7 +287,6 @@ TRACE_EVENT(xdp_devmap_xmit, 
	FN(PAGE_SHARED)		\

	FN(PAGE_ORDER0)		\

	FN(PAGE_POOL)		\

	FN(ZERO_COPY)		\

	FN(XSK_BUFF_POOL)



#define __MEM_TYPE_TP_FN(x)	\

CRA Git | Maintained and supported by SUSTech CRA and CCSE