Skip to content

Commit 606a63c

Browse files
Tony Ludavem330
authored andcommitted
net/smc: Ensure the active closing peer first closes clcsock
The side that actively closed socket, it's clcsock doesn't enter TIME_WAIT state, but the passive side does it. It should show the same behavior as TCP sockets. Consider this, when client actively closes the socket, the clcsock in server enters TIME_WAIT state, which means the address is occupied and won't be reused before TIME_WAIT dismissing. If we restarted server, the service would be unavailable for a long time. To solve this issue, shutdown the clcsock in [A], perform the TCP active close progress first, before the passive closed side closing it. So that the actively closed side enters TIME_WAIT, not the passive one. Client | Server close() // client actively close | smc_release() | smc_close_active() // PEERCLOSEWAIT1 | smc_close_final() // abort or closed = 1| smc_cdc_get_slot_and_msg_send() | [A] | |smc_cdc_msg_recv_action() // ACTIVE | queue_work(smc_close_wq, &conn->close_work) | smc_close_passive_work() // PROCESSABORT or APPCLOSEWAIT1 | smc_close_passive_abort_received() // only in abort | |close() // server recv zero, close | smc_release() // PROCESSABORT or APPCLOSEWAIT1 | smc_close_active() | smc_close_abort() or smc_close_final() // CLOSED | smc_cdc_get_slot_and_msg_send() // abort or closed = 1 smc_cdc_msg_recv_action() | smc_clcsock_release() queue_work(smc_close_wq, &conn->close_work) | sock_release(tcp) // actively close clc, enter TIME_WAIT smc_close_passive_work() // PEERCLOSEWAIT1 | smc_conn_free() smc_close_passive_abort_received() // CLOSED| smc_conn_free() | smc_clcsock_release() | sock_release(tcp) // passive close clc | Link: https://www.spinics.net/lists/netdev/msg780407.html Fixes: b38d732 ("smc: socket closing and linkgroup cleanup") Signed-off-by: Tony Lu <[email protected]> Reviewed-by: Wen Gu <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 45c3ff7 commit 606a63c

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

net/smc/smc_close.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,12 @@ int smc_close_active(struct smc_sock *smc)
228228
/* send close request */
229229
rc = smc_close_final(conn);
230230
sk->sk_state = SMC_PEERCLOSEWAIT1;
231+
232+
/* actively shutdown clcsock before peer close it,
233+
* prevent peer from entering TIME_WAIT state.
234+
*/
235+
if (smc->clcsock && smc->clcsock->sk)
236+
rc = kernel_sock_shutdown(smc->clcsock, SHUT_RDWR);
231237
} else {
232238
/* peer event has changed the state */
233239
goto again;

0 commit comments

Comments
 (0)