Skip to content

Commit b0aa92a

Browse files
metze-sambasmfrench
authored andcommitted
smb: client: make sure smbd_disconnect_rdma_work() doesn't run after smbd_destroy() took over
If we're already disconnecting we don't need to queue the disconnect_work again. disable_work() turns the next queue_work() into a no-op. Also let smbd_destroy() cancel(and disable) queued disconnect_work and call smbd_disconnect_rdma_work() inline. The makes it more obvious that disconnect_work is never queued again after smbd_destroy() called smbd_disconnect_rdma_work(). It also means we have a single place to call rdma_disconnect(). While there we better also disable all other [delayed_]work. Cc: Steve French <smfrench@gmail.com> Cc: Tom Talpey <tom@talpey.com> Cc: Long Li <longli@microsoft.com> Cc: linux-cifs@vger.kernel.org Cc: samba-technical@lists.samba.org Acked-by: Namjae Jeon <linkinjeon@kernel.org> Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent 9b1a6b7 commit b0aa92a

File tree

1 file changed

+19
-2
lines changed

1 file changed

+19
-2
lines changed

fs/smb/client/smbdirect.c

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,18 @@ static void smbd_disconnect_rdma_work(struct work_struct *work)
159159
{
160160
struct smbdirect_socket *sc =
161161
container_of(work, struct smbdirect_socket, disconnect_work);
162+
struct smbd_connection *info =
163+
container_of(sc, struct smbd_connection, socket);
164+
165+
/*
166+
* make sure this and other work is not queued again
167+
* but here we don't block and avoid
168+
* disable[_delayed]_work_sync()
169+
*/
170+
disable_work(&sc->disconnect_work);
171+
disable_work(&info->post_send_credits_work);
172+
disable_work(&info->mr_recovery_work);
173+
disable_delayed_work(&info->idle_timer_work);
162174

163175
switch (sc->status) {
164176
case SMBDIRECT_SOCKET_NEGOTIATE_NEEDED:
@@ -342,11 +354,13 @@ static int smbd_conn_upcall(
342354
if (sc->status == SMBDIRECT_SOCKET_NEGOTIATE_FAILED) {
343355
log_rdma_event(ERR, "event=%s during negotiation\n", event_name);
344356
sc->status = SMBDIRECT_SOCKET_DISCONNECTED;
357+
smbd_disconnect_rdma_work(&sc->disconnect_work);
345358
wake_up_all(&sc->status_wait);
346359
break;
347360
}
348361

349362
sc->status = SMBDIRECT_SOCKET_DISCONNECTED;
363+
smbd_disconnect_rdma_work(&sc->disconnect_work);
350364
wake_up_all(&sc->status_wait);
351365
wake_up_all(&sc->recv_io.reassembly.wait_queue);
352366
wake_up_all(&sc->send_io.credits.wait_queue);
@@ -1483,9 +1497,12 @@ void smbd_destroy(struct TCP_Server_Info *server)
14831497
sc = &info->socket;
14841498
sp = &sc->parameters;
14851499

1500+
log_rdma_event(INFO, "cancelling and disable disconnect_work\n");
1501+
disable_work_sync(&sc->disconnect_work);
1502+
14861503
log_rdma_event(INFO, "destroying rdma session\n");
1487-
if (sc->status != SMBDIRECT_SOCKET_DISCONNECTED) {
1488-
rdma_disconnect(sc->rdma.cm_id);
1504+
if (sc->status < SMBDIRECT_SOCKET_DISCONNECTING) {
1505+
smbd_disconnect_rdma_work(&sc->disconnect_work);
14891506
log_rdma_event(INFO, "wait for transport being disconnected\n");
14901507
wait_event_interruptible(
14911508
sc->status_wait,

0 commit comments

Comments
 (0)