141 lines
4.8 KiB
Diff
141 lines
4.8 KiB
Diff
From 959cd78d8f953ff0e1cf6ee8f5b1746cfb9dd8a7 Mon Sep 17 00:00:00 2001
|
|
From: Kamal Heib <kheib@redhat.com>
|
|
Date: Mon, 20 Apr 2026 14:52:28 -0400
|
|
Subject: [PATCH] RDMA: Use %pe format specifier for error pointers
|
|
|
|
JIRA: https://redhat.atlassian.net/browse/RHEL-169055
|
|
Conflicts:
|
|
Include only the mlx5 hunks.
|
|
|
|
commit 4b6b6233f50f72353b54295ba594990b19f33223
|
|
Author: Leon Romanovsky <leon@kernel.org>
|
|
Date: Thu Sep 18 20:53:41 2025 +0300
|
|
|
|
RDMA: Use %pe format specifier for error pointers
|
|
|
|
Convert error logging throughout the RDMA subsystem to use
|
|
the %pe format specifier instead of PTR_ERR() with integer
|
|
format specifiers.
|
|
|
|
Link: https://patch.msgid.link/e81ec02df1e474be20417fb62e779776e3f47a50.1758217936.git.leon@kernel.org
|
|
Reviewed-by: Zhu Yanjun <yanjun.zhu@linux.dev>
|
|
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
|
|
|
|
Signed-off-by: Kamal Heib <kheib@redhat.com>
|
|
|
|
diff --git a/drivers/infiniband/hw/mlx5/data_direct.c b/drivers/infiniband/hw/mlx5/data_direct.c
|
|
index b9ba84afaae2..b81ac5709b56 100644
|
|
--- a/drivers/infiniband/hw/mlx5/data_direct.c
|
|
+++ b/drivers/infiniband/hw/mlx5/data_direct.c
|
|
@@ -35,7 +35,7 @@ static int mlx5_data_direct_vpd_get_vuid(struct mlx5_data_direct_dev *dev)
|
|
|
|
vpd_data = pci_vpd_alloc(pdev, &vpd_size);
|
|
if (IS_ERR(vpd_data)) {
|
|
- pci_err(pdev, "Unable to read VPD, err=%ld\n", PTR_ERR(vpd_data));
|
|
+ pci_err(pdev, "Unable to read VPD, err=%pe\n", vpd_data);
|
|
return PTR_ERR(vpd_data);
|
|
}
|
|
|
|
diff --git a/drivers/infiniband/hw/mlx5/gsi.c b/drivers/infiniband/hw/mlx5/gsi.c
|
|
index b804f2dd5628..d5487834ed25 100644
|
|
--- a/drivers/infiniband/hw/mlx5/gsi.c
|
|
+++ b/drivers/infiniband/hw/mlx5/gsi.c
|
|
@@ -131,8 +131,9 @@ int mlx5_ib_create_gsi(struct ib_pd *pd, struct mlx5_ib_qp *mqp,
|
|
gsi->cq = ib_alloc_cq(pd->device, gsi, attr->cap.max_send_wr, 0,
|
|
IB_POLL_SOFTIRQ);
|
|
if (IS_ERR(gsi->cq)) {
|
|
- mlx5_ib_warn(dev, "unable to create send CQ for GSI QP. error %ld\n",
|
|
- PTR_ERR(gsi->cq));
|
|
+ mlx5_ib_warn(dev,
|
|
+ "unable to create send CQ for GSI QP. error %pe\n",
|
|
+ gsi->cq);
|
|
ret = PTR_ERR(gsi->cq);
|
|
goto err_free_wrs;
|
|
}
|
|
@@ -147,8 +148,9 @@ int mlx5_ib_create_gsi(struct ib_pd *pd, struct mlx5_ib_qp *mqp,
|
|
|
|
gsi->rx_qp = ib_create_qp(pd, &hw_init_attr);
|
|
if (IS_ERR(gsi->rx_qp)) {
|
|
- mlx5_ib_warn(dev, "unable to create hardware GSI QP. error %ld\n",
|
|
- PTR_ERR(gsi->rx_qp));
|
|
+ mlx5_ib_warn(dev,
|
|
+ "unable to create hardware GSI QP. error %pe\n",
|
|
+ gsi->rx_qp);
|
|
ret = PTR_ERR(gsi->rx_qp);
|
|
goto err_destroy_cq;
|
|
}
|
|
@@ -294,8 +296,9 @@ static void setup_qp(struct mlx5_ib_gsi_qp *gsi, u16 qp_index)
|
|
|
|
qp = create_gsi_ud_qp(gsi);
|
|
if (IS_ERR(qp)) {
|
|
- mlx5_ib_warn(dev, "unable to create hardware UD QP for GSI: %ld\n",
|
|
- PTR_ERR(qp));
|
|
+ mlx5_ib_warn(dev,
|
|
+ "unable to create hardware UD QP for GSI: %pe\n",
|
|
+ qp);
|
|
return;
|
|
}
|
|
|
|
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
|
|
index e9bcd93517a9..8f2c6e84127f 100644
|
|
--- a/drivers/infiniband/hw/mlx5/main.c
|
|
+++ b/drivers/infiniband/hw/mlx5/main.c
|
|
@@ -3051,14 +3051,16 @@ int mlx5_ib_dev_res_cq_init(struct mlx5_ib_dev *dev)
|
|
pd = ib_alloc_pd(ibdev, 0);
|
|
if (IS_ERR(pd)) {
|
|
ret = PTR_ERR(pd);
|
|
- mlx5_ib_err(dev, "Couldn't allocate PD for res init, err=%d\n", ret);
|
|
+ mlx5_ib_err(dev, "Couldn't allocate PD for res init, err=%pe\n",
|
|
+ pd);
|
|
goto unlock;
|
|
}
|
|
|
|
cq = ib_create_cq(ibdev, NULL, NULL, NULL, &cq_attr);
|
|
if (IS_ERR(cq)) {
|
|
ret = PTR_ERR(cq);
|
|
- mlx5_ib_err(dev, "Couldn't create CQ for res init, err=%d\n", ret);
|
|
+ mlx5_ib_err(dev, "Couldn't create CQ for res init, err=%pe\n",
|
|
+ cq);
|
|
ib_dealloc_pd(pd);
|
|
goto unlock;
|
|
}
|
|
@@ -3102,7 +3104,9 @@ int mlx5_ib_dev_res_srq_init(struct mlx5_ib_dev *dev)
|
|
s0 = ib_create_srq(devr->p0, &attr);
|
|
if (IS_ERR(s0)) {
|
|
ret = PTR_ERR(s0);
|
|
- mlx5_ib_err(dev, "Couldn't create SRQ 0 for res init, err=%d\n", ret);
|
|
+ mlx5_ib_err(dev,
|
|
+ "Couldn't create SRQ 0 for res init, err=%pe\n",
|
|
+ s0);
|
|
goto unlock;
|
|
}
|
|
|
|
@@ -3114,7 +3118,9 @@ int mlx5_ib_dev_res_srq_init(struct mlx5_ib_dev *dev)
|
|
s1 = ib_create_srq(devr->p0, &attr);
|
|
if (IS_ERR(s1)) {
|
|
ret = PTR_ERR(s1);
|
|
- mlx5_ib_err(dev, "Couldn't create SRQ 1 for res init, err=%d\n", ret);
|
|
+ mlx5_ib_err(dev,
|
|
+ "Couldn't create SRQ 1 for res init, err=%pe\n",
|
|
+ s1);
|
|
ib_destroy_srq(s0);
|
|
}
|
|
|
|
diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c
|
|
index d3c82ffa300e..325fa04cbe8a 100644
|
|
--- a/drivers/infiniband/hw/mlx5/mr.c
|
|
+++ b/drivers/infiniband/hw/mlx5/mr.c
|
|
@@ -1652,8 +1652,7 @@ reg_user_mr_dmabuf(struct ib_pd *pd, struct device *dma_device,
|
|
fd, access_flags);
|
|
|
|
if (IS_ERR(umem_dmabuf)) {
|
|
- mlx5_ib_dbg(dev, "umem_dmabuf get failed (%ld)\n",
|
|
- PTR_ERR(umem_dmabuf));
|
|
+ mlx5_ib_dbg(dev, "umem_dmabuf get failed (%pe)\n", umem_dmabuf);
|
|
return ERR_CAST(umem_dmabuf);
|
|
}
|
|
|
|
--
|
|
2.50.1 (Apple Git-155)
|
|
|