Re: [PATCH mptcp-next] mptcp: add mptcp_for_each_subflow_safe helper

[Mat Martineau <mathew.j.martineau@linux.intel.com>]

On Tue, 12 Jul 2022, Matthieu Baerts wrote:

> Similar to mptcp_for_each_subflow(): this is clearer now that the _safe
> version is used in multiple places.
>
> Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>

Looks good to me, thanks Matthieu

Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>

> ---
> net/mptcp/pm_netlink.c | 2 +-
> net/mptcp/protocol.c   | 6 +++---
> net/mptcp/protocol.h   | 2 ++
> 3 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
> index 291b5da42fdb..62471aaedb6d 100644
> --- a/net/mptcp/pm_netlink.c
> +++ b/net/mptcp/pm_netlink.c
> @@ -796,7 +796,7 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp_sock *msk,
> 		u8 rm_id = rm_list->ids[i];
> 		bool removed = false;
>
> -		list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node) {
> +		mptcp_for_each_subflow_safe(msk, subflow, tmp) {
> 			struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
> 			int how = RCV_SHUTDOWN | SEND_SHUTDOWN;
> 			u8 id = subflow->local_id;
> diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
> index c92f91cb2c8d..48fdef304309 100644
> --- a/net/mptcp/protocol.c
> +++ b/net/mptcp/protocol.c
> @@ -2338,7 +2338,7 @@ static void __mptcp_close_subflow(struct mptcp_sock *msk)
>
> 	might_sleep();
>
> -	list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node) {
> +	mptcp_for_each_subflow_safe(msk, subflow, tmp) {
> 		struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
>
> 		if (inet_sk_state_load(ssk) != TCP_CLOSE)
> @@ -2381,7 +2381,7 @@ static void mptcp_check_fastclose(struct mptcp_sock *msk)
>
> 	mptcp_token_destroy(msk);
>
> -	list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node) {
> +	mptcp_for_each_subflow_safe(msk, subflow, tmp) {
> 		struct sock *tcp_sk = mptcp_subflow_tcp_sock(subflow);
> 		bool slow;
>
> @@ -2886,7 +2886,7 @@ static int mptcp_disconnect(struct sock *sk, int flags)
>
> 	inet_sk_state_store(sk, TCP_CLOSE);
>
> -	list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node) {
> +	mptcp_for_each_subflow_safe(msk, subflow, tmp) {
> 		struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
>
> 		__mptcp_close_ssk(sk, ssk, subflow, MPTCP_CF_FASTCLOSE);
> diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
> index b9333e7f380a..13b76f86f749 100644
> --- a/net/mptcp/protocol.h
> +++ b/net/mptcp/protocol.h
> @@ -315,6 +315,8 @@ struct mptcp_sock {
>
> #define mptcp_for_each_subflow(__msk, __subflow)			\
> 	list_for_each_entry(__subflow, &((__msk)->conn_list), node)
> +#define mptcp_for_each_subflow_safe(__msk, __subflow, __tmp)			\
> +	list_for_each_entry_safe(__subflow, __tmp, &((__msk)->conn_list), node)
>
> static inline void msk_owned_by_me(const struct mptcp_sock *msk)
> {
> -- 
> 2.36.1
>
>
>

--
Mat Martineau
Intel