Commit c8064e5b authored by Paolo Abeni's avatar Paolo Abeni Committed by Daniel Borkmann
Browse files

bpf: Let bpf_warn_invalid_xdp_action() report more info 



In non trivial scenarios, the action id alone is not sufficient to
identify the program causing the warning. Before the previous patch,
the generated stack-trace pointed out at least the involved device
driver.

Let's additionally include the program name and id, and the relevant
device name.

If the user needs additional infos, he can fetch them via a kernel
probe, leveraging the arguments added here.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarToke Høiland-Jørgensen <toke@redhat.com>
Link: https://lore.kernel.org/bpf/ddb96bb975cbfddb1546cf5da60e77d5100b533c.1638189075.git.pabeni@redhat.com
parent 2cbad989

drivers/net/ethernet/amazon/ena/ena_netdev.c

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ static int ena_xdp_execute(struct ena_ring *rx_ring, struct xdp_buff *xdp) 
		xdp_stat = &rx_ring->rx_stats.xdp_pass;

		break;

	default:

		bpf_warn_invalid_xdp_action(verdict);

		bpf_warn_invalid_xdp_action(rx_ring->netdev, xdp_prog, verdict);

		xdp_stat = &rx_ring->rx_stats.xdp_invalid;

	}

drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ bool bnxt_rx_xdp(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, u16 cons, 
		*event |= BNXT_REDIRECT_EVENT;

		break;

	default:

		bpf_warn_invalid_xdp_action(act);

		bpf_warn_invalid_xdp_action(bp->dev, xdp_prog, act);

		fallthrough;

	case XDP_ABORTED:

		trace_xdp_exception(bp->dev, xdp_prog, act);

drivers/net/ethernet/cavium/thunder/nicvf_main.c

+1 −1
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ static inline bool nicvf_xdp_rx(struct nicvf *nic, struct bpf_prog *prog, 
		nicvf_xdp_sq_append_pkt(nic, sq, (u64)xdp.data, dma_addr, len);

		return true;

	default:

		bpf_warn_invalid_xdp_action(action);

		bpf_warn_invalid_xdp_action(nic->netdev, prog, action);

		fallthrough;

	case XDP_ABORTED:

		trace_xdp_exception(nic->netdev, prog, action);

drivers/net/ethernet/freescale/dpaa/dpaa_eth.c

+1 −1
Original line number Diff line number Diff line
@@ -2623,7 +2623,7 @@ static u32 dpaa_run_xdp(struct dpaa_priv *priv, struct qm_fd *fd, void *vaddr, 
		}

		break;

	default:

		bpf_warn_invalid_xdp_action(xdp_act);

		bpf_warn_invalid_xdp_action(priv->net_dev, xdp_prog, xdp_act);

		fallthrough;

	case XDP_ABORTED:

		trace_xdp_exception(priv->net_dev, xdp_prog, xdp_act);

drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ static u32 dpaa2_eth_run_xdp(struct dpaa2_eth_priv *priv, 
		dpaa2_eth_xdp_enqueue(priv, ch, fd, vaddr, rx_fq->flowid);

		break;

	default:

		bpf_warn_invalid_xdp_action(xdp_act);

		bpf_warn_invalid_xdp_action(priv->net_dev, xdp_prog, xdp_act);

		fallthrough;

	case XDP_ABORTED:

		trace_xdp_exception(priv->net_dev, xdp_prog, xdp_act);