Commit 2a637c5b authored by Jesper Dangaard Brouer's avatar Jesper Dangaard Brouer Committed by Alexei Starovoitov
Browse files

xdp: For Intel AF_XDP drivers add XDP frame_sz 



Intel drivers implement native AF_XDP zerocopy in separate C-files,
that have its own invocation of bpf_prog_run_xdp(). The setup of
xdp_buff is also handled in separately from normal code path.

This patch update XDP frame_sz for AF_XDP zerocopy drivers i40e, ice
and ixgbe, as the code changes needed are very similar.  Introduce a
helper function xsk_umem_xdp_frame_sz() for calculating frame size.

Signed-off-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarBjörn Töpel <bjorn.topel@intel.com>
Cc: intel-wired-lan@lists.osuosl.org
Cc: Magnus Karlsson <magnus.karlsson@intel.com>
Link: https://lore.kernel.org/bpf/158945347511.97035.8536753731329475655.stgit@firesoul
parent d4ecdbf7

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

+2 −0
Original line number Diff line number Diff line
@@ -531,12 +531,14 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget) 
{

	unsigned int total_rx_bytes = 0, total_rx_packets = 0;

	u16 cleaned_count = I40E_DESC_UNUSED(rx_ring);

	struct xdp_umem *umem = rx_ring->xsk_umem;

	unsigned int xdp_res, xdp_xmit = 0;

	bool failure = false;

	struct sk_buff *skb;

	struct xdp_buff xdp;



	xdp.rxq = &rx_ring->xdp_rxq;

	xdp.frame_sz = xsk_umem_xdp_frame_sz(umem);



	while (likely(total_rx_packets < (unsigned int)budget)) {

		struct i40e_rx_buffer *bi;

drivers/net/ethernet/intel/ice/ice_xsk.c

+2 −0
Original line number Diff line number Diff line
@@ -840,11 +840,13 @@ int ice_clean_rx_irq_zc(struct ice_ring *rx_ring, int budget) 
{

	unsigned int total_rx_bytes = 0, total_rx_packets = 0;

	u16 cleaned_count = ICE_DESC_UNUSED(rx_ring);

	struct xdp_umem *umem = rx_ring->xsk_umem;

	unsigned int xdp_xmit = 0;

	bool failure = false;

	struct xdp_buff xdp;



	xdp.rxq = &rx_ring->xdp_rxq;

	xdp.frame_sz = xsk_umem_xdp_frame_sz(umem);



	while (likely(total_rx_packets < (unsigned int)budget)) {

		union ice_32b_rx_flex_desc *rx_desc;

drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c

+2 −0
Original line number Diff line number Diff line
@@ -431,12 +431,14 @@ int ixgbe_clean_rx_irq_zc(struct ixgbe_q_vector *q_vector, 
	unsigned int total_rx_bytes = 0, total_rx_packets = 0;

	struct ixgbe_adapter *adapter = q_vector->adapter;

	u16 cleaned_count = ixgbe_desc_unused(rx_ring);

	struct xdp_umem *umem = rx_ring->xsk_umem;

	unsigned int xdp_res, xdp_xmit = 0;

	bool failure = false;

	struct sk_buff *skb;

	struct xdp_buff xdp;



	xdp.rxq = &rx_ring->xdp_rxq;

	xdp.frame_sz = xsk_umem_xdp_frame_sz(umem);



	while (likely(total_rx_packets < budget)) {

		union ixgbe_adv_rx_desc *rx_desc;

include/net/xdp_sock.h

+11 −0
Original line number Diff line number Diff line
@@ -236,6 +236,12 @@ static inline u64 xsk_umem_adjust_offset(struct xdp_umem *umem, u64 address, 
	else

		return address + offset;

}



static inline u32 xsk_umem_xdp_frame_sz(struct xdp_umem *umem)

{

	return umem->chunk_size_nohr + umem->headroom;

}



#else

static inline int xsk_generic_rcv(struct xdp_sock *xs, struct xdp_buff *xdp)

{
@@ -366,6 +372,11 @@ static inline u64 xsk_umem_adjust_offset(struct xdp_umem *umem, u64 handle, 
	return 0;

}



static inline u32 xsk_umem_xdp_frame_sz(struct xdp_umem *umem)

{

	return 0;

}



static inline int __xsk_map_redirect(struct xdp_sock *xs, struct xdp_buff *xdp)

{

	return -EOPNOTSUPP;

CRA Git | Maintained and supported by SUSTech CRA and CCSE