net/smc: fix incorrect SMC-D link group matching logic
Wen Gu
reviewerPATCH 1/1 net/smc: fix incorrect SMC-D link group matching logic
The logic to determine if SMC-D link group matches is incorrect. The correct logic should be that it only returns true when the GID is the same, and the SMC-D device is the same and the extended GID is the same (in the case of virtual ISM).
It can be fixed by adding brackets around the conditional (or ternary) operator expression. But for better readability and maintainability, it has been changed to an if-else statement.
--- net/smc/smc_core.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
net/smc/smc_core.c +9 -3
@@ -1877,9 +1877,15 @@ static bool smcd_lgr_match(struct smc_link_group *lgr, struct smcd_dev *smcismdev, struct smcd_gid *peer_gid) { - return lgr->peer_gid.gid == peer_gid->gid && lgr->smcd == smcismdev && - smc_ism_is_virtual(smcismdev) ? - (lgr->peer_gid.gid_ext == peer_gid->gid_ext) : 1; +if (lgr->peer_gid.gid != peer_gid->gid || + lgr->smcd != smcismdev) +return false; + +if (smc_ism_is_virtual (smcismdev) && + lgr->peer_gid.gid_ext != peer_gid->gid_ext) +return false; + +return true; }/* create a new SMC connection (and a new link group if necessary) */
Signature · 1 line
2.32.0.3.g01195cf9f
Quoted 31 lines · Wen Gu
The logic to determine if SMC-D link group matches is incorrect. The correct logic should be that it only returns true when the GID is the same, and the SMC-D device is the same and the extended GID is the same (in the case of virtual ISM).
It can be fixed by adding brackets around the conditional (or ternary) operator expression. But for better readability and maintainability, it has been changed to an if-else statement.
Reported-by Matthew Rosato <[email protected]>Fixes b40584d14570 ("net/smc: compatible with 128-bits extended GID of virtual ISM device")Signed-off-by Wen Gu <[email protected]>--- net/smc/smc_core.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)net/smc/smc_core.c +2
-3@@ -1877,9 +1877,15 @@ static bool smcd_lgr_match(struct smc_link_group *lgr, struct smcd_dev *smcismdev, struct smcd_gid *peer_gid) { - return lgr->peer_gid.gid == peer_gid->gid && lgr->smcd == smcismdev && - smc_ism_is_virtual(smcismdev) ? - (lgr->peer_gid.gid_ext == peer_gid->gid_ext) : 1; +if (lgr->peer_gid.gid != peer_gid->gid || + lgr->smcd != smcismdev)
net/smc/smc_core.c static bool smcd_lgr_match(struct smc_link_group *lgr, · line 1891
Quoted 10 lines
net/smc/smc_core.c +7
-0+return false; + +if (smc_ism_is_virtual (smcismdev) && + lgr->peer_gid.gid_ext != peer_gid->gid_ext) +return false; + +return true; }/* create a new SMC connection (and a new link group if necessary) */
Thank you Wen Gu
Quoted 9 lines · Wen Gu
The logic to determine if SMC-D link group matches is incorrect. The correct logic should be that it only returns true when the GID is the same, and the SMC-D device is the same and the extended GID is the same (in the case of virtual ISM).
It can be fixed by adding brackets around the conditional (or ternary) operator expression. But for better readability and maintainability, it has been changed to an if-else statement.
Quoted 5 lines
Reported-by Matthew Rosato <[email protected]>Fixes b40584d14570 ("net/smc: compatible with 128-bits extended GID of virtual ISM device")Signed-off-by Wen Gu <[email protected]>
Hi Wen Gu,
I just ran the same series of tests with this patch applied and it resolves the issue for me. Thanks for the quick fix!
Thanks,
Matt
Quoted 27 lines
--- net/smc/smc_core.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)net/smc/smc_core.c +9
-3@@ -1877,9 +1877,15 @@ static bool smcd_lgr_match(struct smc_link_group *lgr, struct smcd_dev *smcismdev, struct smcd_gid *peer_gid) { - return lgr->peer_gid.gid == peer_gid->gid && lgr->smcd == smcismdev && - smc_ism_is_virtual(smcismdev) ? - (lgr->peer_gid.gid_ext == peer_gid->gid_ext) : 1; +if (lgr->peer_gid.gid != peer_gid->gid || + lgr->smcd != smcismdev) +return false; + +if (smc_ism_is_virtual (smcismdev) && + lgr->peer_gid.gid_ext != peer_gid->gid_ext) +return false; + +return true; }/* create a new SMC connection (and a new link group if necessary) */
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Thu, 25 Jan 2024 20:39:16 +0800 you wrote:
The logic to determine if SMC-D link group matches is incorrect. The correct logic should be that it only returns true when the GID is the same, and the SMC-D device is the same and the extended GID is the same (in the case of virtual ISM).
It can be fixed by adding brackets around the conditional (or ternary) operator expression. But for better readability and maintainability, it has been changed to an if-else statement.
[...]
Here is the summary with links:
- [net] net/smc: fix incorrect SMC-D link group matching logic
https://git.kernel.org/netdev/net/c/c3dfcdb65ec1
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html