Content-Type: multipart/mixed; boundary="===============6942119162381701094==" MIME-Version: 1.0 From: Florian Westphal To: mptcp at lists.01.org Subject: [MPTCP] [PATCH v2] protocol: add comment to smb mb Date: Wed, 15 Jan 2020 10:10:23 +0100 Message-ID: <20200115091023.3187-1-fw@strlen.de> X-Status: X-Keywords: X-UID: 3361 --===============6942119162381701094== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable squashto: mptcp: add subflow write space signalling and mptcp_poll v2: also add comment to subflow_write_space. Signed-off-by: Florian Westphal --- net/mptcp/protocol.c | 1 + net/mptcp/subflow.c | 1 + 2 files changed, 2 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 6df4eb20916c..5dfca0aa7ce4 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -547,6 +547,7 @@ static void ssk_check_wmem(struct mptcp_sock *msk, stru= ct sock *ssk) if (sock) { clear_bit(MPTCP_SEND_SPACE, &msk->flags); smp_mb__after_atomic(); + /* set NOSPACE only after clearing SEND_SPACE flag */ set_bit(SOCK_NOSPACE, &sock->flags); } } diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index ae9173040f17..3461789ee605 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -727,6 +727,7 @@ static void subflow_write_space(struct sock *sk) if (parent && sk_stream_is_writeable(sk)) { set_bit(MPTCP_SEND_SPACE, &mptcp_sk(parent)->flags); smp_mb__after_atomic(); + /* set SEND_SPACE before sk_stream_write_space clears NOSPACE */ sk_stream_write_space(parent); } } -- = 2.24.1 --===============6942119162381701094==--