tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Alexandra Winter and committed by
Jakub Kicinski c975e1df a50e7864

+20 -11
+11 -7
net/smc/smc_ib.c
··· 971 971 smcibdev->pnetid[i])) 972 972 smc_pnetid_by_table_ib(smcibdev, i + 1); 973 973 smc_copy_netdev_ifindex(smcibdev, i); 974 - pr_warn_ratelimited("smc: ib device %s port %d has pnetid " 975 - "%.16s%s\n", 976 - smcibdev->ibdev->name, i + 1, 977 - smcibdev->pnetid[i], 978 - smcibdev->pnetid_by_user[i] ? 979 - " (user defined)" : 980 - ""); 974 + if (smc_pnet_is_pnetid_set(smcibdev->pnetid[i])) 975 + pr_warn_ratelimited("smc: ib device %s port %d has pnetid %.16s%s\n", 976 + smcibdev->ibdev->name, i + 1, 977 + smcibdev->pnetid[i], 978 + smcibdev->pnetid_by_user[i] ? 979 + " (user defined)" : 980 + ""); 981 + else 982 + pr_warn_ratelimited("smc: ib device %s port %d has no pnetid\n", 983 + smcibdev->ibdev->name, i + 1); 984 + 981 985 } 982 986 schedule_work(&smcibdev->port_event_work); 983 987 return 0;
+9 -4
net/smc/smc_ism.c
··· 518 518 } 519 519 mutex_unlock(&smcd_dev_list.mutex); 520 520 521 - pr_warn_ratelimited("smc: adding smcd device %s with pnetid %.16s%s\n", 522 - dev_name(&ism->dev), smcd->pnetid, 523 - smcd->pnetid_by_user ? " (user defined)" : ""); 524 - 521 + if (smc_pnet_is_pnetid_set(smcd->pnetid)) 522 + pr_warn_ratelimited("smc: adding smcd device %s with pnetid %.16s%s\n", 523 + dev_name(&ism->dev), smcd->pnetid, 524 + smcd->pnetid_by_user ? 525 + " (user defined)" : 526 + ""); 527 + else 528 + pr_warn_ratelimited("smc: adding smcd device %s without pnetid\n", 529 + dev_name(&ism->dev)); 525 530 return; 526 531 } 527 532