Message ID | 41407581af582a6cb0d4e8a5e46c7af7d54b06d3.1607009691.git.pabeni@redhat.com |
---|---|
State | Accepted, archived |
Commit | db246e6ed6b24eb78a622af5a7db0048d50add6f |
Delegated to: | Matthieu Baerts |
Headers | show |
Series | [net-next] mptcp: pm: simplify select_local_address() | expand |
On Thu, 3 Dec 2020, Paolo Abeni wrote: > There is no need to unconditionally acquire the join list > lock, we can simply splice the join list into the subflow > list and traverse only the latter. > > Signed-off-by: Paolo Abeni <pabeni@redhat.com> > --- > net/mptcp/pm_netlink.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c > index 5151cfcd6962..e34a0d57947d 100644 > --- a/net/mptcp/pm_netlink.c > +++ b/net/mptcp/pm_netlink.c > @@ -135,7 +135,7 @@ select_local_address(const struct pm_nl_pernet *pernet, > struct mptcp_pm_addr_entry *entry, *ret = NULL; > > rcu_read_lock(); > - spin_lock_bh(&msk->join_list_lock); > + __mptcp_flush_join_list(msk); > list_for_each_entry_rcu(entry, &pernet->local_addr_list, list) { > if (!(entry->addr.flags & MPTCP_PM_ADDR_FLAG_SUBFLOW)) > continue; > @@ -144,13 +144,11 @@ select_local_address(const struct pm_nl_pernet *pernet, > * pending join > */ > if (entry->addr.family == ((struct sock *)msk)->sk_family && > - !lookup_subflow_by_saddr(&msk->conn_list, &entry->addr) && > - !lookup_subflow_by_saddr(&msk->join_list, &entry->addr)) { > + !lookup_subflow_by_saddr(&msk->conn_list, &entry->addr)) { > ret = entry; > break; > } > } > - spin_unlock_bh(&msk->join_list_lock); > rcu_read_unlock(); > return ret; > } > -- > 2.26.2 Thanks Paolo, looks good. Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com> -- Mat Martineau Intel
Hi Paolo, Mat, On 03/12/2020 16:35, Paolo Abeni wrote: > There is no need to unconditionally acquire the join list > lock, we can simply splice the join list into the subflow > list and traverse only the latter. Thank you for the patch and the review! - db246e6ed6b2: mptcp: pm: simplify select_local_address() - With Mat's Reviewed-by tag - Applied at the top. - Results: 8f87392aa646..95b2727396d3 Tests + export will be started soon Cheers, Matt
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 5151cfcd6962..e34a0d57947d 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -135,7 +135,7 @@ select_local_address(const struct pm_nl_pernet *pernet, struct mptcp_pm_addr_entry *entry, *ret = NULL; rcu_read_lock(); - spin_lock_bh(&msk->join_list_lock); + __mptcp_flush_join_list(msk); list_for_each_entry_rcu(entry, &pernet->local_addr_list, list) { if (!(entry->addr.flags & MPTCP_PM_ADDR_FLAG_SUBFLOW)) continue; @@ -144,13 +144,11 @@ select_local_address(const struct pm_nl_pernet *pernet, * pending join */ if (entry->addr.family == ((struct sock *)msk)->sk_family && - !lookup_subflow_by_saddr(&msk->conn_list, &entry->addr) && - !lookup_subflow_by_saddr(&msk->join_list, &entry->addr)) { + !lookup_subflow_by_saddr(&msk->conn_list, &entry->addr)) { ret = entry; break; } } - spin_unlock_bh(&msk->join_list_lock); rcu_read_unlock(); return ret; }
There is no need to unconditionally acquire the join list lock, we can simply splice the join list into the subflow list and traverse only the latter. Signed-off-by: Paolo Abeni <pabeni@redhat.com> --- net/mptcp/pm_netlink.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)