[PATCH net v3] net/smc: Don't call clcsock shutdown twice when smc shutdown

[PATCH net v3] net/smc: Don't call clcsock shutdown twice when smc shutdown

[Tony Lu]

When applications call shutdown() with SHUT_RDWR in userspace,
smc_close_active() calls kernel_sock_shutdown(), and it is called
twice in smc_shutdown().

This fixes this by checking sk_state before do clcsock shutdown, and
avoids missing the application's call of smc_shutdown().

Link: https://lore.kernel.org/linux-s390/1f67548e-cbf6-0dce-82b5-10288a4583bd@linux.ibm.com/
Fixes: 606a63c9783a ("net/smc: Ensure the active closing peer first closes clcsock")
Signed-off-by: Tony Lu <tonylu@linux.alibaba.com>
Reviewed-by: Wen Gu <guwen@linux.alibaba.com>
---

changes:

v2->v3:
- code format

v1->v2:
- code format
- use bool do_shutdown

---
 net/smc/af_smc.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 4b62c925a13e..230072f9ec48 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -2370,8 +2370,10 @@ static __poll_t smc_poll(struct file *file, struct socket *sock,
 static int smc_shutdown(struct socket *sock, int how)
 {
 	struct sock *sk = sock->sk;
+	bool do_shutdown = true;
 	struct smc_sock *smc;
 	int rc = -EINVAL;
+	int old_state;
 	int rc1 = 0;
 
 	smc = smc_sk(sk);
@@ -2398,7 +2400,11 @@ static int smc_shutdown(struct socket *sock, int how)
 	}
 	switch (how) {
 	case SHUT_RDWR:		/* shutdown in both directions */
+		old_state = sk->sk_state;
 		rc = smc_close_active(smc);
+		if (old_state == SMC_ACTIVE &&
+		    sk->sk_state == SMC_PEERCLOSEWAIT1)
+			do_shutdown = false;
 		break;
 	case SHUT_WR:
 		rc = smc_close_shutdown_write(smc);
@@ -2408,7 +2414,7 @@ static int smc_shutdown(struct socket *sock, int how)
 		/* nothing more to do because peer is not involved */
 		break;
 	}
-	if (smc->clcsock)
+	if (do_shutdown && smc->clcsock)
 		rc1 = kernel_sock_shutdown(smc->clcsock, how);
 	/* map sock_shutdown_cmd constants to sk_shutdown value range */
 	sk->sk_shutdown |= how + 1;
-- 
2.32.0.3.g01195cf9f

Re: [PATCH net v3] net/smc: Don't call clcsock shutdown twice when smc shutdown

[Karsten Graul]

On 26/11/2021 03:41, Tony Lu wrote:
> When applications call shutdown() with SHUT_RDWR in userspace,
> smc_close_active() calls kernel_sock_shutdown(), and it is called
> twice in smc_shutdown().
> 
> This fixes this by checking sk_state before do clcsock shutdown, and
> avoids missing the application's call of smc_shutdown().
> 
> Link: https://lore.kernel.org/linux-s390/1f67548e-cbf6-0dce-82b5-10288a4583bd@linux.ibm.com/
> Fixes: 606a63c9783a ("net/smc: Ensure the active closing peer first closes clcsock")
> Signed-off-by: Tony Lu <tonylu@linux.alibaba.com>
> Reviewed-by: Wen Gu <guwen@linux.alibaba.com>
> ---

Acked-by: Karsten Graul <kgraul@linux.ibm.com>

Re: [PATCH net v3] net/smc: Don't call clcsock shutdown twice when smc shutdown

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <kuba@kernel.org>:

On Fri, 26 Nov 2021 10:41:35 +0800 you wrote:
> When applications call shutdown() with SHUT_RDWR in userspace,
> smc_close_active() calls kernel_sock_shutdown(), and it is called
> twice in smc_shutdown().
> 
> This fixes this by checking sk_state before do clcsock shutdown, and
> avoids missing the application's call of smc_shutdown().
> 
> [...]

Here is the summary with links:
  - [net,v3] net/smc: Don't call clcsock shutdown twice when smc shutdown
    https://git.kernel.org/netdev/net/c/bacb6c1e4769

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html