Commit 0d405970 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 



Tony Nguyen says:

====================
40GbE Intel Wired LAN Driver Updates 2021-03-16

This series contains updates to i40e, ixgbe, and ice drivers.

Magnus Karlsson says:

Optimize run_xdp_zc() for the XDP program verdict being XDP_REDIRECT
in the xsk zero-copy path. This path is only used when having AF_XDP
zero-copy on and in that case most packets will be directed to user
space. This provides around 100k extra packets in throughput on my
server when running l2fwd in xdpsock.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 46bb5a9c bb520736

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

+7 −4
Original line number Diff line number Diff line
@@ -160,6 +160,13 @@ static int i40e_run_xdp_zc(struct i40e_ring *rx_ring, struct xdp_buff *xdp) 
	xdp_prog = READ_ONCE(rx_ring->xdp_prog);

	act = bpf_prog_run_xdp(xdp_prog, xdp);



	if (likely(act == XDP_REDIRECT)) {

		err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog);

		result = !err ? I40E_XDP_REDIR : I40E_XDP_CONSUMED;

		rcu_read_unlock();

		return result;

	}



	switch (act) {

	case XDP_PASS:

		break;
@@ -167,10 +174,6 @@ static int i40e_run_xdp_zc(struct i40e_ring *rx_ring, struct xdp_buff *xdp) 
		xdp_ring = rx_ring->vsi->xdp_rings[rx_ring->queue_index];

		result = i40e_xmit_xdp_tx_ring(xdp, xdp_ring);

		break;

	case XDP_REDIRECT:

		err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog);

		result = !err ? I40E_XDP_REDIR : I40E_XDP_CONSUMED;

		break;

	default:

		bpf_warn_invalid_xdp_action(act);

		fallthrough;

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

+8 −4
Original line number Diff line number Diff line
@@ -473,6 +473,14 @@ ice_run_xdp_zc(struct ice_ring *rx_ring, struct xdp_buff *xdp) 
	xdp_prog = READ_ONCE(rx_ring->xdp_prog);



	act = bpf_prog_run_xdp(xdp_prog, xdp);



	if (likely(act == XDP_REDIRECT)) {

		err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog);

		result = !err ? ICE_XDP_REDIR : ICE_XDP_CONSUMED;

		rcu_read_unlock();

		return result;

	}



	switch (act) {

	case XDP_PASS:

		break;
@@ -480,10 +488,6 @@ ice_run_xdp_zc(struct ice_ring *rx_ring, struct xdp_buff *xdp) 
		xdp_ring = rx_ring->vsi->xdp_rings[rx_ring->q_index];

		result = ice_xmit_xdp_buff(xdp, xdp_ring);

		break;

	case XDP_REDIRECT:

		err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog);

		result = !err ? ICE_XDP_REDIR : ICE_XDP_CONSUMED;

		break;

	default:

		bpf_warn_invalid_xdp_action(act);

		fallthrough;

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

+7 −4
Original line number Diff line number Diff line
@@ -104,6 +104,13 @@ static int ixgbe_run_xdp_zc(struct ixgbe_adapter *adapter, 
	xdp_prog = READ_ONCE(rx_ring->xdp_prog);

	act = bpf_prog_run_xdp(xdp_prog, xdp);



	if (likely(act == XDP_REDIRECT)) {

		err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog);

		result = !err ? IXGBE_XDP_REDIR : IXGBE_XDP_CONSUMED;

		rcu_read_unlock();

		return result;

	}



	switch (act) {

	case XDP_PASS:

		break;
@@ -115,10 +122,6 @@ static int ixgbe_run_xdp_zc(struct ixgbe_adapter *adapter, 
		}

		result = ixgbe_xmit_xdp_ring(adapter, xdpf);

		break;

	case XDP_REDIRECT:

		err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog);

		result = !err ? IXGBE_XDP_REDIR : IXGBE_XDP_CONSUMED;

		break;

	default:

		bpf_warn_invalid_xdp_action(act);

		fallthrough;