Commit f6c10b48 authored by Magnus Karlsson's avatar Magnus Karlsson Committed by Tony Nguyen
Browse files

i40e: add correct exception tracing for XDP 



Add missing exception tracing to XDP when a number of different errors
can occur. The support was only partial. Several errors where not
logged which would confuse the user quite a lot not knowing where and
why the packets disappeared.

Fixes: 74608d17 ("i40e: add support for XDP_TX action")
Fixes: 0a714186 ("i40e: add AF_XDP zero-copy Rx support")
Reported-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: default avatarMagnus Karlsson <magnus.karlsson@intel.com>
Tested-by: default avatarKiran Bhandare <kiranx.bhandare@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 53792608

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

+6 −1
Original line number Diff line number Diff line
@@ -2313,15 +2313,20 @@ static int i40e_run_xdp(struct i40e_ring *rx_ring, struct xdp_buff *xdp) 
	case XDP_TX:

		xdp_ring = rx_ring->vsi->xdp_rings[rx_ring->queue_index];

		result = i40e_xmit_xdp_tx_ring(xdp, xdp_ring);

		if (result == I40E_XDP_CONSUMED)

			goto out_failure;

		break;

	case XDP_REDIRECT:

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

		result = !err ? I40E_XDP_REDIR : I40E_XDP_CONSUMED;

		if (err)

			goto out_failure;

		result = I40E_XDP_REDIR;

		break;

	default:

		bpf_warn_invalid_xdp_action(act);

		fallthrough;

	case XDP_ABORTED:

out_failure:

		trace_xdp_exception(rx_ring->netdev, xdp_prog, act);

		fallthrough; /* handle aborts by dropping packet */

	case XDP_DROP:

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

+6 −2
Original line number Diff line number Diff line
@@ -162,9 +162,10 @@ static int i40e_run_xdp_zc(struct i40e_ring *rx_ring, struct xdp_buff *xdp) 


	if (likely(act == XDP_REDIRECT)) {

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

		result = !err ? I40E_XDP_REDIR : I40E_XDP_CONSUMED;

		if (err)

			goto out_failure;

		rcu_read_unlock();

		return result;

		return I40E_XDP_REDIR;

	}



	switch (act) {
@@ -173,11 +174,14 @@ static int i40e_run_xdp_zc(struct i40e_ring *rx_ring, struct xdp_buff *xdp) 
	case XDP_TX:

		xdp_ring = rx_ring->vsi->xdp_rings[rx_ring->queue_index];

		result = i40e_xmit_xdp_tx_ring(xdp, xdp_ring);

		if (result == I40E_XDP_CONSUMED)

			goto out_failure;

		break;

	default:

		bpf_warn_invalid_xdp_action(act);

		fallthrough;

	case XDP_ABORTED:

out_failure:

		trace_xdp_exception(rx_ring->netdev, xdp_prog, act);

		fallthrough; /* handle aborts by dropping packet */

	case XDP_DROP: