Skip to content

Commit 665a7e1

Browse files
dtatuleakuba-moo
authored andcommitted
net/mlx5e: SHAMPO, Fix header mapping for 64K pages
HW-GRO is broken on mlx5 for 64K page sizes. The patch in the fixes tag didn't take into account larger page sizes when doing an align down of max_ksm_entries. For 64K page size, max_ksm_entries is 0 which will skip mapping header pages via WQE UMR. This breaks header-data split and will result in the following syndrome: mlx5_core 0000:00:08.0 eth2: Error cqe on cqn 0x4c9, ci 0x0, qn 0x1133, opcode 0xe, syndrome 0x4, vendor syndrome 0x32 00000000: 00 00 00 00 04 4a 00 00 00 00 00 00 20 00 93 32 00000010: 55 00 00 00 fb cc 00 00 00 00 00 00 07 18 00 00 00000020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 4a 00000030: 00 00 3b c7 93 01 32 04 00 00 00 00 00 00 bf e0 mlx5_core 0000:00:08.0 eth2: ERR CQE on RQ: 0x1133 Furthermore, the function that fills in WQE UMRs for the headers (mlx5e_build_shampo_hd_umr()) only supports mapping page sizes that fit in a single UMR WQE. This patch goes back to the old non-aligned max_ksm_entries value and it changes mlx5e_build_shampo_hd_umr() to support mapping a large page over multiple UMR WQEs. This means that mlx5e_build_shampo_hd_umr() can now leave a page only partially mapped. The caller, mlx5e_alloc_rx_hd_mpwqe(), ensures that there are enough UMR WQEs to cover complete pages by working on ksm_entries that are multiples of MLX5E_SHAMPO_WQ_HEADER_PER_PAGE. Fixes: 8a0ee54 ("net/mlx5e: SHAMPO, Simplify UMR allocation for headers") Signed-off-by: Dragos Tatulea <dtatulea@nvidia.com> Signed-off-by: Tariq Toukan <tariqt@nvidia.com> Reviewed-by: Simon Horman <horms@kernel.org> Link: https://patch.msgid.link/1762238915-1027590-2-git-send-email-tariqt@nvidia.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent ae4789a commit 665a7e1

1 file changed

Lines changed: 17 additions & 19 deletions

File tree

  • drivers/net/ethernet/mellanox/mlx5/core

drivers/net/ethernet/mellanox/mlx5/core/en_rx.c

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -671,33 +671,32 @@ static int mlx5e_build_shampo_hd_umr(struct mlx5e_rq *rq,
671671
u16 pi, header_offset, err, wqe_bbs;
672672
u32 lkey = rq->mdev->mlx5e_res.hw_objs.mkey;
673673
struct mlx5e_umr_wqe *umr_wqe;
674-
int headroom, i = 0;
674+
int headroom, i;
675675

676676
headroom = rq->buff.headroom;
677677
wqe_bbs = MLX5E_KSM_UMR_WQEBBS(ksm_entries);
678678
pi = mlx5e_icosq_get_next_pi(sq, wqe_bbs);
679679
umr_wqe = mlx5_wq_cyc_get_wqe(&sq->wq, pi);
680680
build_ksm_umr(sq, umr_wqe, shampo->mkey_be, index, ksm_entries);
681681

682-
WARN_ON_ONCE(ksm_entries & (MLX5E_SHAMPO_WQ_HEADER_PER_PAGE - 1));
683-
while (i < ksm_entries) {
684-
struct mlx5e_frag_page *frag_page = mlx5e_shampo_hd_to_frag_page(rq, index);
682+
for (i = 0; i < ksm_entries; i++, index++) {
683+
struct mlx5e_frag_page *frag_page;
685684
u64 addr;
686685

687-
err = mlx5e_page_alloc_fragmented(rq->hd_page_pool, frag_page);
688-
if (unlikely(err))
689-
goto err_unmap;
686+
frag_page = mlx5e_shampo_hd_to_frag_page(rq, index);
687+
header_offset = mlx5e_shampo_hd_offset(index);
688+
if (!header_offset) {
689+
err = mlx5e_page_alloc_fragmented(rq->hd_page_pool,
690+
frag_page);
691+
if (err)
692+
goto err_unmap;
693+
}
690694

691695
addr = page_pool_get_dma_addr_netmem(frag_page->netmem);
692-
693-
for (int j = 0; j < MLX5E_SHAMPO_WQ_HEADER_PER_PAGE; j++) {
694-
header_offset = mlx5e_shampo_hd_offset(index++);
695-
696-
umr_wqe->inline_ksms[i++] = (struct mlx5_ksm) {
697-
.key = cpu_to_be32(lkey),
698-
.va = cpu_to_be64(addr + header_offset + headroom),
699-
};
700-
}
696+
umr_wqe->inline_ksms[i] = (struct mlx5_ksm) {
697+
.key = cpu_to_be32(lkey),
698+
.va = cpu_to_be64(addr + header_offset + headroom),
699+
};
701700
}
702701

703702
sq->db.wqe_info[pi] = (struct mlx5e_icosq_wqe_info) {
@@ -713,7 +712,7 @@ static int mlx5e_build_shampo_hd_umr(struct mlx5e_rq *rq,
713712
return 0;
714713

715714
err_unmap:
716-
while (--i) {
715+
while (--i >= 0) {
717716
--index;
718717
header_offset = mlx5e_shampo_hd_offset(index);
719718
if (!header_offset) {
@@ -735,8 +734,7 @@ static int mlx5e_alloc_rx_hd_mpwqe(struct mlx5e_rq *rq)
735734
struct mlx5e_icosq *sq = rq->icosq;
736735
int i, err, max_ksm_entries, len;
737736

738-
max_ksm_entries = ALIGN_DOWN(MLX5E_MAX_KSM_PER_WQE(rq->mdev),
739-
MLX5E_SHAMPO_WQ_HEADER_PER_PAGE);
737+
max_ksm_entries = MLX5E_MAX_KSM_PER_WQE(rq->mdev);
740738
ksm_entries = bitmap_find_window(shampo->bitmap,
741739
shampo->hd_per_wqe,
742740
shampo->hd_per_wq, shampo->pi);

0 commit comments

Comments
 (0)