| Message ID | 20200115091023.3187-1-fw@strlen.de |
|---|---|
| State | Accepted, archived |
| Delegated to: | Matthieu Baerts |
| Headers | show |
| Series | [v2] protocol: add comment to smb mb | expand |
On Wed, 15 Jan 2020, Florian Westphal wrote: > squashto: mptcp: add subflow write space signalling and mptcp_poll > > v2: also add comment to subflow_write_space. > Thanks Florian. Looks ready to merge. Mat > Signed-off-by: Florian Westphal <fw@strlen.de> > --- > 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, struct 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 > _______________________________________________ > mptcp mailing list -- mptcp@lists.01.org > To unsubscribe send an email to mptcp-leave@lists.01.org > -- Mat Martineau Intel
Hi Florian, Mat, On 15/01/2020 16:46, Mat Martineau wrote: > On Wed, 15 Jan 2020, Florian Westphal wrote: > >> squashto: mptcp: add subflow write space signalling and mptcp_poll >> >> v2: also add comment to subflow_write_space. >> > > Thanks Florian. Looks ready to merge. Thank you for the patch and the review! - b3f03b0dab3b: "squashed" in "mptcp: add subflow write space signalling and mptcp_poll" - 91800c0574b2..57d9c1d91acd: result Tests + export are in progress Cheers, Matt
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, struct 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); } }
squashto: mptcp: add subflow write space signalling and mptcp_poll v2: also add comment to subflow_write_space. Signed-off-by: Florian Westphal <fw@strlen.de> --- net/mptcp/protocol.c | 1 + net/mptcp/subflow.c | 1 + 2 files changed, 2 insertions(+)