mlx5: Set AF_XDP data pointer correctly.
Subsystems (4)
PATCH 1/2 mlx5: Set AF_XDP data pointer correctly.
data starts at handle + headroom, so adjust appropriately.
--- drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c +2 -1
@@ -290,7 +290,8 @@ int mlx5e_xsk_page_alloc_umem(struct mlx5e_rq *rq,return -ENOMEM ; dma_info->xsk.handle = handle + rq->buff.umem_headroom; - dma_info->xsk.data =xdp_umem_get_data (umem, handle); + dma_info->xsk.data =xdp_umem_get_data (umem, handle) + + rq->buff.umem_headroom;/* No need to add headroom to the DMA address. In striding RQ case, we * just provide pages for UMR, and headroom is counted at the setup
Signature · 1 line
2.17.1
PATCH 2/2 mlx5: Adjust handle based on xdp values.
bpf_prog_run_xdp() may change the start/length values in xdp. Adjust the umem handle so it reflects the possibly updated values.
--- drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c +1 -1
@@ -115,7 +115,7 @@ bool mlx5e_xdp_handle(struct mlx5e_rq *rq, struct mlx5e_dma_info *di, act =bpf_prog_run_xdp (prog, &xdp);if (xsk) - xdp.handle = di->xsk.handle + *rx_headroom; + xdp.handle += xdp.data - xdp.data_hard_start;switch (act) {case XDP_PASS : *rx_headroom = xdp.data - xdp.data_hard_start;
Signature · 1 line
2.17.1
Quoted 13 lines · Jonathan Lemon
data starts at handle + headroom, so adjust appropriately.
Signed-off-by Jonathan Lemon <[email protected]>--- drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c +0
-0
drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c int mlx5e_xsk_page_alloc_umem(struct mlx5e_rq *rq, · line 297
Quoted 9 lines
drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c +2
-1@@ -290,7 +290,8 @@ int mlx5e_xsk_page_alloc_umem(struct mlx5e_rq *rq,return -ENOMEM ; dma_info->xsk.handle = handle + rq->buff.umem_headroom; - dma_info->xsk.data =xdp_umem_get_data (umem, handle); + dma_info->xsk.data =xdp_umem_get_data (umem, handle) + + rq->buff.umem_headroom;/* No need to add headroom to the DMA address. In striding RQ case, we * just provide pages for UMR, and headroom is counted at the setup
This code is not upstreamed yet, please hold on with sending patches to netdev. You are not even working with the latest codebase. You shouldn't have exposed it before the submission. Please refrain from doing it for now.
If you have fixes like this, I'm happy to hear from you, but please provide your feedback internally. Your fixes may not apply cleanly, because I'm constantly updating the code, or these issues may be already fixed in the code that you haven't seen yet, so let's sync internally before it goes upstream.
Thanks,
Max
Quoted 31 lines · Maxim Mikityanskiy
Quoted 21 lines · Jonathan Lemon
data starts at handle + headroom, so adjust appropriately.
Signed-off-by Jonathan Lemon <[email protected]>--- drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c +2
-1@@ -290,7 +290,8 @@ int mlx5e_xsk_page_alloc_umem(struct mlx5e_rq *rq, return -ENOMEM ; dma_info->xsk.handle = handle + rq->buff.umem_headroom; - dma_info->xsk.data =xdp_umem_get_data (umem, handle); + dma_info->xsk.data =xdp_umem_get_data (umem, handle) + + rq->buff.umem_headroom;/* No need to add headroom to the DMA address. In striding RQ Quoted 4 lines
case, we
* just provide pages for UMR, and headroom is counted at the
setupThis code is not upstreamed yet, please hold on with sending patches to netdev. You are not even working with the latest codebase. You shouldn't have exposed it before the submission. Please refrain from doing it for now.
Quoted 5 lines
If you have fixes like this, I'm happy to hear from you, but please provide your feedback internally. Your fixes may not apply cleanly, because I'm constantly updating the code, or these issues may be already fixed in the code that you haven't seen yet, so let's sync internally before it goes upstream.
This was my mistake - unintentionally generated from the wrong tree. Please ignore, and I'll change my workflow to prevent this from happening again.
Signature · 1 line
Jonathan