linux-sctp.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alexander Duyck <alexander.duyck@gmail.com>
To: Xin Long <lucien.xin@gmail.com>
Cc: network dev <netdev@vger.kernel.org>,
	"linux-sctp @ vger . kernel . org" <linux-sctp@vger.kernel.org>,
	Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>,
	Neil Horman <nhorman@tuxdriver.com>,
	David Miller <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>
Subject: Re: [PATCHv3 net-next 1/2] net: move the hsize check to the else block in skb_segment
Date: Fri, 15 Jan 2021 17:39:02 -0800	[thread overview]
Message-ID: <CAKgT0Uc1iObzmeFL8G91jxKxvWARb4z2bJJxv6yJ+5QOYPJQsQ@mail.gmail.com> (raw)
In-Reply-To: <bfecc76748f5dc64eaddf501c258dca9efb92bdf.1610703289.git.lucien.xin@gmail.com>

On Fri, Jan 15, 2021 at 1:36 AM Xin Long <lucien.xin@gmail.com> wrote:
>
> After commit 89319d3801d1 ("net: Add frag_list support to skb_segment"),
> it goes to process frag_list when !hsize in skb_segment(). However, when
> using skb frag_list, sg normally should not be set. In this case, hsize
> will be set with len right before !hsize check, then it won't go to
> frag_list processing code.
>
> So the right thing to do is move the hsize check to the else block, so
> that it won't affect the !hsize check for frag_list processing.
>
> v1->v2:
>   - change to do "hsize <= 0" check instead of "!hsize", and also move
>     "hsize < 0" into else block, to save some cycles, as Alex suggested.
>
> Signed-off-by: Xin Long <lucien.xin@gmail.com>

Looks good to me.

Reviewed-by: Alexander Duyck <alexanderduyck@fb.com>

> ---
>  net/core/skbuff.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/net/core/skbuff.c b/net/core/skbuff.c
> index 6039069..e835193 100644
> --- a/net/core/skbuff.c
> +++ b/net/core/skbuff.c
> @@ -3894,12 +3894,8 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
>                 }
>
>                 hsize = skb_headlen(head_skb) - offset;
> -               if (hsize < 0)
> -                       hsize = 0;
> -               if (hsize > len || !sg)
> -                       hsize = len;
>
> -               if (!hsize && i >= nfrags && skb_headlen(list_skb) &&
> +               if (hsize <= 0 && i >= nfrags && skb_headlen(list_skb) &&
>                     (skb_headlen(list_skb) == len || sg)) {
>                         BUG_ON(skb_headlen(list_skb) > len);
>
> @@ -3942,6 +3938,11 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
>                         skb_release_head_state(nskb);
>                         __skb_push(nskb, doffset);
>                 } else {
> +                       if (hsize > len || !sg)
> +                               hsize = len;
> +                       else if (hsize < 0)
> +                               hsize = 0;
> +
>                         nskb = __alloc_skb(hsize + doffset + headroom,
>                                            GFP_ATOMIC, skb_alloc_rx_flag(head_skb),
>                                            NUMA_NO_NODE);
> --
> 2.1.0
>

  parent reply	other threads:[~2021-01-16  1:39 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-15  9:36 [PATCHv3 net-next 0/2] net: fix the features flag in sctp_gso_segment Xin Long
2021-01-15  9:36 ` [PATCHv3 net-next 1/2] net: move the hsize check to the else block in skb_segment Xin Long
2021-01-15  9:36   ` [PATCHv3 net-next 2/2] sctp: remove the NETIF_F_SG flag before calling skb_segment Xin Long
2021-01-16  1:39   ` Alexander Duyck [this message]
2021-01-17  3:13     ` [PATCHv3 net-next 1/2] net: move the hsize check to the else block in skb_segment Jakub Kicinski

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=CAKgT0Uc1iObzmeFL8G91jxKxvWARb4z2bJJxv6yJ+5QOYPJQsQ@mail.gmail.com \
    --to=alexander.duyck@gmail.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 \
    --cc=nhorman@tuxdriver.com \
    --subject='Re: [PATCHv3 net-next 1/2] net: move the hsize check to the else block in skb_segment' \
    /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).