Commit 8c8cf038 authored by Ben Ben-Ishay's avatar Ben Ben-Ishay Committed by Saeed Mahameed
Browse files

net/mlx5e: SHAMPO, Fix constant expression result 



mlx5e_build_shampo_hd_umr uses counters i and index incorrectly
as unsigned, thus the err state err_unmap could stuck in endless loop.
Change i to int to solve the first issue.
Reduce index check to solve the second issue, the caller function
validates that index could not rotate.

Fixes: 64509b05 ("net/mlx5e: Add data path for SHAMPO feature")
Signed-off-by: default avatarBen Ben-Ishay <benishay@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 502e82b9

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

+3 −5
Original line number Diff line number Diff line
@@ -543,13 +543,13 @@ static int mlx5e_build_shampo_hd_umr(struct mlx5e_rq *rq, 
				     u16 klm_entries, u16 index)

{

	struct mlx5e_shampo_hd *shampo = rq->mpwqe.shampo;

	u16 entries, pi, i, header_offset, err, wqe_bbs, new_entries;

	u16 entries, pi, header_offset, err, wqe_bbs, new_entries;

	u32 lkey = rq->mdev->mlx5e_res.hw_objs.mkey;

	struct page *page = shampo->last_page;

	u64 addr = shampo->last_addr;

	struct mlx5e_dma_info *dma_info;

	struct mlx5e_umr_wqe *umr_wqe;

	int headroom;

	int headroom, i;



	headroom = rq->buff.headroom;

	new_entries = klm_entries - (shampo->pi & (MLX5_UMR_KLM_ALIGNMENT - 1));
@@ -601,9 +601,7 @@ static int mlx5e_build_shampo_hd_umr(struct mlx5e_rq *rq, 


err_unmap:

	while (--i >= 0) {

		if (--index < 0)

			index = shampo->hd_per_wq - 1;

		dma_info = &shampo->info[index];

		dma_info = &shampo->info[--index];

		if (!(i & (MLX5E_SHAMPO_WQ_HEADER_PER_PAGE - 1))) {

			dma_info->addr = ALIGN_DOWN(dma_info->addr, PAGE_SIZE);

			mlx5e_page_release(rq, dma_info, true);