From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:48341 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752918AbbIZQ5F (ORCPT ); Sat, 26 Sep 2015 12:57:05 -0400 Subject: Patch "SUNRPC: Lock the transport layer on shutdown" has been added to the 4.1-stable tree To: trond.myklebust@primarydata.com, gregkh@linuxfoundation.org, jlayton@poochiereds.net, suzuki.poulose@arm.com Cc: , From: Date: Sat, 26 Sep 2015 09:57:03 -0700 Message-ID: <144328662368198@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled SUNRPC: Lock the transport layer on shutdown to the 4.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: sunrpc-lock-the-transport-layer-on-shutdown.patch and it can be found in the queue-4.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 79234c3db6842a3de03817211d891e0c2878f756 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Fri, 18 Sep 2015 15:53:24 -0400 Subject: SUNRPC: Lock the transport layer on shutdown From: Trond Myklebust commit 79234c3db6842a3de03817211d891e0c2878f756 upstream. Avoid all races with the connect/disconnect handlers by taking the transport lock. Reported-by:"Suzuki K. Poulose" Acked-by: Jeff Layton Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman --- net/sunrpc/xprt.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -611,6 +611,7 @@ static void xprt_autoclose(struct work_s xprt->ops->close(xprt); clear_bit(XPRT_CLOSE_WAIT, &xprt->state); xprt_release_write(xprt, NULL); + wake_up_bit(&xprt->state, XPRT_LOCKED); } /** @@ -720,6 +721,7 @@ void xprt_unlock_connect(struct rpc_xprt xprt->ops->release_xprt(xprt, NULL); out: spin_unlock_bh(&xprt->transport_lock); + wake_up_bit(&xprt->state, XPRT_LOCKED); } /** @@ -1389,6 +1391,10 @@ out: 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); Patches currently in stable-queue which might be from trond.myklebust@primarydata.com are queue-4.1/nfs41-flexfiles-zero-out-ds-write-wcc.patch queue-4.1/nfs-nfs_set_pgio_error-sometimes-misses-errors.patch queue-4.1/nfs-fix-a-null-pointer-dereference-of-migration-recovery-ops-for-v4.2-client.patch queue-4.1/sunrpc-xs_reset_transport-must-mark-the-connection-as-disconnected.patch queue-4.1/sunrpc-lock-the-transport-layer-on-shutdown.patch queue-4.1/nfs-don-t-let-the-ctime-override-attribute-barriers.patch queue-4.1/sunrpc-fix-a-thinko-in-xs_connect.patch queue-4.1/nfsv4-don-t-set-setattr-for-o_rdonly-o_excl.patch queue-4.1/nfs41-flexfiles-update-inode-after-write-finishes.patch queue-4.1/nfsv4.1-pnfs-fix-borken-function-_same_data_server_addrs_locked.patch queue-4.1/nfsv4-force-a-post-op-attribute-update-when-holding-a-delegation.patch queue-4.1/nfsv4-pnfs-ensure-we-don-t-miss-a-file-extension.patch queue-4.1/nfsv4.1-flexfiles-fix-a-protocol-error-in-layoutreturn.patch queue-4.1/revert-nfsv4-remove-incorrect-check-in-can_open_delegated.patch queue-4.1/sunrpc-ensure-that-we-wait-for-connections-to-complete-before-retrying.patch queue-4.1/nfsv4.1-fix-a-protocol-issue-with-close-stateids.patch