Commit fc379872 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Alexei Starovoitov
Browse files

xdp: Introduce xdp_convert_frame_to_buff utility routine 



Introduce xdp_convert_frame_to_buff utility routine to initialize xdp_buff
fields from xdp_frames ones. Rely on xdp_convert_frame_to_buff in veth xdp
code.

Suggested-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Link: https://lore.kernel.org/bpf/87acf133073c4b2d4cbb8097e8c2480c0a0fac32.1590698295.git.lorenzo@kernel.org
parent c48a24f0

drivers/net/veth.c

+1 −5
Original line number Diff line number Diff line
@@ -575,11 +575,7 @@ static struct sk_buff *veth_xdp_rcv_one(struct veth_rq *rq, 
		struct xdp_buff xdp;

		u32 act;



		xdp.data_hard_start = hard_start;

		xdp.data = frame->data;

		xdp.data_end = frame->data + frame->len;

		xdp.data_meta = frame->data - frame->metasize;

		xdp.frame_sz = frame->frame_sz;

		xdp_convert_frame_to_buff(frame, &xdp);

		xdp.rxq = &rq->xdp_rxq;



		act = bpf_prog_run_xdp(xdp_prog, &xdp);

include/net/xdp.h

+10 −0
Original line number Diff line number Diff line
@@ -111,6 +111,16 @@ void xdp_warn(const char *msg, const char *func, const int line); 


struct xdp_frame *xdp_convert_zc_to_xdp_frame(struct xdp_buff *xdp);



static inline

void xdp_convert_frame_to_buff(struct xdp_frame *frame, struct xdp_buff *xdp)

{

	xdp->data_hard_start = frame->data - frame->headroom - sizeof(*frame);

	xdp->data = frame->data;

	xdp->data_end = frame->data + frame->len;

	xdp->data_meta = frame->data - frame->metasize;

	xdp->frame_sz = frame->frame_sz;

}



/* Convert xdp_buff to xdp_frame */

static inline

struct xdp_frame *convert_to_xdp_frame(struct xdp_buff *xdp)

CRA Git | Maintained and supported by SUSTech CRA and CCSE