| Message ID | ce612a158a171e421dda4f08bcb99894bb7c2991.1617703144.git.geliangtang@gmail.com |
|---|---|
| State | Accepted, archived |
| Commit | 2f4679e077b646bbbd36ecf7bdf5c7b1a7e928a3 |
| Delegated to: | Matthieu Baerts |
| Headers | show |
| Series | mptcp_for_each_* cleanups | expand |
Hi Mat, I think this cleanup patch is still valid, isn't it? Thanks. -Geliang Geliang Tang <geliangtang@gmail.com> 于2021年4月6日周二 下午6:03写道： > > This patch used the macro helper mptcp_for_each_subflow() instead of > list_for_each_entry() in mptcp_close. > > Signed-off-by: Geliang Tang <geliangtang@gmail.com> > --- > net/mptcp/protocol.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c > index 2d895c3c8746..3b7d1df8d019 100644 > --- a/net/mptcp/protocol.c > +++ b/net/mptcp/protocol.c > @@ -2581,7 +2581,7 @@ static void mptcp_close(struct sock *sk, long timeout) > cleanup: > /* orphan all the subflows */ > inet_csk(sk)->icsk_mtup.probe_timestamp = tcp_jiffies32; > - list_for_each_entry(subflow, &mptcp_sk(sk)->conn_list, node) { > + mptcp_for_each_subflow(mptcp_sk(sk), subflow) { > struct sock *ssk = mptcp_subflow_tcp_sock(subflow); > bool slow = lock_sock_fast(ssk); > > -- > 2.30.2 >
On Tue, 6 Apr 2021, Geliang Tang wrote: > This patch used the macro helper mptcp_for_each_subflow() instead of > list_for_each_entry() in mptcp_close. > > Signed-off-by: Geliang Tang <geliangtang@gmail.com> > --- > net/mptcp/protocol.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Thanks for the reminder Geliang. Yes, this patch is good! Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com> > diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c > index 2d895c3c8746..3b7d1df8d019 100644 > --- a/net/mptcp/protocol.c > +++ b/net/mptcp/protocol.c > @@ -2581,7 +2581,7 @@ static void mptcp_close(struct sock *sk, long timeout) > cleanup: > /* orphan all the subflows */ > inet_csk(sk)->icsk_mtup.probe_timestamp = tcp_jiffies32; > - list_for_each_entry(subflow, &mptcp_sk(sk)->conn_list, node) { > + mptcp_for_each_subflow(mptcp_sk(sk), subflow) { > struct sock *ssk = mptcp_subflow_tcp_sock(subflow); > bool slow = lock_sock_fast(ssk); > > -- > 2.30.2 -- Mat Martineau Intel
Hi Geliang, Mat, On 08/04/2021 23:14, Mat Martineau wrote: > On Tue, 6 Apr 2021, Geliang Tang wrote: > >> This patch used the macro helper mptcp_for_each_subflow() instead of >> list_for_each_entry() in mptcp_close. >> >> Signed-off-by: Geliang Tang <geliangtang@gmail.com> >> --- >> net/mptcp/protocol.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> > > Thanks for the reminder Geliang. Yes, this patch is good! Thank you for the patch and the review! Just applied in our tree: - 2f4679e077b6: mptcp: use mptcp_for_each_subflow in mptcp_close - Results: 04d87efa6919..f90b3d445732 Cheers, Matt
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 2d895c3c8746..3b7d1df8d019 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2581,7 +2581,7 @@ static void mptcp_close(struct sock *sk, long timeout) cleanup: /* orphan all the subflows */ inet_csk(sk)->icsk_mtup.probe_timestamp = tcp_jiffies32; - list_for_each_entry(subflow, &mptcp_sk(sk)->conn_list, node) { + mptcp_for_each_subflow(mptcp_sk(sk), subflow) { struct sock *ssk = mptcp_subflow_tcp_sock(subflow); bool slow = lock_sock_fast(ssk);
This patch used the macro helper mptcp_for_each_subflow() instead of list_for_each_entry() in mptcp_close. Signed-off-by: Geliang Tang <geliangtang@gmail.com> --- net/mptcp/protocol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)