Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79234c3d authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Lock the transport layer on shutdown 



Avoid all races with the connect/disconnect handlers by taking the
transport lock.

Reported-by: default avatar"Suzuki K. Poulose" <suzuki.poulose@arm.com>
Acked-by: default avatarJeff Layton <jlayton@poochiereds.net>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 3ec0c979

net/sunrpc/xprt.c

+6 −0
Original line number Diff line number Diff line
@@ -614,6 +614,7 @@ static void xprt_autoclose(struct work_struct *work) 
	clear_bit(XPRT_CLOSE_WAIT, &xprt->state);

	xprt->ops->close(xprt);

	xprt_release_write(xprt, NULL);

	wake_up_bit(&xprt->state, XPRT_LOCKED);

}



/**
@@ -723,6 +724,7 @@ void xprt_unlock_connect(struct rpc_xprt *xprt, void *cookie) 
	xprt->ops->release_xprt(xprt, NULL);

out:

	spin_unlock_bh(&xprt->transport_lock);

	wake_up_bit(&xprt->state, XPRT_LOCKED);

}



/**
@@ -1394,6 +1396,10 @@ struct rpc_xprt *xprt_create_transport(struct xprt_create *args) 
static void xprt_destroy(struct rpc_xprt *xprt)

{

	dprintk("RPC:       destroying transport %p\n", xprt);



	/* Exclude transport connect/disconnect handlers */

	wait_on_bit_lock(&xprt->state, XPRT_LOCKED, TASK_UNINTERRUPTIBLE);



	del_timer_sync(&xprt->timer);



	rpc_xprt_debugfs_unregister(xprt);