From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Trond Myklebust <trond.myklebust@hammerspace.com>,
Sasha Levin <sashal@kernel.org>,
linux-nfs@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 4.4 15/21] SUNRPC: Fix a race with XPRT_CONNECTING
Date: Wed, 26 Dec 2018 17:54:53 -0500 [thread overview]
Message-ID: <20181226225501.151365-15-sashal@kernel.org> (raw)
In-Reply-To: <20181226225501.151365-1-sashal@kernel.org>
From: Trond Myklebust <trond.myklebust@hammerspace.com>
[ Upstream commit cf76785d30712d90185455e752337acdb53d2a5d ]
Ensure that we clear XPRT_CONNECTING before releasing the XPRT_LOCK so that
we don't have races between the (asynchronous) socket setup code and
tasks in xprt_connect().
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Tested-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
net/sunrpc/xprtsock.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index c9c0976d3bbb..5047c20f4306 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -2200,8 +2200,8 @@ static void xs_udp_setup_socket(struct work_struct *work)
trace_rpc_socket_connect(xprt, sock, 0);
status = 0;
out:
- xprt_unlock_connect(xprt, transport);
xprt_clear_connecting(xprt);
+ xprt_unlock_connect(xprt, transport);
xprt_wake_pending_tasks(xprt, status);
}
@@ -2374,8 +2374,8 @@ static void xs_tcp_setup_socket(struct work_struct *work)
}
status = -EAGAIN;
out:
- xprt_unlock_connect(xprt, transport);
xprt_clear_connecting(xprt);
+ xprt_unlock_connect(xprt, transport);
xprt_wake_pending_tasks(xprt, status);
}
--
2.19.1
next prev parent reply other threads:[~2018-12-26 22:58 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-26 22:54 [PATCH AUTOSEL 4.4 01/21] powerpc: Fix COFF zImage booting on old powermacs Sasha Levin
2018-12-26 22:54 ` [PATCH AUTOSEL 4.4 02/21] ARM: imx: update the cpu power up timing setting on i.mx6sx Sasha Levin
2018-12-26 22:54 ` [PATCH AUTOSEL 4.4 03/21] Input: restore EV_ABS ABS_RESERVED Sasha Levin
2018-12-26 22:54 ` [PATCH AUTOSEL 4.4 04/21] checkstack.pl: fix for aarch64 Sasha Levin
2018-12-26 22:54 ` [PATCH AUTOSEL 4.4 05/21] xfrm: Fix bucket count reported to userspace Sasha Levin
2018-12-26 22:54 ` [PATCH AUTOSEL 4.4 06/21] scsi: bnx2fc: Fix NULL dereference in error handling Sasha Levin
2018-12-26 22:54 ` [PATCH AUTOSEL 4.4 07/21] Input: omap-keypad - fix idle configuration to not block SoC idle states Sasha Levin
2018-12-26 22:54 ` [PATCH AUTOSEL 4.4 08/21] USB: hso: Fix OOB memory access in hso_probe/hso_get_config_data Sasha Levin
2018-12-26 22:54 ` [PATCH AUTOSEL 4.4 09/21] bnx2x: Clear fip MAC when fcoe offload support is disabled Sasha Levin
2018-12-26 22:54 ` [PATCH AUTOSEL 4.4 10/21] w90p910_ether: remove incorrect __init annotation Sasha Levin
2018-12-26 22:54 ` [PATCH AUTOSEL 4.4 11/21] net: hns: Incorrect offset address used for some registers Sasha Levin
2018-12-26 22:54 ` [PATCH AUTOSEL 4.4 12/21] net: hns: Fixed bug that netdev was opened twice Sasha Levin
2018-12-26 22:54 ` [PATCH AUTOSEL 4.4 13/21] net: hns: Avoid net reset caused by pause frames storm Sasha Levin
2018-12-26 22:54 ` [PATCH AUTOSEL 4.4 14/21] net: hns: Add mac pcs config when enable|disable mac Sasha Levin
2018-12-26 22:54 ` Sasha Levin [this message]
2018-12-26 22:54 ` [PATCH AUTOSEL 4.4 16/21] x86/mtrr: Don't copy uninitialized gentry fields back to userspace Sasha Levin
2018-12-26 22:54 ` [PATCH AUTOSEL 4.4 17/21] lan78xx: Resolve issue with changing MAC address Sasha Levin
2018-12-26 22:54 ` [PATCH AUTOSEL 4.4 18/21] xen/netfront: tolerate frags with no data Sasha Levin
2018-12-26 22:54 ` [PATCH AUTOSEL 4.4 19/21] vxge: ensure data0 is initialized in when fetching firmware version information Sasha Levin
2018-12-26 22:54 ` [PATCH AUTOSEL 4.4 20/21] net: netxen: fix a missing check and an uninitialized use Sasha Levin
2018-12-26 22:54 ` [PATCH AUTOSEL 4.4 21/21] serial/sunsu: fix refcount leak Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181226225501.151365-15-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=trond.myklebust@hammerspace.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).