The mlx5 driver have multiple memory models, which are also changed according to whether a XDP bpf_prog is attached. The 'rx_striding_rq' setting is adjusted via ethtool priv-flags e.g.: # ethtool --set-priv-flags mlx5p2 rx_striding_rq off On the general case with 4K page_size and regular MTU packet, then the frame_sz is 2048 and 4096 when XDP is enabled, in both modes. The info on the given frame size is stored differently depending on the RQ-mode and encoded in a union in struct mlx5e_rq union wqe/mpwqe. In rx striding mode rq->mpwqe.log_stride_sz is either 11 or 12, which corresponds to 2048 or 4096 (MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ). In non-striding mode (MLX5_WQ_TYPE_CYCLIC) the frag_stride is stored in rq->wqe.info.arr[0].frag_stride, for the first fragment, which is what the XDP case cares about. To reduce effect on fast-path, this patch determine the frame_sz at setup time, to avoid determining the memory model runtime. Variable is named frame0_sz to make it clear that this is only the frame size of the first fragment. This mlx5 driver does a DMA-sync on XDP_TX action, but grow is safe as it have done a DMA-map on the entire PAGE_SIZE. The driver also already does a XDP length check against sq->hw_mtu on the possible XDP xmit paths mlx5e_xmit_xdp_frame() + mlx5e_xmit_xdp_frame_mpwqe(). V3+4: Change variable name first_frame_sz to frame0_sz V2: Fix that frag_size need to be recalc before creating SKB.
Unified · Split
| @@ -625,6 +625,7 @@ struct mlx5e_rq { · 624 unmodified lines | ||
| 625 | 625 | struct { |
| 626 | 626 | u16 umem_headroom; |
| 627 | 627 | u16 headroom; |
| 628 | + u32 frame0_sz; | |
| 628 | 629 | u8 map_dir; /* dma map direction */ |
| 629 | 630 | } buff; |
| 630 | 631 | |
| @@ -137,6 +137,7 @@ bool mlx5e_xdp_handle(struct mlx5e_rq *rq, struct mlx5e_dma_info *di, · 136 unmodified lines | ||
| 137 | 137 | if (xsk) |
| 138 | 138 | xdp.handle = di->xsk.handle; |
| 139 | 139 | xdp.rxq = &rq->xdp_rxq; |
| 140 | + xdp.frame_sz = rq->buff.frame0_sz; | |
| 140 | 141 | |
| 141 | 142 | act = bpf_prog_run_xdp(prog, &xdp); |
| 142 | 143 | if (xsk) { |
| @@ -462,6 +462,8 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c, · 461 unmodified lines | ||
| 462 | 462 | rq->mpwqe.num_strides = |
| 463 | 463 | BIT(mlx5e_mpwqe_get_log_num_strides(mdev, params, xsk)); |
| 464 | 464 | |
| 465 | + rq->buff.frame0_sz = (1 << rq->mpwqe.log_stride_sz); | |
| 466 | + | |
| 465 | 467 | err = mlx5e_create_rq_umr_mkey(mdev, rq); |
| 466 | 468 | if (err) |
| 467 | 469 | goto err_rq_wq_destroy; |
| @@ -485,6 +487,8 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c, · 17 unmodified lines | ||
| 485 | 487 | num_xsk_frames = wq_sz << rq->wqe.info.log_num_frags; |
| 486 | 488 | |
| 487 | 489 | rq->wqe.info = rqp->frags_info; |
| 490 | + rq->buff.frame0_sz = rq->wqe.info.arr[0].frag_stride; | |
| 491 | + | |
| 488 | 492 | rq->wqe.frags = |
| 489 | 493 | kvzalloc_node(array_size(sizeof(*rq->wqe.frags), |
| 490 | 494 | (wq_sz << rq->wqe.info.log_num_frags)), |
| @@ -522,6 +526,8 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c, · 31 unmodified lines | ||
| 522 | 526 | } |
| 523 | 527 | |
| 524 | 528 | if (xsk) { |
| 529 | + rq->buff.frame0_sz = xsk_umem_xdp_frame_sz(umem); | |
| 530 | + | |
| 525 | 531 | err = mlx5e_xsk_resize_reuseq(umem, num_xsk_frames); |
| 526 | 532 | if (unlikely(err)) { |
| 527 | 533 | mlx5_core_err(mdev, "Unable to allocate the Reuse Ring for %u frames\n", |
| @@ -1070,6 +1070,7 @@ mlx5e_skb_from_cqe_linear(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe, · 1069 unmodified lines | ||
| 1070 | 1070 | if (consumed) |
| 1071 | 1071 | return NULL; /* page/packet was consumed by XDP */ |
| 1072 | 1072 | |
| 1073 | + frag_size = MLX5_SKB_FRAG_SZ(rx_headroom + cqe_bcnt); | |
| 1073 | 1074 | skb = mlx5e_build_linear_skb(rq, va, frag_size, rx_headroom, cqe_bcnt); |
| 1074 | 1075 | if (unlikely(!skb)) |
| 1075 | 1076 | return NULL; |
| @@ -1371,6 +1372,7 @@ mlx5e_skb_from_cqe_mpwrq_linear(struct mlx5e_rq *rq, struct mlx5e_mpw_info *wi, · 295 unmodified lines | ||
| 1371 | 1372 | return NULL; /* page/packet was consumed by XDP */ |
| 1372 | 1373 | } |
| 1373 | 1374 | |
| 1375 | + frag_size = MLX5_SKB_FRAG_SZ(rx_headroom + cqe_bcnt32); | |
| 1374 | 1376 | skb = mlx5e_build_linear_skb(rq, va, frag_size, rx_headroom, cqe_bcnt32); |
| 1375 | 1377 | if (unlikely(!skb)) |
| 1376 | 1378 | return NULL; |