net/smc: Improve log message for devices w/o pnetid

Explicitly state in the log message, when a device has no pnetid.
"with pnetid" and "has pnetid" was misleading for devices without pnetid.

Signed-off-by: Alexandra Winter <wintera@linux.ibm.com>
Reviewed-by: Dust Li <dust.li@linux.alibaba.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250901145842.1718373-3-wintera@linux.ibm.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/smc/smc_ib.c b/net/smc/smc_ib.c
index 53828833a3f7f71e8b39b2dde8c99da840e855d6..f2de12990b5b6a4ce80e7b6be7bae6c09c318446 100644 (file)
--- a/net/smc/smc_ib.c
+++ b/net/smc/smc_ib.c
@@ -971,13 +971,17 @@ static int smc_ib_add_dev(struct ib_device *ibdev)
                                           smcibdev->pnetid[i]))
                        smc_pnetid_by_table_ib(smcibdev, i + 1);
                smc_copy_netdev_ifindex(smcibdev, i);
-               pr_warn_ratelimited("smc:    ib device %s port %d has pnetid "
-                                   "%.16s%s\n",
-                                   smcibdev->ibdev->name, i + 1,
-                                   smcibdev->pnetid[i],
-                                   smcibdev->pnetid_by_user[i] ?
-                                    " (user defined)" :
-                                    "");
+               if (smc_pnet_is_pnetid_set(smcibdev->pnetid[i]))
+                       pr_warn_ratelimited("smc:    ib device %s port %d has pnetid %.16s%s\n",
+                                           smcibdev->ibdev->name, i + 1,
+                                           smcibdev->pnetid[i],
+                                           smcibdev->pnetid_by_user[i] ?
+                                               " (user defined)" :
+                                               "");
+               else
+                       pr_warn_ratelimited("smc:    ib device %s port %d has no pnetid\n",
+                                           smcibdev->ibdev->name, i + 1);
+
        }
        schedule_work(&smcibdev->port_event_work);
        return 0;

diff --git a/net/smc/smc_ism.c b/net/smc/smc_ism.c
index 84f98e18c7dbaf81d3a1837a19cdee6e896a0c87..a58ffb7a06102f531ed33e8705da529bd9202dfc 100644 (file)
--- a/net/smc/smc_ism.c
+++ b/net/smc/smc_ism.c
@@ -518,10 +518,15 @@ static void smcd_register_dev(struct ism_dev *ism)
        }
        mutex_unlock(&smcd_dev_list.mutex);
 
-       pr_warn_ratelimited("smc: adding smcd device %s with pnetid %.16s%s\n",
-                           dev_name(&ism->dev), smcd->pnetid,
-                           smcd->pnetid_by_user ? " (user defined)" : "");
-
+       if (smc_pnet_is_pnetid_set(smcd->pnetid))
+               pr_warn_ratelimited("smc: adding smcd device %s with pnetid %.16s%s\n",
+                                   dev_name(&ism->dev), smcd->pnetid,
+                                   smcd->pnetid_by_user ?
+                                       " (user defined)" :
+                                       "");
+       else
+               pr_warn_ratelimited("smc: adding smcd device %s without pnetid\n",
+                                   dev_name(&ism->dev));
        return;
 }