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

ixgbe: 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: 33fdc82f ("ixgbe: add support for XDP_TX action")
Fixes: d0bcacd0 ("ixgbe: 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 avatarVishakha Jambekar <vishakha.jambekar@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 89d65df0

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

+8 −8
Original line number Diff line number Diff line
@@ -2213,23 +2213,23 @@ static struct sk_buff *ixgbe_run_xdp(struct ixgbe_adapter *adapter, 
		break;

	case XDP_TX:

		xdpf = xdp_convert_buff_to_frame(xdp);

		if (unlikely(!xdpf)) {

			result = IXGBE_XDP_CONSUMED;

			break;

		}

		if (unlikely(!xdpf))

			goto out_failure;

		result = ixgbe_xmit_xdp_ring(adapter, xdpf);

		if (result == IXGBE_XDP_CONSUMED)

			goto out_failure;

		break;

	case XDP_REDIRECT:

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

		if (!err)

		if (err)

			goto out_failure;

		result = IXGBE_XDP_REDIR;

		else

			result = IXGBE_XDP_CONSUMED;

		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/ixgbe/ixgbe_xsk.c

+8 −6
Original line number Diff line number Diff line
@@ -106,9 +106,10 @@ static int ixgbe_run_xdp_zc(struct ixgbe_adapter *adapter, 


	if (likely(act == XDP_REDIRECT)) {

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

		result = !err ? IXGBE_XDP_REDIR : IXGBE_XDP_CONSUMED;

		if (err)

			goto out_failure;

		rcu_read_unlock();

		return result;

		return IXGBE_XDP_REDIR;

	}



	switch (act) {
@@ -116,16 +117,17 @@ static int ixgbe_run_xdp_zc(struct ixgbe_adapter *adapter, 
		break;

	case XDP_TX:

		xdpf = xdp_convert_buff_to_frame(xdp);

		if (unlikely(!xdpf)) {

			result = IXGBE_XDP_CONSUMED;

			break;

		}

		if (unlikely(!xdpf))

			goto out_failure;

		result = ixgbe_xmit_xdp_ring(adapter, xdpf);

		if (result == IXGBE_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: