* [PATCH net] Revert "net/smc: fix listen processing for SMC-Rv2"
@ 2022-05-23 15:07 liuyacan
2022-05-23 15:31 ` [PATCH v2 " liuyacan
0 siblings, 1 reply; 5+ messages in thread
From: liuyacan @ 2022-05-23 15:07 UTC (permalink / raw)
To: kgraul, davem, edumazet, kuba, pabeni
Cc: linux-s390, netdev, linux-kernel, ubraun, liuyacan
From: liuyacan <liuyacan@corp.netease.com>
This reverts commit 5ec8b414b4381e8714731415fc221ef50a4e7b14.
Some rollback issue will be fixed in other patches in the future.
Link: https://lore.kernel.org/all/20220523055056.2078994-1-liuyacan@corp.netease.com/
Fixes: 5ec8b414b438 ("net/smc: fix listen processing for SMC-Rv2")
Signed-off-by: liuyacan <liuyacan@corp.netease.com>
---
net/smc/af_smc.c | 44 +++++++++++++++++---------------------------
1 file changed, 17 insertions(+), 27 deletions(-)
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index d3de54b70..45a24d242 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -2093,13 +2093,13 @@ static int smc_listen_rdma_reg(struct smc_sock *new_smc, bool local_first)
return 0;
}
-static int smc_find_rdma_v2_device_serv(struct smc_sock *new_smc,
- struct smc_clc_msg_proposal *pclc,
- struct smc_init_info *ini)
+static void smc_find_rdma_v2_device_serv(struct smc_sock *new_smc,
+ struct smc_clc_msg_proposal *pclc,
+ struct smc_init_info *ini)
{
struct smc_clc_v2_extension *smc_v2_ext;
u8 smcr_version;
- int rc = 0;
+ int rc;
if (!(ini->smcr_version & SMC_V2) || !smcr_indicated(ini->smc_type_v2))
goto not_found;
@@ -2117,31 +2117,26 @@ static int smc_find_rdma_v2_device_serv(struct smc_sock *new_smc,
ini->smcrv2.saddr = new_smc->clcsock->sk->sk_rcv_saddr;
ini->smcrv2.daddr = smc_ib_gid_to_ipv4(smc_v2_ext->roce);
rc = smc_find_rdma_device(new_smc, ini);
- if (rc)
+ if (rc) {
+ smc_find_ism_store_rc(rc, ini);
goto not_found;
-
+ }
if (!ini->smcrv2.uses_gateway)
memcpy(ini->smcrv2.nexthop_mac, pclc->lcl.mac, ETH_ALEN);
smcr_version = ini->smcr_version;
ini->smcr_version = SMC_V2;
rc = smc_listen_rdma_init(new_smc, ini);
- if (rc) {
- ini->smcr_version = smcr_version;
- goto not_found;
- }
- rc = smc_listen_rdma_reg(new_smc, ini->first_contact_local);
- if (rc) {
- ini->smcr_version = smcr_version;
- goto not_found;
- }
- return 0;
+ if (!rc)
+ rc = smc_listen_rdma_reg(new_smc, ini->first_contact_local);
+ if (!rc)
+ return;
+ ini->smcr_version = smcr_version;
+ smc_find_ism_store_rc(rc, ini);
not_found:
- rc = rc ?: SMC_CLC_DECL_NOSMCDEV;
ini->smcr_version &= ~SMC_V2;
ini->check_smcrv2 = false;
- return rc;
}
static int smc_find_rdma_v1_device_serv(struct smc_sock *new_smc,
@@ -2174,7 +2169,6 @@ static int smc_listen_find_device(struct smc_sock *new_smc,
struct smc_init_info *ini)
{
int prfx_rc;
- int rc;
/* check for ISM device matching V2 proposed device */
smc_find_ism_v2_device_serv(new_smc, pclc, ini);
@@ -2202,18 +2196,14 @@ static int smc_listen_find_device(struct smc_sock *new_smc,
return ini->rc ?: SMC_CLC_DECL_NOSMCDDEV;
/* check if RDMA V2 is available */
- rc = smc_find_rdma_v2_device_serv(new_smc, pclc, ini);
- if (!rc)
+ smc_find_rdma_v2_device_serv(new_smc, pclc, ini);
+ if (ini->smcrv2.ib_dev_v2)
return 0;
- /* skip V1 check if V2 is unavailable for non-Device reason */
- if (rc != SMC_CLC_DECL_NOSMCDEV &&
- rc != SMC_CLC_DECL_NOSMCRDEV &&
- rc != SMC_CLC_DECL_NOSMCDDEV)
- return rc;
-
/* check if RDMA V1 is available */
if (!prfx_rc) {
+ int rc;
+
rc = smc_find_rdma_v1_device_serv(new_smc, pclc, ini);
smc_find_ism_store_rc(rc, ini);
return (!rc) ? 0 : ini->rc;
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2 net] Revert "net/smc: fix listen processing for SMC-Rv2"
2022-05-23 15:07 [PATCH net] Revert "net/smc: fix listen processing for SMC-Rv2" liuyacan
@ 2022-05-23 15:31 ` liuyacan
2022-05-24 8:50 ` Paolo Abeni
0 siblings, 1 reply; 5+ messages in thread
From: liuyacan @ 2022-05-23 15:31 UTC (permalink / raw)
To: liuyacan
Cc: davem, edumazet, kgraul, kuba, linux-kernel, linux-s390, netdev,
pabeni, ubraun
From: liuyacan <liuyacan@corp.netease.com>
This reverts commit 5ec8b414b4381e8714731415fc221ef50a4e7b14.
Some rollback issue will be fixed in other patches in the future.
Link: https://lore.kernel.org/all/20220523055056.2078994-1-liuyacan@corp.netease.com/
Signed-off-by: liuyacan <liuyacan@corp.netease.com>
---
net/smc/af_smc.c | 44 +++++++++++++++++---------------------------
1 file changed, 17 insertions(+), 27 deletions(-)
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index d3de54b70..45a24d242 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -2093,13 +2093,13 @@ static int smc_listen_rdma_reg(struct smc_sock *new_smc, bool local_first)
return 0;
}
-static int smc_find_rdma_v2_device_serv(struct smc_sock *new_smc,
- struct smc_clc_msg_proposal *pclc,
- struct smc_init_info *ini)
+static void smc_find_rdma_v2_device_serv(struct smc_sock *new_smc,
+ struct smc_clc_msg_proposal *pclc,
+ struct smc_init_info *ini)
{
struct smc_clc_v2_extension *smc_v2_ext;
u8 smcr_version;
- int rc = 0;
+ int rc;
if (!(ini->smcr_version & SMC_V2) || !smcr_indicated(ini->smc_type_v2))
goto not_found;
@@ -2117,31 +2117,26 @@ static int smc_find_rdma_v2_device_serv(struct smc_sock *new_smc,
ini->smcrv2.saddr = new_smc->clcsock->sk->sk_rcv_saddr;
ini->smcrv2.daddr = smc_ib_gid_to_ipv4(smc_v2_ext->roce);
rc = smc_find_rdma_device(new_smc, ini);
- if (rc)
+ if (rc) {
+ smc_find_ism_store_rc(rc, ini);
goto not_found;
-
+ }
if (!ini->smcrv2.uses_gateway)
memcpy(ini->smcrv2.nexthop_mac, pclc->lcl.mac, ETH_ALEN);
smcr_version = ini->smcr_version;
ini->smcr_version = SMC_V2;
rc = smc_listen_rdma_init(new_smc, ini);
- if (rc) {
- ini->smcr_version = smcr_version;
- goto not_found;
- }
- rc = smc_listen_rdma_reg(new_smc, ini->first_contact_local);
- if (rc) {
- ini->smcr_version = smcr_version;
- goto not_found;
- }
- return 0;
+ if (!rc)
+ rc = smc_listen_rdma_reg(new_smc, ini->first_contact_local);
+ if (!rc)
+ return;
+ ini->smcr_version = smcr_version;
+ smc_find_ism_store_rc(rc, ini);
not_found:
- rc = rc ?: SMC_CLC_DECL_NOSMCDEV;
ini->smcr_version &= ~SMC_V2;
ini->check_smcrv2 = false;
- return rc;
}
static int smc_find_rdma_v1_device_serv(struct smc_sock *new_smc,
@@ -2174,7 +2169,6 @@ static int smc_listen_find_device(struct smc_sock *new_smc,
struct smc_init_info *ini)
{
int prfx_rc;
- int rc;
/* check for ISM device matching V2 proposed device */
smc_find_ism_v2_device_serv(new_smc, pclc, ini);
@@ -2202,18 +2196,14 @@ static int smc_listen_find_device(struct smc_sock *new_smc,
return ini->rc ?: SMC_CLC_DECL_NOSMCDDEV;
/* check if RDMA V2 is available */
- rc = smc_find_rdma_v2_device_serv(new_smc, pclc, ini);
- if (!rc)
+ smc_find_rdma_v2_device_serv(new_smc, pclc, ini);
+ if (ini->smcrv2.ib_dev_v2)
return 0;
- /* skip V1 check if V2 is unavailable for non-Device reason */
- if (rc != SMC_CLC_DECL_NOSMCDEV &&
- rc != SMC_CLC_DECL_NOSMCRDEV &&
- rc != SMC_CLC_DECL_NOSMCDDEV)
- return rc;
-
/* check if RDMA V1 is available */
if (!prfx_rc) {
+ int rc;
+
rc = smc_find_rdma_v1_device_serv(new_smc, pclc, ini);
smc_find_ism_store_rc(rc, ini);
return (!rc) ? 0 : ini->rc;
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2 net] Revert "net/smc: fix listen processing for SMC-Rv2"
2022-05-23 15:31 ` [PATCH v2 " liuyacan
@ 2022-05-24 8:50 ` Paolo Abeni
2022-05-24 9:02 ` [PATCH v3 " liuyacan
0 siblings, 1 reply; 5+ messages in thread
From: Paolo Abeni @ 2022-05-24 8:50 UTC (permalink / raw)
To: liuyacan
Cc: davem, edumazet, kgraul, kuba, linux-kernel, linux-s390, netdev, ubraun
On Mon, 2022-05-23 at 23:31 +0800, liuyacan@corp.netease.com wrote:
> From: liuyacan <liuyacan@corp.netease.com>
>
> This reverts commit 5ec8b414b4381e8714731415fc221ef50a4e7b14.
It looks like the correct hash is
8c3b8dc5cc9bf6d273ebe18b16e2d6882bcfb36d
>
> Some rollback issue will be fixed in other patches in the future.
Additionally please add an explicit Fixes tag, it will make stable team
life easier, thanks!
Paolo
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v3 net] Revert "net/smc: fix listen processing for SMC-Rv2"
2022-05-24 8:50 ` Paolo Abeni
@ 2022-05-24 9:02 ` liuyacan
2022-05-24 18:50 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 5+ messages in thread
From: liuyacan @ 2022-05-24 9:02 UTC (permalink / raw)
To: pabeni
Cc: davem, edumazet, kgraul, kuba, linux-kernel, linux-s390,
liuyacan, netdev, ubraun
From: liuyacan <liuyacan@corp.netease.com>
This reverts commit 8c3b8dc5cc9bf6d273ebe18b16e2d6882bcfb36d.
Some rollback issue will be fixed in other patches in the future.
Link: https://lore.kernel.org/all/20220523055056.2078994-1-liuyacan@corp.netease.com/
Fixes: 8c3b8dc5cc9b ("net/smc: fix listen processing for SMC-Rv2")
Signed-off-by: liuyacan <liuyacan@corp.netease.com>
---
net/smc/af_smc.c | 44 +++++++++++++++++---------------------------
1 file changed, 17 insertions(+), 27 deletions(-)
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index d3de54b70..45a24d242 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -2093,13 +2093,13 @@ static int smc_listen_rdma_reg(struct smc_sock *new_smc, bool local_first)
return 0;
}
-static int smc_find_rdma_v2_device_serv(struct smc_sock *new_smc,
- struct smc_clc_msg_proposal *pclc,
- struct smc_init_info *ini)
+static void smc_find_rdma_v2_device_serv(struct smc_sock *new_smc,
+ struct smc_clc_msg_proposal *pclc,
+ struct smc_init_info *ini)
{
struct smc_clc_v2_extension *smc_v2_ext;
u8 smcr_version;
- int rc = 0;
+ int rc;
if (!(ini->smcr_version & SMC_V2) || !smcr_indicated(ini->smc_type_v2))
goto not_found;
@@ -2117,31 +2117,26 @@ static int smc_find_rdma_v2_device_serv(struct smc_sock *new_smc,
ini->smcrv2.saddr = new_smc->clcsock->sk->sk_rcv_saddr;
ini->smcrv2.daddr = smc_ib_gid_to_ipv4(smc_v2_ext->roce);
rc = smc_find_rdma_device(new_smc, ini);
- if (rc)
+ if (rc) {
+ smc_find_ism_store_rc(rc, ini);
goto not_found;
-
+ }
if (!ini->smcrv2.uses_gateway)
memcpy(ini->smcrv2.nexthop_mac, pclc->lcl.mac, ETH_ALEN);
smcr_version = ini->smcr_version;
ini->smcr_version = SMC_V2;
rc = smc_listen_rdma_init(new_smc, ini);
- if (rc) {
- ini->smcr_version = smcr_version;
- goto not_found;
- }
- rc = smc_listen_rdma_reg(new_smc, ini->first_contact_local);
- if (rc) {
- ini->smcr_version = smcr_version;
- goto not_found;
- }
- return 0;
+ if (!rc)
+ rc = smc_listen_rdma_reg(new_smc, ini->first_contact_local);
+ if (!rc)
+ return;
+ ini->smcr_version = smcr_version;
+ smc_find_ism_store_rc(rc, ini);
not_found:
- rc = rc ?: SMC_CLC_DECL_NOSMCDEV;
ini->smcr_version &= ~SMC_V2;
ini->check_smcrv2 = false;
- return rc;
}
static int smc_find_rdma_v1_device_serv(struct smc_sock *new_smc,
@@ -2174,7 +2169,6 @@ static int smc_listen_find_device(struct smc_sock *new_smc,
struct smc_init_info *ini)
{
int prfx_rc;
- int rc;
/* check for ISM device matching V2 proposed device */
smc_find_ism_v2_device_serv(new_smc, pclc, ini);
@@ -2202,18 +2196,14 @@ static int smc_listen_find_device(struct smc_sock *new_smc,
return ini->rc ?: SMC_CLC_DECL_NOSMCDDEV;
/* check if RDMA V2 is available */
- rc = smc_find_rdma_v2_device_serv(new_smc, pclc, ini);
- if (!rc)
+ smc_find_rdma_v2_device_serv(new_smc, pclc, ini);
+ if (ini->smcrv2.ib_dev_v2)
return 0;
- /* skip V1 check if V2 is unavailable for non-Device reason */
- if (rc != SMC_CLC_DECL_NOSMCDEV &&
- rc != SMC_CLC_DECL_NOSMCRDEV &&
- rc != SMC_CLC_DECL_NOSMCDDEV)
- return rc;
-
/* check if RDMA V1 is available */
if (!prfx_rc) {
+ int rc;
+
rc = smc_find_rdma_v1_device_serv(new_smc, pclc, ini);
smc_find_ism_store_rc(rc, ini);
return (!rc) ? 0 : ini->rc;
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v3 net] Revert "net/smc: fix listen processing for SMC-Rv2"
2022-05-24 9:02 ` [PATCH v3 " liuyacan
@ 2022-05-24 18:50 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-05-24 18:50 UTC (permalink / raw)
To: None
Cc: pabeni, davem, edumazet, kgraul, kuba, linux-kernel, linux-s390,
netdev, ubraun
Hello:
This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:
On Tue, 24 May 2022 17:02:30 +0800 you wrote:
> From: liuyacan <liuyacan@corp.netease.com>
>
> This reverts commit 8c3b8dc5cc9bf6d273ebe18b16e2d6882bcfb36d.
>
> Some rollback issue will be fixed in other patches in the future.
>
> Link: https://lore.kernel.org/all/20220523055056.2078994-1-liuyacan@corp.netease.com/
>
> [...]
Here is the summary with links:
- [v3,net] Revert "net/smc: fix listen processing for SMC-Rv2"
https://git.kernel.org/netdev/net-next/c/9029ac03f20a
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-05-24 18:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-23 15:07 [PATCH net] Revert "net/smc: fix listen processing for SMC-Rv2" liuyacan
2022-05-23 15:31 ` [PATCH v2 " liuyacan
2022-05-24 8:50 ` Paolo Abeni
2022-05-24 9:02 ` [PATCH v3 " liuyacan
2022-05-24 18:50 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).