Commit 56d95b0a authored by Alexander Lobakin's avatar Alexander Lobakin Committed by Jakub Kicinski
Browse files

xdp: get rid of xdp_frame::mem.id 



Initially, xdp_frame::mem.id was used to search for the corresponding
&page_pool to return the page correctly.
However, after that struct page was extended to have a direct pointer
to its PP (netmem has it as well), further keeping of this field makes
no sense. xdp_return_frame_bulk() still used it to do a lookup, and
this leftover is now removed.
Remove xdp_frame::mem and replace it with ::mem_type, as only memory
type still matters and we need to know it to be able to free the frame
correctly.
As a cute side effect, we can now make every scalar field in &xdp_frame
of 4 byte width, speeding up accesses to them.

Reviewed-by: default avatarToke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: default avatarAlexander Lobakin <aleksander.lobakin@intel.com>
Link: https://patch.msgid.link/20241211172649.761483-3-aleksander.lobakin@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent fcc680a6

drivers/net/ethernet/freescale/dpaa/dpaa_eth.c

+1 −1
Original line number Diff line number Diff line
@@ -2281,7 +2281,7 @@ static int dpaa_a050385_wa_xdpf(struct dpaa_priv *priv, 
	new_xdpf->len = xdpf->len;

	new_xdpf->headroom = priv->tx_headroom;

	new_xdpf->frame_sz = DPAA_BP_RAW_SIZE;

	new_xdpf->mem.type = MEM_TYPE_PAGE_ORDER0;

	new_xdpf->mem_type = MEM_TYPE_PAGE_ORDER0;



	/* Release the initial buffer */

	xdp_return_frame_rx_napi(xdpf);

drivers/net/veth.c

+2 −2
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ static struct xdp_frame *veth_xdp_rcv_one(struct veth_rq *rq, 
			break;

		case XDP_TX:

			orig_frame = *frame;

			xdp->rxq->mem = frame->mem;

			xdp->rxq->mem.type = frame->mem_type;

			if (unlikely(veth_xdp_tx(rq, xdp, bq) < 0)) {

				trace_xdp_exception(rq->dev, xdp_prog, act);

				frame = &orig_frame;
@@ -646,7 +646,7 @@ static struct xdp_frame *veth_xdp_rcv_one(struct veth_rq *rq, 
			goto xdp_xmit;

		case XDP_REDIRECT:

			orig_frame = *frame;

			xdp->rxq->mem = frame->mem;

			xdp->rxq->mem.type = frame->mem_type;

			if (xdp_do_redirect(rq->dev, xdp, xdp_prog)) {

				frame = &orig_frame;

				stats->rx_drops++;

include/net/xdp.h

+7 −7
Original line number Diff line number Diff line
@@ -169,13 +169,13 @@ xdp_get_buff_len(const struct xdp_buff *xdp) 


struct xdp_frame {

	void *data;

	u16 len;

	u16 headroom;

	u32 len;

	u32 headroom;

	u32 metasize; /* uses lower 8-bits */

	/* Lifetime of xdp_rxq_info is limited to NAPI/enqueue time,

	 * while mem info is valid on remote CPU.

	 * while mem_type is valid on remote CPU.

	 */

	struct xdp_mem_info mem;

	enum xdp_mem_type mem_type:32;

	struct net_device *dev_rx; /* used by cpumap */

	u32 frame_sz;

	u32 flags; /* supported values defined in xdp_buff_flags */
@@ -306,13 +306,13 @@ struct xdp_frame *xdp_convert_buff_to_frame(struct xdp_buff *xdp) 
	if (unlikely(xdp_update_frame_from_buff(xdp, xdp_frame) < 0))

		return NULL;



	/* rxq only valid until napi_schedule ends, convert to xdp_mem_info */

	xdp_frame->mem = xdp->rxq->mem;

	/* rxq only valid until napi_schedule ends, convert to xdp_mem_type */

	xdp_frame->mem_type = xdp->rxq->mem.type;



	return xdp_frame;

}



void __xdp_return(void *data, struct xdp_mem_info *mem, bool napi_direct,

void __xdp_return(void *data, enum xdp_mem_type mem_type, bool napi_direct,

		  struct xdp_buff *xdp);

void xdp_return_frame(struct xdp_frame *xdpf);

void xdp_return_frame_rx_napi(struct xdp_frame *xdpf);

kernel/bpf/cpumap.c

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ static int cpu_map_bpf_prog_run_xdp(struct bpf_cpu_map_entry *rcpu, 
		int err;



		rxq.dev = xdpf->dev_rx;

		rxq.mem = xdpf->mem;

		rxq.mem.type = xdpf->mem_type;

		/* TODO: report queue_index to xdp_rxq_info */



		xdp_convert_frame_to_buff(xdpf, &xdp);

net/bpf/test_run.c

+2 −2
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static void xdp_test_run_init_page(netmem_ref netmem, void *arg) 
	new_ctx->data = new_ctx->data_meta + meta_len;



	xdp_update_frame_from_buff(new_ctx, frm);

	frm->mem = new_ctx->rxq->mem;

	frm->mem_type = new_ctx->rxq->mem.type;



	memcpy(&head->orig_ctx, new_ctx, sizeof(head->orig_ctx));

}
@@ -246,7 +246,7 @@ static void reset_ctx(struct xdp_page_head *head) 
	head->ctx.data_meta = head->orig_ctx.data_meta;

	head->ctx.data_end = head->orig_ctx.data_end;

	xdp_update_frame_from_buff(&head->ctx, head->frame);

	head->frame->mem = head->orig_ctx.rxq->mem;

	head->frame->mem_type = head->orig_ctx.rxq->mem.type;

}



static int xdp_recv_frames(struct xdp_frame **frames, int nframes,