Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93ee30f3 authored by Magnus Karlsson's avatar Magnus Karlsson Committed by Daniel Borkmann
Browse files

xsk: i40e: get rid of useless struct xdp_umem_props 



This commit gets rid of the structure xdp_umem_props. It was there to
be able to break a dependency at one point, but this is no longer
needed. The values in the struct are instead stored directly in the
xdp_umem structure. This simplifies the xsk code as well as af_xdp
zero-copy drivers and as a bonus gets rid of one internal header file.

The i40e driver is also adapted to the new interface in this commit.

Signed-off-by: default avatarMagnus Karlsson <magnus.karlsson@intel.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent cf484f9f

drivers/net/ethernet/intel/i40e/i40e_xsk.c

+2 −2
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ static void i40e_reuse_rx_buffer_zc(struct i40e_ring *rx_ring, 
				    struct i40e_rx_buffer *old_bi)

{

	struct i40e_rx_buffer *new_bi = &rx_ring->rx_bi[rx_ring->next_to_alloc];

	unsigned long mask = (unsigned long)rx_ring->xsk_umem->props.chunk_mask;

	unsigned long mask = (unsigned long)rx_ring->xsk_umem->chunk_mask;

	u64 hr = rx_ring->xsk_umem->headroom + XDP_PACKET_HEADROOM;

	u16 nta = rx_ring->next_to_alloc;
@@ -477,7 +477,7 @@ void i40e_zca_free(struct zero_copy_allocator *alloc, unsigned long handle) 


	rx_ring = container_of(alloc, struct i40e_ring, zca);

	hr = rx_ring->xsk_umem->headroom + XDP_PACKET_HEADROOM;

	mask = rx_ring->xsk_umem->props.chunk_mask;

	mask = rx_ring->xsk_umem->chunk_mask;



	nta = rx_ring->next_to_alloc;

	bi = &rx_ring->rx_bi[nta];

include/net/xdp_sock.h

+2 −6
Original line number Diff line number Diff line
@@ -16,11 +16,6 @@ 
struct net_device;

struct xsk_queue;



struct xdp_umem_props {

	u64 chunk_mask;

	u64 size;

};



struct xdp_umem_page {

	void *addr;

	dma_addr_t dma;
@@ -30,7 +25,8 @@ struct xdp_umem { 
	struct xsk_queue *fq;

	struct xsk_queue *cq;

	struct xdp_umem_page *pages;

	struct xdp_umem_props props;

	u64 chunk_mask;

	u64 size;

	u32 headroom;

	u32 chunk_size_nohr;

	struct user_struct *user;

net/xdp/xdp_umem.c

+2 −2
Original line number Diff line number Diff line
@@ -312,8 +312,8 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr) 


	umem->pid = get_task_pid(current, PIDTYPE_PID);

	umem->address = (unsigned long)addr;

	umem->props.chunk_mask = ~((u64)chunk_size - 1);

	umem->props.size = size;

	umem->chunk_mask = ~((u64)chunk_size - 1);

	umem->size = size;

	umem->headroom = headroom;

	umem->chunk_size_nohr = chunk_size - headroom;

	umem->npgs = size / PAGE_SIZE;

net/xdp/xdp_umem_props.h

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

/* XDP user-space packet buffer

 * Copyright(c) 2018 Intel Corporation.

 */



#ifndef XDP_UMEM_PROPS_H_

#define XDP_UMEM_PROPS_H_



struct xdp_umem_props {

	u64 chunk_mask;

	u64 size;

};



#endif /* XDP_UMEM_PROPS_H_ */

net/xdp/xsk.c

+6 −4
Original line number Diff line number Diff line
@@ -470,8 +470,10 @@ static int xsk_bind(struct socket *sock, struct sockaddr *addr, int addr_len) 
		goto out_unlock;

	} else {

		/* This xsk has its own umem. */

		xskq_set_umem(xs->umem->fq, &xs->umem->props);

		xskq_set_umem(xs->umem->cq, &xs->umem->props);

		xskq_set_umem(xs->umem->fq, xs->umem->size,

			      xs->umem->chunk_mask);

		xskq_set_umem(xs->umem->cq, xs->umem->size,

			      xs->umem->chunk_mask);



		err = xdp_umem_assign_dev(xs->umem, dev, qid, flags);

		if (err)
@@ -481,8 +483,8 @@ static int xsk_bind(struct socket *sock, struct sockaddr *addr, int addr_len) 
	xs->dev = dev;

	xs->zc = xs->umem->zc;

	xs->queue_id = qid;

	xskq_set_umem(xs->rx, &xs->umem->props);

	xskq_set_umem(xs->tx, &xs->umem->props);

	xskq_set_umem(xs->rx, xs->umem->size, xs->umem->chunk_mask);

	xskq_set_umem(xs->tx, xs->umem->size, xs->umem->chunk_mask);

	xdp_add_sk_umem(xs->umem, xs);



out_unlock: