mptcp.lists.linux.dev archive mirror
 help / color / mirror / Atom feed
From: Paolo Abeni <pabeni@redhat.com>
To: wujianguo106@163.com, mptcp@lists.linux.dev
Cc: mathew.j.martineau@linux.intel.com
Subject: Re: [PATCH mptcp-net v7 4/5] mptcp: avoid processing packet if a subflow reset
Date: Fri, 25 Jun 2021 12:45:35 +0200	[thread overview]
Message-ID: <9d8a2d8ae7930e741f5441a36ef19d8039731a02.camel@redhat.com> (raw)
In-Reply-To: <1624609559-6786-5-git-send-email-wujianguo106@163.com>

Hi,

I'm sorry for the partial feedback in my previous reply.

On Fri, 2021-06-25 at 16:25 +0800, wujianguo106@163.com wrote:
> @@ -856,7 +856,8 @@ bool mptcp_synack_options(const struct request_sock *req, unsigned int *size,
>  static bool check_fully_established(struct mptcp_sock *msk, struct sock *ssk,
>  				    struct mptcp_subflow_context *subflow,
>  				    struct sk_buff *skb,
> -				    struct mptcp_options_received *mp_opt)
> +				    struct mptcp_options_received *mp_opt,
> +				    bool *subflow_is_rst)

This additional argument is not needed...

[...]
> @@ -1053,12 +1057,12 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb)
>  			__mptcp_check_push(subflow->conn, sk);
>  		__mptcp_data_acked(subflow->conn);
>  		mptcp_data_unlock(subflow->conn);
> -		return;
> +		return 1;
>  	}
>  
>  	mptcp_get_options(sk, skb, &mp_opt);
> -	if (!check_fully_established(msk, sk, subflow, skb, &mp_opt))
> -		return;
> +	if (!check_fully_established(msk, sk, subflow, skb, &mp_opt, &subflow_is_rst))
> +		return subflow_is_rst ? 0 : 1;


... here you can simply:

		return sk->sk_state != TCP_CLOSE;

plus some comment above alike:

"""the subflow can be in close state only if check_fully_established()
just sent a reset. If so, tell the caller to ignore the current
packet"""

/P


  parent reply	other threads:[~2021-06-25 10:45 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-25  8:25 [PATCH mptcp-net v7 0/5] Fix some mptcp syncookie process bugs wujianguo106
2021-06-25  8:25 ` [PATCH mptcp-net v7 1/5] mptcp: fix warning in __skb_flow_dissect() when do syn cookie for subflow join wujianguo106
2021-06-25  8:25 ` [PATCH mptcp-net v7 2/5] mptcp: remove redundant req destruct in subflow_check_req() wujianguo106
2021-06-25  8:25 ` [PATCH mptcp-net v7 3/5] mptcp: fix syncookie process if mptcp can not_accept new subflow wujianguo106
2021-06-25  8:25 ` [PATCH mptcp-net v7 4/5] mptcp: avoid processing packet if a subflow reset wujianguo106
2021-06-25  8:58   ` Geliang Tang
2021-06-25  9:07   ` Matthieu Baerts
2021-06-25  9:46     ` Jianguo Wu
2021-06-26  1:07       ` Mat Martineau
2021-06-25 10:38   ` Paolo Abeni
2021-06-25 10:45   ` Paolo Abeni [this message]
2021-06-26  8:59     ` Jianguo Wu
2021-06-25  8:25 ` [PATCH mptcp-net v7 5/5] selftests: mptcp: fix case multiple subflows limited by server wujianguo106

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=9d8a2d8ae7930e741f5441a36ef19d8039731a02.camel@redhat.com \
    --to=pabeni@redhat.com \
    --cc=mathew.j.martineau@linux.intel.com \
    --cc=mptcp@lists.linux.dev \
    --cc=wujianguo106@163.com \
    --subject='Re: [PATCH mptcp-net v7 4/5] mptcp: avoid processing packet if a subflow reset' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).