From: Mat Martineau <mathew.j.martineau@linux.intel.com>
To: netdev@vger.kernel.org
Cc: Florian Westphal <fw@strlen.de>,
davem@davemloft.net, kuba@kernel.org, mptcp@lists.01.org,
matthieu.baerts@tessares.net,
Mat Martineau <mathew.j.martineau@linux.intel.com>
Subject: [PATCH net-next 6/8] mptcp: avoid lock_fast usage in accept path
Date: Fri, 12 Feb 2021 15:59:59 -0800 [thread overview]
Message-ID: <20210213000001.379332-7-mathew.j.martineau@linux.intel.com> (raw)
In-Reply-To: <20210213000001.379332-1-mathew.j.martineau@linux.intel.com>
From: Florian Westphal <fw@strlen.de>
Once event support is added this may need to allocate memory while msk
lock is held with softirqs disabled.
Not using lock_fast also allows to do the allocation with GFP_KERNEL.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
net/mptcp/protocol.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 56240b87d464..fe6da1b77723 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -3260,9 +3260,8 @@ static int mptcp_stream_accept(struct socket *sock, struct socket *newsock,
struct mptcp_sock *msk = mptcp_sk(newsock->sk);
struct mptcp_subflow_context *subflow;
struct sock *newsk = newsock->sk;
- bool slowpath;
- slowpath = lock_sock_fast(newsk);
+ lock_sock(newsk);
/* PM/worker can now acquire the first subflow socket
* lock without racing with listener queue cleanup,
@@ -3288,7 +3287,7 @@ static int mptcp_stream_accept(struct socket *sock, struct socket *newsock,
if (!ssk->sk_socket)
mptcp_sock_graft(ssk, newsock);
}
- unlock_sock_fast(newsk, slowpath);
+ release_sock(newsk);
}
if (inet_csk_listen_poll(ssock->sk))
--
2.30.1
next prev parent reply other threads:[~2021-02-13 0:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-12 23:59 [PATCH net-next 0/8] mptcp: Add genl events for connection info Mat Martineau
2021-02-12 23:59 ` [PATCH net-next 1/8] mptcp: move pm netlink work into pm_netlink Mat Martineau
2021-02-12 23:59 ` [PATCH net-next 2/8] mptcp: split __mptcp_close_ssk helper Mat Martineau
2021-02-12 23:59 ` [PATCH net-next 3/8] mptcp: schedule worker when subflow is closed Mat Martineau
2021-02-12 23:59 ` [PATCH net-next 4/8] mptcp: move subflow close loop after sk close check Mat Martineau
2021-02-12 23:59 ` [PATCH net-next 5/8] mptcp: pass subflow socket to a few helpers Mat Martineau
2021-02-12 23:59 ` Mat Martineau [this message]
2021-02-13 0:00 ` [PATCH net-next 8/8] mptcp: add netlink event support Mat Martineau
2021-02-13 4:46 ` [PATCH net-next 0/8] mptcp: Add genl events for connection info Mat Martineau
2021-02-13 4:52 ` Mat Martineau
2021-02-13 22:23 ` David Miller
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=20210213000001.379332-7-mathew.j.martineau@linux.intel.com \
--to=mathew.j.martineau@linux.intel.com \
--cc=davem@davemloft.net \
--cc=fw@strlen.de \
--cc=kuba@kernel.org \
--cc=matthieu.baerts@tessares.net \
--cc=mptcp@lists.01.org \
--cc=netdev@vger.kernel.org \
/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).