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

ice: 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: efc2214b ("ice: Add support for XDP")
Fixes: 2d4238f5 ("ice: Add support for AF_XDP")
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 f6c10b48

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

+9 −3
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ ice_run_xdp(struct ice_ring *rx_ring, struct xdp_buff *xdp, 
	    struct bpf_prog *xdp_prog)

{

	struct ice_ring *xdp_ring;

	int err;

	int err, result;

	u32 act;



	act = bpf_prog_run_xdp(xdp_prog, xdp);
@@ -532,14 +532,20 @@ ice_run_xdp(struct ice_ring *rx_ring, struct xdp_buff *xdp, 
		return ICE_XDP_PASS;

	case XDP_TX:

		xdp_ring = rx_ring->vsi->xdp_rings[smp_processor_id()];

		return ice_xmit_xdp_buff(xdp, xdp_ring);

		result = ice_xmit_xdp_buff(xdp, xdp_ring);

		if (result == ICE_XDP_CONSUMED)

			goto out_failure;

		return result;

	case XDP_REDIRECT:

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

		return !err ? ICE_XDP_REDIR : ICE_XDP_CONSUMED;

		if (err)

			goto out_failure;

		return ICE_XDP_REDIR;

	default:

		bpf_warn_invalid_xdp_action(act);

		fallthrough;

	case XDP_ABORTED:

out_failure:

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

		fallthrough;

	case XDP_DROP:

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

+6 −2
Original line number Diff line number Diff line
@@ -473,9 +473,10 @@ ice_run_xdp_zc(struct ice_ring *rx_ring, struct xdp_buff *xdp) 


	if (likely(act == XDP_REDIRECT)) {

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

		result = !err ? ICE_XDP_REDIR : ICE_XDP_CONSUMED;

		if (err)

			goto out_failure;

		rcu_read_unlock();

		return result;

		return ICE_XDP_REDIR;

	}



	switch (act) {
@@ -484,11 +485,14 @@ ice_run_xdp_zc(struct ice_ring *rx_ring, struct xdp_buff *xdp) 
	case XDP_TX:

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

		result = ice_xmit_xdp_buff(xdp, xdp_ring);

		if (result == ICE_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;

	case XDP_DROP: