From: Trond Myklebust <trondmy@gmail.com>
To: Dave Wysochanski <dwysocha@redhat.com>,
Scott Mayhew <smayhew@redhat.com>
Cc: Chuck Lever <chuck.lever@oracle.com>, linux-nfs@vger.kernel.org
Subject: [PATCH v2 2/3] SUNRPC: Fix a race with XPRT_CONNECTING
Date: Mon, 17 Dec 2018 17:52:34 -0500 [thread overview]
Message-ID: <20181217225235.124448-2-trond.myklebust@hammerspace.com> (raw)
In-Reply-To: <20181217225235.124448-1-trond.myklebust@hammerspace.com>
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>
---
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 4c471b4235ba..f0b3700cec95 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -2090,8 +2090,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);
}
@@ -2327,8 +2327,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.2
next prev parent reply other threads:[~2018-12-17 22:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-17 22:52 [PATCH v2 1/3] SUNRPC: Fix disconnection races Trond Myklebust
2018-12-17 22:52 ` Trond Myklebust [this message]
2018-12-17 22:52 ` [PATCH v2 3/3] SUNRPC: Remove xprt_connect_status() Trond Myklebust
2018-12-18 14:20 ` [PATCH v2 1/3] SUNRPC: Fix disconnection races Scott Mayhew
2018-12-18 15:55 ` Trond Myklebust
2018-12-18 15:59 ` Chuck Lever
2018-12-18 16:02 ` Trond Myklebust
2018-12-18 17:27 ` Chuck Lever
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=20181217225235.124448-2-trond.myklebust@hammerspace.com \
--to=trondmy@gmail.com \
--cc=chuck.lever@oracle.com \
--cc=dwysocha@redhat.com \
--cc=linux-nfs@vger.kernel.org \
--cc=smayhew@redhat.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).