[bpf,v5] bpf: Fixed segment issue when downgrade gso_size

Commit Message

Fred Li July 22, 2024, 3:08 a.m. UTC

Linearize skb when downgrad gso_size to prevent triggering
the BUG_ON during segment skb as described in [1].

v5 changes:
 - add bpf subject prefix.
 - adjust message to imperative mood.

v4 changes:
 - add fixed tag.

v3 changes:
 - linearize skb if having frag_list as Willem de Bruijn suggested [2].

[1] https://lore.kernel.org/all/[e-mail]/
[2] https://lore.kernel.org/all/[e-mail]/

Fixes: 2be7e212d541 ("bpf: add bpf_skb_adjust_room helper")
Signed-off-by: Fred Li <[e-mail]>
---
 net/core/filter.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

Comments

[e-mail] July 22, 2024, 3:34 a.m. UTC | #1

Dear patch submitter,

CI has tested the following submission:
Status:     SUCCESS
Name:       [bpf,v5] bpf: Fixed segment issue when downgrade gso_size
Patchwork:  https://patchwork.kernel.org/project/netdevbpf/list/?series=872810&state=*
Matrix:     https://github.com/kernel-patches/bpf/actions/runs/10034064977

No further action is necessary on your part.


Please note: this email is coming from an unmonitored mailbox. If you have
questions or feedback, please reach out to the Meta Kernel CI team at
[e-mail].

Willem de Bruijn July 22, 2024, 4:29 p.m. UTC | #2

On Sun, Jul 21, 2024 at 8:08 PM Fred Li <[e-mail]> wrote:
>
> Linearize skb when downgrad gso_size to prevent triggering
> the BUG_ON during segment skb as described in [1].
>
> v5 changes:
>  - add bpf subject prefix.
>  - adjust message to imperative mood.
>
> v4 changes:
>  - add fixed tag.
>
> v3 changes:
>  - linearize skb if having frag_list as Willem de Bruijn suggested [2].
>
> [1] https://lore.kernel.org/all/[e-mail]/
> [2] https://lore.kernel.org/all/[e-mail]/
>
> Fixes: 2be7e212d541 ("bpf: add bpf_skb_adjust_room helper")
> Signed-off-by: Fred Li <[e-mail]>

Reviewed-by: Willem de Bruijn <[e-mail]>

My comments were informational, for a next patch if any, really. v4
was fine. v5 is too.

Fred Li July 24, 2024, 1:37 p.m. UTC | #3

> >
> > Linearize skb when downgrad gso_size to prevent triggering
> > the BUG_ON during segment skb as described in [1].
> >
> > v5 changes:
> >  - add bpf subject prefix.
> >  - adjust message to imperative mood.
> >
> > v4 changes:
> >  - add fixed tag.
> >
> > v3 changes:
> >  - linearize skb if having frag_list as Willem de Bruijn suggested [2].
> >
> > [1] https://lore.kernel.org/all/[e-mail]/
> > [2] https://lore.kernel.org/all/[e-mail]/
> >
> > Fixes: 2be7e212d541 ("bpf: add bpf_skb_adjust_room helper")
> > Signed-off-by: Fred Li <[e-mail]>
> 
> Reviewed-by: Willem de Bruijn <[e-mail]>
> 
> My comments were informational, for a next patch if any, really. v4
> was fine. v5 is too.

Thanks for your advise.

Fred Li

Daniel Borkmann July 25, 2024, 10:09 a.m. UTC | #4

On 7/24/24 3:37 PM, Fred Li wrote:
>>>
>>> Linearize skb when downgrad gso_size to prevent triggering
>>> the BUG_ON during segment skb as described in [1].
>>>
>>> v5 changes:
>>>   - add bpf subject prefix.
>>>   - adjust message to imperative mood.
>>>
>>> v4 changes:
>>>   - add fixed tag.
>>>
>>> v3 changes:
>>>   - linearize skb if having frag_list as Willem de Bruijn suggested [2].
>>>
>>> [1] https://lore.kernel.org/all/[e-mail]/
>>> [2] https://lore.kernel.org/all/[e-mail]/
>>>
>>> Fixes: 2be7e212d541 ("bpf: add bpf_skb_adjust_room helper")
>>> Signed-off-by: Fred Li <[e-mail]>
>>
>> Reviewed-by: Willem de Bruijn <[e-mail]>
>>
>> My comments were informational, for a next patch if any, really. v4
>> was fine. v5 is too.
> 
> Thanks for your advise.
> 
> Fred Li

lgtm, I slightly improved wording & applied, thanks!

Patch

diff --git a/net/core/filter.c b/net/core/filter.c
index df4578219e82..71396ecfc574 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -3525,13 +3525,21 @@  static int bpf_skb_net_grow(struct sk_buff *skb, u32 off, u32 len_diff,
 	if (skb_is_gso(skb)) {
 		struct skb_shared_info *shinfo = skb_shinfo(skb);
 
-		/* Due to header grow, MSS needs to be downgraded. */
-		if (!(flags & BPF_F_ADJ_ROOM_FIXED_GSO))
-			skb_decrease_gso_size(shinfo, len_diff);
-
 		/* Header must be checked, and gso_segs recomputed. */
 		shinfo->gso_type |= gso_type;
 		shinfo->gso_segs = 0;
+
+		/* Due to header grow, MSS needs to be downgraded.
+		 * There is BUG_ON when segment the frag_list with
+		 * head_frag true so linearize skb after downgrade
+		 * the MSS.
+		 */
+		if (!(flags & BPF_F_ADJ_ROOM_FIXED_GSO)) {
+			skb_decrease_gso_size(shinfo, len_diff);
+			if (shinfo->frag_list)
+				return skb_linearize(skb);
+		}
+
 	}
 
 	return 0;