RDMA/mlx5: Fix incorrect MKEY masking

rleon · rleon · commit b83440736864 · 2025-07-21T02:27:52.000-04:00
mkey_mask is __be64 type, while MLX5_MKEY_MASK_PAGE_SIZE is declared as unsigned long long. This causes to the static checkers errors: drivers/infiniband/hw/mlx5/umr.c:663:49: warning: invalid assignment: &= drivers/infiniband/hw/mlx5/umr.c:663:49: left side has type restricted __be64 drivers/infiniband/hw/mlx5/umr.c:663:49: right side has type int Fixes: e73242a ("RDMA/mlx5: Optimize DMABUF mkey page size") Link: https://patch.msgid.link/e354d70b98dfa5ecf4c236a36cd36b64add9d9de.1753003467.git.leon@kernel.org Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
diff --git a/drivers/infiniband/hw/mlx5/umr.c b/drivers/infiniband/hw/mlx5/umr.c
@@ -660,7 +660,8 @@ static void mlx5r_umr_final_update_xlt(struct mlx5_ib_dev *dev,
 		if (!mr->ibmr.length)
 			MLX5_SET(mkc, &wqe->mkey_seg, length64, 1);
 		if (flags & MLX5_IB_UPD_XLT_KEEP_PGSZ)
-			wqe->ctrl_seg.mkey_mask &= ~MLX5_MKEY_MASK_PAGE_SIZE;
+			wqe->ctrl_seg.mkey_mask &=
+				cpu_to_be64(~MLX5_MKEY_MASK_PAGE_SIZE);
 	}
 
 	wqe->ctrl_seg.xlt_octowords =

Original file line number	Diff line number	Diff line change
`@@ -660,7 +660,8 @@ static void mlx5r_umr_final_update_xlt(struct mlx5_ib_dev *dev,`
`660`	`660`	`if (!mr->ibmr.length)`
`661`	`661`	`MLX5_SET(mkc, &wqe->mkey_seg, length64, 1);`
`662`	`662`	`if (flags & MLX5_IB_UPD_XLT_KEEP_PGSZ)`
`663`		`- wqe->ctrl_seg.mkey_mask &= ~MLX5_MKEY_MASK_PAGE_SIZE;`
	`663`	`+ wqe->ctrl_seg.mkey_mask &=`
	`664`	`+ cpu_to_be64(~MLX5_MKEY_MASK_PAGE_SIZE);`
`664`	`665`	`}`
`665`	`666`
`666`	`667`	`wqe->ctrl_seg.xlt_octowords =`