linux-sctp.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Leppanen, Jere (Nokia - FI/Espoo)" <jere.leppanen@nokia.com>
To: Xin Long <lucien.xin@gmail.com>,
	network dev <netdev@vger.kernel.org>,
	"linux-sctp@vger.kernel.org" <linux-sctp@vger.kernel.org>
Cc: "davem@davemloft.net" <davem@davemloft.net>,
	"kuba@kernel.org" <kuba@kernel.org>,
	Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>,
	"Sverdlin,
	Alexander (Nokia - DE/Ulm)" <alexander.sverdlin@nokia.com>
Subject: Re: [PATCHv2 net 2/3] Revert "sctp: Fix bundling of SHUTDOWN with COOKIE-ACK"
Date: Sat, 1 May 2021 16:56:29 +0000	[thread overview]
Message-ID: <HE1PR0702MB38180256C324E2C9A234AFA6EC5D9@HE1PR0702MB3818.eurprd07.prod.outlook.com> (raw)
In-Reply-To: <a9f65034deb5ffa57ea704f99102fcefb9bff539.1619812899.git.lucien.xin@gmail.com>

On Fri, 30 Apr 2021, Xin Long wrote:

> This can be reverted as shutdown and cookie_ack chunk are using the
> same asoc since the last patch.
>
> This reverts commit 145cb2f7177d94bc54563ed26027e952ee0ae03c.

I think this should not be reverted. Without it, SHUTDOWN would
get its transport from sctp_assoc_choose_alter_transport(), which
could be different from the COOKIE-ACK transport, which would
prevent bundling.

>
> Signed-off-by: Xin Long <lucien.xin@gmail.com>
> Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
> ---
> net/sctp/sm_statefuns.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
> index 30cb946..e8ccc4e 100644
> --- a/net/sctp/sm_statefuns.c
> +++ b/net/sctp/sm_statefuns.c
> @@ -1892,7 +1892,7 @@ static enum sctp_disposition sctp_sf_do_dupcook_a(
>                */
>               sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(repl));
>               return sctp_sf_do_9_2_start_shutdown(net, ep, asoc,
> -                                                  SCTP_ST_CHUNK(0), repl,
> +                                                  SCTP_ST_CHUNK(0), NULL,
>                                                    commands);
>       } else {
>               sctp_add_cmd_sf(commands, SCTP_CMD_NEW_STATE,
> @@ -5536,7 +5536,7 @@ enum sctp_disposition sctp_sf_do_9_2_start_shutdown(
>        * in the Cumulative TSN Ack field the last sequential TSN it
>        * has received from the peer.
>        */
> -     reply = sctp_make_shutdown(asoc, arg);
> +     reply = sctp_make_shutdown(asoc, NULL);
>       if (!reply)
>               goto nomem;
>
> @@ -6134,7 +6134,7 @@ enum sctp_disposition sctp_sf_autoclose_timer_expire(
>       disposition = SCTP_DISPOSITION_CONSUME;
>       if (sctp_outq_is_empty(&asoc->outqueue)) {
>               disposition = sctp_sf_do_9_2_start_shutdown(net, ep, asoc, type,
> -                                                         NULL, commands);
> +                                                         arg, commands);
>       }
>
>       return disposition;
> -- 
> 2.1.0

  parent reply	other threads:[~2021-05-01 16:56 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-30 20:02 [PATCHv2 net 0/3] sctp: always send a chunk with the asoc that it belongs to Xin Long
2021-04-30 20:02 ` [PATCHv2 net 1/3] sctp: do asoc update earlier in sctp_sf_do_dupcook_a Xin Long
2021-04-30 20:02   ` [PATCHv2 net 2/3] Revert "sctp: Fix bundling of SHUTDOWN with COOKIE-ACK" Xin Long
2021-04-30 20:03     ` [PATCHv2 net 3/3] sctp: do asoc update earlier in sctp_sf_do_dupcook_b Xin Long
2021-05-01 16:57       ` Leppanen, Jere (Nokia - FI/Espoo)
2021-05-01 18:20         ` Xin Long
2021-05-01 16:56     ` Leppanen, Jere (Nokia - FI/Espoo) [this message]
2021-04-30 22:30 ` [PATCHv2 net 0/3] sctp: always send a chunk with the asoc that it belongs to patchwork-bot+netdevbpf
2021-05-01 16:53 ` Leppanen, Jere (Nokia - FI/Espoo)
2021-05-01 18:22   ` Xin Long

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=HE1PR0702MB38180256C324E2C9A234AFA6EC5D9@HE1PR0702MB3818.eurprd07.prod.outlook.com \
    --to=jere.leppanen@nokia.com \
    --cc=alexander.sverdlin@nokia.com \
    --cc=davem@davemloft.net \
    --cc=kuba@kernel.org \
    --cc=linux-sctp@vger.kernel.org \
    --cc=lucien.xin@gmail.com \
    --cc=marcelo.leitner@gmail.com \
    --cc=netdev@vger.kernel.org \
    --subject='Re: [PATCHv2 net 2/3] Revert "sctp: Fix bundling of SHUTDOWN with COOKIE-ACK"' \
    /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).