RDMA/rxe: Change rxe_dbg to rxe_dbg_dev

Replace the name rxe_dbg with rxe_dbg_dev which better matches
the remaining rxe_dbg_xxx macros for debug messages with a
rxe device parameter. Reuse the name rxe_dbg for debug messages
which do not have a rxe device parameter.

Link: https://lore.kernel.org/r/20230303221623.8053-3-rpearsonhpe@gmail.com
Signed-off-by: Bob Pearson <rpearsonhpe@gmail.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rxe.c
index a3f05fdd9fac2e89d67a51ba24a90f3f1883b910..d57ba7a5964b9ac2b29eafb463f73e99f78f3e76 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe.c
+++ b/drivers/infiniband/sw/rxe/rxe.c
@@ -187,7 +187,7 @@ static int rxe_newlink(const char *ibdev_name, struct net_device *ndev)
        rxe = rxe_get_dev_from_net(ndev);
        if (rxe) {
                ib_device_put(&rxe->ib_dev);
-               rxe_dbg(rxe, "already configured on %s\n", ndev->name);
+               rxe_dbg_dev(rxe, "already configured on %s\n", ndev->name);
                err = -EEXIST;
                goto err;
        }

diff --git a/drivers/infiniband/sw/rxe/rxe.h b/drivers/infiniband/sw/rxe/rxe.h
index 2415f3704f576b822946e12d33fba202bd5b334e..0757acc381038702beaf610c8c03ba3aa85e1db7 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe.h
+++ b/drivers/infiniband/sw/rxe/rxe.h
@@ -38,7 +38,8 @@
 
 #define RXE_ROCE_V2_SPORT              (0xc000)
 
-#define rxe_dbg(rxe, fmt, ...) ibdev_dbg(&(rxe)->ib_dev,               \
+#define rxe_dbg(fmt, ...) pr_debug("%s: " fmt "\n", __func__, ##__VA_ARGS__)
+#define rxe_dbg_dev(rxe, fmt, ...) ibdev_dbg(&(rxe)->ib_dev,           \
                "%s: " fmt, __func__, ##__VA_ARGS__)
 #define rxe_dbg_uc(uc, fmt, ...) ibdev_dbg((uc)->ibuc.device,          \
                "uc#%d %s: " fmt, (uc)->elem.index, __func__, ##__VA_ARGS__)

