mlx5: fix xdp data_meta setup in mlx5e_fill_xdp_buff

The helper function xdp_set_data_meta_invalid() must be called after
setting xdp->data as it depends on it.

The bug was introduced in the cited patch below, and cause the kernel
to crash when using BPF helper bpf_xdp_adjust_head() on mlx5 driver.

Fixes: 39d6443c8daf ("mlx5, xsk: Migrate to new MEM_TYPE_XSK_BUFF_POOL")
Reported-by: David Ahern <dsahern@kernel.org>
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Tested-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
index 6b3c82da199ce9ed85b6b42d6e45555c2529ddd9..dbb1c63239672f4e3f6d74a32b5f835526d4a143 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
@@ -1056,8 +1056,8 @@ static void mlx5e_fill_xdp_buff(struct mlx5e_rq *rq, void *va, u16 headroom,
                                u32 len, struct xdp_buff *xdp)
 {
        xdp->data_hard_start = va;
                                u32 len, struct xdp_buff *xdp)
 {
        xdp->data_hard_start = va;

-       xdp_set_data_meta_invalid(xdp);

        xdp->data = va + headroom;
        xdp->data = va + headroom;

+       xdp_set_data_meta_invalid(xdp);

        xdp->data_end = xdp->data + len;
        xdp->rxq = &rq->xdp_rxq;
        xdp->frame_sz = rq->buff.frame0_sz;
        xdp->data_end = xdp->data + len;
        xdp->rxq = &rq->xdp_rxq;
        xdp->frame_sz = rq->buff.frame0_sz;