| Message ID | bfecc76748f5dc64eaddf501c258dca9efb92bdf.1610703289.git.lucien.xin@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: fix the features flag in sctp_gso_segment | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | warning | 9 maintainers not CCed: gnault@redhat.com kyk.segfault@gmail.com linmiaohe@huawei.com viro@zeniv.linux.org.uk elver@google.com dseok.yi@samsung.com jonathan.lemon@gmail.com willemb@google.com steffen.klassert@secunet.com |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 1 this patch: 1 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 24 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 1 this patch: 1 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
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 >
On Fri, 15 Jan 2021 17:39:02 -0800 Alexander Duyck wrote: > 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> Applied, thanks!
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);
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> --- net/core/skbuff.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)