diff --git a/drivers/infiniband/sw/rxe/rxe_cq.c b/drivers/infiniband/sw/rxe/rxe_cq.c
index 1df186534639aa507f100801fca835ed6ec59852..22fbc198e5d1797a3a4f05a43f16a7ebf1781cf3 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_cq.c
+++ b/drivers/infiniband/sw/rxe/rxe_cq.c
@@ -14,12 +14,12 @@ int rxe_cq_chk_attr(struct rxe_dev *rxe, struct rxe_cq *cq,
        int count;
 
        if (cqe <= 0) {
-               rxe_dbg(rxe, "cqe(%d) <= 0\n", cqe);
+               rxe_dbg_dev(rxe, "cqe(%d) <= 0\n", cqe);
                goto err1;
        }
 
        if (cqe > rxe->attr.max_cqe) {
-               rxe_dbg(rxe, "cqe(%d) > max_cqe(%d)\n",
+               rxe_dbg_dev(rxe, "cqe(%d) > max_cqe(%d)\n",
                                cqe, rxe->attr.max_cqe);
                goto err1;
        }
@@ -65,7 +65,7 @@ int rxe_cq_from_init(struct rxe_dev *rxe, struct rxe_cq *cq, int cqe,
        cq->queue = rxe_queue_init(rxe, &cqe,
                        sizeof(struct rxe_cqe), type);
        if (!cq->queue) {
-               rxe_dbg(rxe, "unable to create cq\n");
+               rxe_dbg_dev(rxe, "unable to create cq\n");
                return -ENOMEM;
        }
 

diff --git a/drivers/infiniband/sw/rxe/rxe_icrc.c b/drivers/infiniband/sw/rxe/rxe_icrc.c
index 71bc2c1895888f8fce3a53c8da38a698987cd7ae..fdf5f08cd8f173626b36f7107db11fd15c2e2c0f 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_icrc.c
+++ b/drivers/infiniband/sw/rxe/rxe_icrc.c
@@ -21,7 +21,7 @@ int rxe_icrc_init(struct rxe_dev *rxe)
 
        tfm = crypto_alloc_shash("crc32", 0, 0);
        if (IS_ERR(tfm)) {
-               rxe_dbg(rxe, "failed to init crc32 algorithm err: %ld\n",
+               rxe_dbg_dev(rxe, "failed to init crc32 algorithm err: %ld\n",
                               PTR_ERR(tfm));
                return PTR_ERR(tfm);
        }
@@ -51,7 +51,7 @@ static __be32 rxe_crc32(struct rxe_dev *rxe, __be32 crc, void *next, size_t len)
        *(__be32 *)shash_desc_ctx(shash) = crc;
        err = crypto_shash_update(shash, next, len);
        if (unlikely(err)) {
-               rxe_dbg(rxe, "failed crc calculation, err: %d\n", err);
+               rxe_dbg_dev(rxe, "failed crc calculation, err: %d\n", err);
                return (__force __be32)crc32_le((__force u32)crc, next, len);
        }
 

diff --git a/drivers/infiniband/sw/rxe/rxe_mmap.c b/drivers/infiniband/sw/rxe/rxe_mmap.c
index a47d72dbc5376dd9239057ca659ce3f177549353..6b7f2bd698799103a3e994caeba03d5229864219 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_mmap.c
+++ b/drivers/infiniband/sw/rxe/rxe_mmap.c
@@ -79,7 +79,7 @@ int rxe_mmap(struct ib_ucontext *context, struct vm_area_struct *vma)
 
                /* Don't allow a mmap larger than the object. */
                if (size > ip->info.size) {
-                       rxe_dbg(rxe, "mmap region is larger than the object!\n");
+                       rxe_dbg_dev(rxe, "mmap region is larger than the object!\n");
                        spin_unlock_bh(&rxe->pending_lock);
                        ret = -EINVAL;
                        goto done;
@@ -87,7 +87,7 @@ int rxe_mmap(struct ib_ucontext *context, struct vm_area_struct *vma)
 
                goto found_it;
        }
-       rxe_dbg(rxe, "unable to find pending mmap info\n");
+       rxe_dbg_dev(rxe, "unable to find pending mmap info\n");
        spin_unlock_bh(&rxe->pending_lock);
        ret = -EINVAL;
        goto done;
@@ -98,7 +98,7 @@ found_it:
 
        ret = remap_vmalloc_range(vma, ip->obj, 0);
        if (ret) {
-               rxe_dbg(rxe, "err %d from remap_vmalloc_range\n", ret);
+               rxe_dbg_dev(rxe, "err %d from remap_vmalloc_range\n", ret);
                goto done;
        }
 

diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c
index e02e1624bcf4db4a4fb11c62d396f0bc35a63e8b..a2ace42e953668d981a6a87a41d0bd4a3c5b3da9 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_net.c
+++ b/drivers/infiniband/sw/rxe/rxe_net.c
@@ -596,7 +596,7 @@ static int rxe_notify(struct notifier_block *not_blk,
                rxe_port_down(rxe);
                break;
        case NETDEV_CHANGEMTU:
-               rxe_dbg(rxe, "%s changed mtu to %d\n", ndev->name, ndev->mtu);
+               rxe_dbg_dev(rxe, "%s changed mtu to %d\n", ndev->name, ndev->mtu);
                rxe_set_mtu(rxe, ndev->mtu);
                break;
        case NETDEV_CHANGE:
@@ -608,7 +608,7 @@ static int rxe_notify(struct notifier_block *not_blk,
        case NETDEV_CHANGENAME:
        case NETDEV_FEAT_CHANGE:
        default:
-               rxe_dbg(rxe, "ignoring netdev event = %ld for %s\n",
+               rxe_dbg_dev(rxe, "ignoring netdev event = %ld for %s\n",
                        event, ndev->name);
                break;
        }

diff --git a/drivers/infiniband/sw/rxe/rxe_qp.c b/drivers/infiniband/sw/rxe/rxe_qp.c
index ab72db68b58f69cb65a5b69d8e7d932d965fc554..c954dd9394baf08bcc5e8471525bf3fe0de20cd9 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_qp.c
+++ b/drivers/infiniband/sw/rxe/rxe_qp.c
@@ -19,33 +19,33 @@ static int rxe_qp_chk_cap(struct rxe_dev *rxe, struct ib_qp_cap *cap,
                          int has_srq)
 {
        if (cap->max_send_wr > rxe->attr.max_qp_wr) {
-               rxe_dbg(rxe, "invalid send wr = %u > %d\n",
+               rxe_dbg_dev(rxe, "invalid send wr = %u > %d\n",
                         cap->max_send_wr, rxe->attr.max_qp_wr);
                goto err1;
        }
 
        if (cap->max_send_sge > rxe->attr.max_send_sge) {
-               rxe_dbg(rxe, "invalid send sge = %u > %d\n",
+               rxe_dbg_dev(rxe, "invalid send sge = %u > %d\n",
                         cap->max_send_sge, rxe->attr.max_send_sge);
                goto err1;
        }
 
        if (!has_srq) {
                if (cap->max_recv_wr > rxe->attr.max_qp_wr) {
-                       rxe_dbg(rxe, "invalid recv wr = %u > %d\n",
+                       rxe_dbg_dev(rxe, "invalid recv wr = %u > %d\n",
                                 cap->max_recv_wr, rxe->attr.max_qp_wr);
                        goto err1;
                }
 
                if (cap->max_recv_sge > rxe->attr.max_recv_sge) {
-                       rxe_dbg(rxe, "invalid recv sge = %u > %d\n",
+                       rxe_dbg_dev(rxe, "invalid recv sge = %u > %d\n",
                                 cap->max_recv_sge, rxe->attr.max_recv_sge);
                        goto err1;
                }
        }
 
        if (cap->max_inline_data > rxe->max_inline_data) {
-               rxe_dbg(rxe, "invalid max inline data = %u > %d\n",
+               rxe_dbg_dev(rxe, "invalid max inline data = %u > %d\n",
                         cap->max_inline_data, rxe->max_inline_data);
                goto err1;
        }
@@ -73,7 +73,7 @@ int rxe_qp_chk_init(struct rxe_dev *rxe, struct ib_qp_init_attr *init)
        }
 
        if (!init->recv_cq || !init->send_cq) {
-               rxe_dbg(rxe, "missing cq\n");
+               rxe_dbg_dev(rxe, "missing cq\n");
                goto err1;
        }
 
@@ -82,14 +82,14 @@ int rxe_qp_chk_init(struct rxe_dev *rxe, struct ib_qp_init_attr *init)
 
        if (init->qp_type == IB_QPT_GSI) {
                if (!rdma_is_port_valid(&rxe->ib_dev, port_num)) {
-                       rxe_dbg(rxe, "invalid port = %d\n", port_num);
+                       rxe_dbg_dev(rxe, "invalid port = %d\n", port_num);
                        goto err1;
                }
 
                port = &rxe->port;
 
                if (init->qp_type == IB_QPT_GSI && port->qp_gsi_index) {
-                       rxe_dbg(rxe, "GSI QP exists for port %d\n", port_num);
+                       rxe_dbg_dev(rxe, "GSI QP exists for port %d\n", port_num);
                        goto err1;
                }
        }

diff --git a/drivers/infiniband/sw/rxe/rxe_srq.c b/drivers/infiniband/sw/rxe/rxe_srq.c
index 82e37a41ced40def8626a5ff1560afb472ed14d3..27ca82ec0826b9784546a7c612233c8d2d202fa7 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_srq.c
+++ b/drivers/infiniband/sw/rxe/rxe_srq.c
@@ -13,13 +13,13 @@ int rxe_srq_chk_init(struct rxe_dev *rxe, struct ib_srq_init_attr *init)
        struct ib_srq_attr *attr = &init->attr;
 
        if (attr->max_wr > rxe->attr.max_srq_wr) {
-               rxe_dbg(rxe, "max_wr(%d) > max_srq_wr(%d)\n",
+               rxe_dbg_dev(rxe, "max_wr(%d) > max_srq_wr(%d)\n",
                        attr->max_wr, rxe->attr.max_srq_wr);
                goto err1;
        }
 
        if (attr->max_wr <= 0) {
-               rxe_dbg(rxe, "max_wr(%d) <= 0\n", attr->max_wr);
+               rxe_dbg_dev(rxe, "max_wr(%d) <= 0\n", attr->max_wr);
                goto err1;
        }
 
@@ -27,7 +27,7 @@ int rxe_srq_chk_init(struct rxe_dev *rxe, struct ib_srq_init_attr *init)
                attr->max_wr = RXE_MIN_SRQ_WR;
 
        if (attr->max_sge > rxe->attr.max_srq_sge) {
-               rxe_dbg(rxe, "max_sge(%d) > max_srq_sge(%d)\n",
+               rxe_dbg_dev(rxe, "max_sge(%d) > max_srq_sge(%d)\n",
                        attr->max_sge, rxe->attr.max_srq_sge);
                goto err1;
        }

diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c
index e14050a692766cf6a7ade34c43c7ffffe6a8fca1..f178d0773ff20580f3822b1a9634d244d7e8b910 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_verbs.c
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
@@ -1095,7 +1095,7 @@ int rxe_register_device(struct rxe_dev *rxe, const char *ibdev_name)
 
        err = ib_register_device(dev, ibdev_name, NULL);
        if (err)
-               rxe_dbg(rxe, "failed with error %d\n", err);
+               rxe_dbg_dev(rxe, "failed with error %d\n", err);
 
        /*
         * Note that rxe may be invalid at this point if another thread