Skip to content

Commit 25b97f0

Browse files
author
CKI KWF Bot
committed
Merge: RDMA/mlx5: Fix a WARN during dereg_mr for DM type
MR: https://gitlab.com/redhat/rhel/src/kernel/rhel-9/-/merge_requests/3446 JIRA: https://issues.redhat.com/browse/RHEL-6641 JIRA: https://issues.redhat.com/browse/RHEL-49958 JIRA: https://issues.redhat.com/browse/RHEL-77115 Signed-off-by: Benjamin Poirier <[email protected]> Approved-by: Kamal Heib <[email protected]> Approved-by: José Ignacio Tornos Martínez <[email protected]> Approved-by: CKI KWF Bot <[email protected]> Merged-by: CKI KWF Bot <[email protected]>
2 parents 314615c + 92d84d6 commit 25b97f0

File tree

1 file changed

+2
-1
lines changed
  • drivers/infiniband/hw/mlx5

1 file changed

+2
-1
lines changed

drivers/infiniband/hw/mlx5/mr.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1935,7 +1935,8 @@ mlx5_alloc_priv_descs(struct ib_device *device,
19351935
static void
19361936
mlx5_free_priv_descs(struct mlx5_ib_mr *mr)
19371937
{
1938-
if (!mr->umem && !mr->data_direct && mr->descs) {
1938+
if (!mr->umem && !mr->data_direct &&
1939+
mr->ibmr.type != IB_MR_TYPE_DM && mr->descs) {
19391940
struct ib_device *device = mr->ibmr.device;
19401941
int size = mr->max_descs * mr->desc_size;
19411942
struct mlx5_ib_dev *dev = to_mdev(device);

0 commit comments

Comments
 (0)