diff mbox series

[net-next] net: save some cycles when doing skb_attempt_defer_free()

Message ID 20240411032450.51649-1-kerneljasonxing@gmail.com (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series [net-next] net: save some cycles when doing skb_attempt_defer_free() | expand

Checks

Context Check Description
netdev/series_format success Single patches do not need cover letters
netdev/tree_selection success Clearly marked for net-next
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 944 this patch: 944
netdev/build_tools success No tools touched, skip
netdev/cc_maintainers success CCed 4 of 4 maintainers
netdev/build_clang success Errors and warnings before: 954 this patch: 954
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 955 this patch: 955
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 11 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 54 this patch: 54
netdev/source_inline success Was 0 now: 0
netdev/contest success net-next-2024-04-11--21-00 (tests: 959)

Commit Message

Jason Xing April 11, 2024, 3:24 a.m. UTC 
From: Jason Xing <kernelxing@tencent.com>

Normally, we don't face these two exceptions very often meanwhile
we have some chance to meet the condition where the current cpu id
is the same as skb->alloc_cpu.

One simple test that can help us see the frequency of this statement
'cpu == raw_smp_processor_id()':
1. running iperf -s and iperf -c [ip] -P [MAX CPU]
2. using BPF to capture skb_attempt_defer_free()

I can see around 4% chance that happens to satisfy the statement.
So moving this statement at the beginning can save some cycles in
most cases.

Signed-off-by: Jason Xing <kernelxing@tencent.com>
---
 net/core/skbuff.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Eric Dumazet April 11, 2024, 5:27 a.m. UTC | #1 
On Thu, Apr 11, 2024 at 5:25 AM Jason Xing <kerneljasonxing@gmail.com> wrote:
>
> From: Jason Xing <kernelxing@tencent.com>
>
> Normally, we don't face these two exceptions very often meanwhile
> we have some chance to meet the condition where the current cpu id
> is the same as skb->alloc_cpu.
>
> One simple test that can help us see the frequency of this statement
> 'cpu == raw_smp_processor_id()':
> 1. running iperf -s and iperf -c [ip] -P [MAX CPU]
> 2. using BPF to capture skb_attempt_defer_free()
>
> I can see around 4% chance that happens to satisfy the statement.
> So moving this statement at the beginning can save some cycles in
> most cases.
>
> Signed-off-by: Jason Xing <kernelxing@tencent.com>
> ---
>  net/core/skbuff.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/core/skbuff.c b/net/core/skbuff.c
> index ab970ded8a7b..b4f252dc91fb 100644
> --- a/net/core/skbuff.c
> +++ b/net/core/skbuff.c
> @@ -7002,9 +7002,9 @@ void skb_attempt_defer_free(struct sk_buff *skb)
>         unsigned int defer_max;
>         bool kick;
>
> -       if (WARN_ON_ONCE(cpu >= nr_cpu_ids) ||
> +       if (cpu == raw_smp_processor_id() ||
>             !cpu_online(cpu) ||
> -           cpu == raw_smp_processor_id()) {
> +           WARN_ON_ONCE(cpu >= nr_cpu_ids)) {
>  nodefer:       kfree_skb_napi_cache(skb);
>                 return;
>         }

Wrong patch.

cpu_online(X) is undefined and might crash if X is out of bounds on CONFIG_SMP=y
Jason Xing April 11, 2024, 6:32 a.m. UTC | #2 
On Thu, Apr 11, 2024 at 1:27 PM Eric Dumazet <edumazet@google.com> wrote:
>
> On Thu, Apr 11, 2024 at 5:25 AM Jason Xing <kerneljasonxing@gmail.com> wrote:
> >
> > From: Jason Xing <kernelxing@tencent.com>
> >
> > Normally, we don't face these two exceptions very often meanwhile
> > we have some chance to meet the condition where the current cpu id
> > is the same as skb->alloc_cpu.
> >
> > One simple test that can help us see the frequency of this statement
> > 'cpu == raw_smp_processor_id()':
> > 1. running iperf -s and iperf -c [ip] -P [MAX CPU]
> > 2. using BPF to capture skb_attempt_defer_free()
> >
> > I can see around 4% chance that happens to satisfy the statement.
> > So moving this statement at the beginning can save some cycles in
> > most cases.
> >
> > Signed-off-by: Jason Xing <kernelxing@tencent.com>
> > ---
> >  net/core/skbuff.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/net/core/skbuff.c b/net/core/skbuff.c
> > index ab970ded8a7b..b4f252dc91fb 100644
> > --- a/net/core/skbuff.c
> > +++ b/net/core/skbuff.c
> > @@ -7002,9 +7002,9 @@ void skb_attempt_defer_free(struct sk_buff *skb)
> >         unsigned int defer_max;
> >         bool kick;
> >
> > -       if (WARN_ON_ONCE(cpu >= nr_cpu_ids) ||
> > +       if (cpu == raw_smp_processor_id() ||
> >             !cpu_online(cpu) ||
> > -           cpu == raw_smp_processor_id()) {
> > +           WARN_ON_ONCE(cpu >= nr_cpu_ids)) {
> >  nodefer:       kfree_skb_napi_cache(skb);
> >                 return;
> >         }
>
> Wrong patch.
>
> cpu_online(X) is undefined and might crash if X is out of bounds on CONFIG_SMP=y

Even if skb->alloc_cpu is larger than nr_cpu_ids, I don't know why the
integer test statement could cause crashing the kernel. It's just a
simple comparison. And if the statement is true,
raw_smp_processor_id() can guarantee the validation, right?
Eric Dumazet April 11, 2024, 7:11 a.m. UTC | #3 
On Thu, Apr 11, 2024 at 8:33 AM Jason Xing <kerneljasonxing@gmail.com> wrote:
>
> On Thu, Apr 11, 2024 at 1:27 PM Eric Dumazet <edumazet@google.com> wrote:
> >
> > On Thu, Apr 11, 2024 at 5:25 AM Jason Xing <kerneljasonxing@gmail.com> wrote:
> > >
> > > From: Jason Xing <kernelxing@tencent.com>
> > >
> > > Normally, we don't face these two exceptions very often meanwhile
> > > we have some chance to meet the condition where the current cpu id
> > > is the same as skb->alloc_cpu.
> > >
> > > One simple test that can help us see the frequency of this statement
> > > 'cpu == raw_smp_processor_id()':
> > > 1. running iperf -s and iperf -c [ip] -P [MAX CPU]
> > > 2. using BPF to capture skb_attempt_defer_free()
> > >
> > > I can see around 4% chance that happens to satisfy the statement.
> > > So moving this statement at the beginning can save some cycles in
> > > most cases.
> > >
> > > Signed-off-by: Jason Xing <kernelxing@tencent.com>
> > > ---
> > >  net/core/skbuff.c | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/net/core/skbuff.c b/net/core/skbuff.c
> > > index ab970ded8a7b..b4f252dc91fb 100644
> > > --- a/net/core/skbuff.c
> > > +++ b/net/core/skbuff.c
> > > @@ -7002,9 +7002,9 @@ void skb_attempt_defer_free(struct sk_buff *skb)
> > >         unsigned int defer_max;
> > >         bool kick;
> > >
> > > -       if (WARN_ON_ONCE(cpu >= nr_cpu_ids) ||
> > > +       if (cpu == raw_smp_processor_id() ||
> > >             !cpu_online(cpu) ||
> > > -           cpu == raw_smp_processor_id()) {
> > > +           WARN_ON_ONCE(cpu >= nr_cpu_ids)) {
> > >  nodefer:       kfree_skb_napi_cache(skb);
> > >                 return;
> > >         }
> >
> > Wrong patch.
> >
> > cpu_online(X) is undefined and might crash if X is out of bounds on CONFIG_SMP=y
>
> Even if skb->alloc_cpu is larger than nr_cpu_ids, I don't know why the
> integer test statement could cause crashing the kernel. It's just a
> simple comparison. And if the statement is true,
> raw_smp_processor_id() can guarantee the validation, right?

Please read again the code you wrote, or run it with skb->alloc_cpu
being set to 45000 on a full DEBUG kernel.

You are focusing on skb->alloc_cpu == raw_smp_processor_id(), I am
focusing on what happens
when this condition is not true.
Jason Xing April 11, 2024, 7:31 a.m. UTC | #4 
On Thu, Apr 11, 2024 at 3:12 PM Eric Dumazet <edumazet@google.com> wrote:
>
> On Thu, Apr 11, 2024 at 8:33 AM Jason Xing <kerneljasonxing@gmail.com> wrote:
> >
> > On Thu, Apr 11, 2024 at 1:27 PM Eric Dumazet <edumazet@google.com> wrote:
> > >
> > > On Thu, Apr 11, 2024 at 5:25 AM Jason Xing <kerneljasonxing@gmail.com> wrote:
> > > >
> > > > From: Jason Xing <kernelxing@tencent.com>
> > > >
> > > > Normally, we don't face these two exceptions very often meanwhile
> > > > we have some chance to meet the condition where the current cpu id
> > > > is the same as skb->alloc_cpu.
> > > >
> > > > One simple test that can help us see the frequency of this statement
> > > > 'cpu == raw_smp_processor_id()':
> > > > 1. running iperf -s and iperf -c [ip] -P [MAX CPU]
> > > > 2. using BPF to capture skb_attempt_defer_free()
> > > >
> > > > I can see around 4% chance that happens to satisfy the statement.
> > > > So moving this statement at the beginning can save some cycles in
> > > > most cases.
> > > >
> > > > Signed-off-by: Jason Xing <kernelxing@tencent.com>
> > > > ---
> > > >  net/core/skbuff.c | 4 ++--
> > > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/net/core/skbuff.c b/net/core/skbuff.c
> > > > index ab970ded8a7b..b4f252dc91fb 100644
> > > > --- a/net/core/skbuff.c
> > > > +++ b/net/core/skbuff.c
> > > > @@ -7002,9 +7002,9 @@ void skb_attempt_defer_free(struct sk_buff *skb)
> > > >         unsigned int defer_max;
> > > >         bool kick;
> > > >
> > > > -       if (WARN_ON_ONCE(cpu >= nr_cpu_ids) ||
> > > > +       if (cpu == raw_smp_processor_id() ||
> > > >             !cpu_online(cpu) ||
> > > > -           cpu == raw_smp_processor_id()) {
> > > > +           WARN_ON_ONCE(cpu >= nr_cpu_ids)) {
> > > >  nodefer:       kfree_skb_napi_cache(skb);
> > > >                 return;
> > > >         }
> > >
> > > Wrong patch.
> > >
> > > cpu_online(X) is undefined and might crash if X is out of bounds on CONFIG_SMP=y
> >
> > Even if skb->alloc_cpu is larger than nr_cpu_ids, I don't know why the
> > integer test statement could cause crashing the kernel. It's just a
> > simple comparison. And if the statement is true,
> > raw_smp_processor_id() can guarantee the validation, right?
>
> Please read again the code you wrote, or run it with skb->alloc_cpu
> being set to 45000 on a full DEBUG kernel.
>
> You are focusing on skb->alloc_cpu == raw_smp_processor_id(), I am
> focusing on what happens
> when this condition is not true.

Sorry. My bad. I put the wrong order of '!cpu_online(cpu)' and 'cpu >=
nr_cpu_ids'. I didn't consider the out-of-bound issue. I should have
done more checks :(

The correct patch should be:
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index ab970ded8a7b..6dc577a3ea6a 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -7002,9 +7002,9 @@ void skb_attempt_defer_free(struct sk_buff *skb)
        unsigned int defer_max;
        bool kick;

-       if (WARN_ON_ONCE(cpu >= nr_cpu_ids) ||
-           !cpu_online(cpu) ||
-           cpu == raw_smp_processor_id()) {
+       if (cpu == raw_smp_processor_id() ||
+           WARN_ON_ONCE(cpu >= nr_cpu_ids) ||
+           !cpu_online(cpu)) {
 nodefer:       kfree_skb_napi_cache(skb);
                return;
        }

I will submit V2 tomorrow.

Thanks,
Jason
Alexander Lobakin April 11, 2024, 9:11 a.m. UTC | #5 
From: Jason Xing <kerneljasonxing@gmail.com>
Date: Thu, 11 Apr 2024 15:31:23 +0800

> On Thu, Apr 11, 2024 at 3:12 PM Eric Dumazet <edumazet@google.com> wrote:
>>
>> On Thu, Apr 11, 2024 at 8:33 AM Jason Xing <kerneljasonxing@gmail.com> wrote:
>>>
>>> On Thu, Apr 11, 2024 at 1:27 PM Eric Dumazet <edumazet@google.com> wrote:
>>>>
>>>> On Thu, Apr 11, 2024 at 5:25 AM Jason Xing <kerneljasonxing@gmail.com> wrote:
>>>>>
>>>>> From: Jason Xing <kernelxing@tencent.com>
>>>>>
>>>>> Normally, we don't face these two exceptions very often meanwhile
>>>>> we have some chance to meet the condition where the current cpu id
>>>>> is the same as skb->alloc_cpu.
>>>>>
>>>>> One simple test that can help us see the frequency of this statement
>>>>> 'cpu == raw_smp_processor_id()':
>>>>> 1. running iperf -s and iperf -c [ip] -P [MAX CPU]
>>>>> 2. using BPF to capture skb_attempt_defer_free()
>>>>>
>>>>> I can see around 4% chance that happens to satisfy the statement.
>>>>> So moving this statement at the beginning can save some cycles in
>>>>> most cases.
>>>>>
>>>>> Signed-off-by: Jason Xing <kernelxing@tencent.com>
>>>>> ---
>>>>>  net/core/skbuff.c | 4 ++--
>>>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>>>>
>>>>> diff --git a/net/core/skbuff.c b/net/core/skbuff.c
>>>>> index ab970ded8a7b..b4f252dc91fb 100644
>>>>> --- a/net/core/skbuff.c
>>>>> +++ b/net/core/skbuff.c
>>>>> @@ -7002,9 +7002,9 @@ void skb_attempt_defer_free(struct sk_buff *skb)
>>>>>         unsigned int defer_max;
>>>>>         bool kick;
>>>>>
>>>>> -       if (WARN_ON_ONCE(cpu >= nr_cpu_ids) ||
>>>>> +       if (cpu == raw_smp_processor_id() ||
>>>>>             !cpu_online(cpu) ||
>>>>> -           cpu == raw_smp_processor_id()) {
>>>>> +           WARN_ON_ONCE(cpu >= nr_cpu_ids)) {
>>>>>  nodefer:       kfree_skb_napi_cache(skb);
>>>>>                 return;
>>>>>         }
>>>>
>>>> Wrong patch.
>>>>
>>>> cpu_online(X) is undefined and might crash if X is out of bounds on CONFIG_SMP=y
>>>
>>> Even if skb->alloc_cpu is larger than nr_cpu_ids, I don't know why the
>>> integer test statement could cause crashing the kernel. It's just a
>>> simple comparison. And if the statement is true,
>>> raw_smp_processor_id() can guarantee the validation, right?
>>
>> Please read again the code you wrote, or run it with skb->alloc_cpu
>> being set to 45000 on a full DEBUG kernel.
>>
>> You are focusing on skb->alloc_cpu == raw_smp_processor_id(), I am
>> focusing on what happens
>> when this condition is not true.
> 
> Sorry. My bad. I put the wrong order of '!cpu_online(cpu)' and 'cpu >=
> nr_cpu_ids'. I didn't consider the out-of-bound issue. I should have
> done more checks :(
> 
> The correct patch should be:
> diff --git a/net/core/skbuff.c b/net/core/skbuff.c
> index ab970ded8a7b..6dc577a3ea6a 100644
> --- a/net/core/skbuff.c
> +++ b/net/core/skbuff.c
> @@ -7002,9 +7002,9 @@ void skb_attempt_defer_free(struct sk_buff *skb)
>         unsigned int defer_max;
>         bool kick;
> 
> -       if (WARN_ON_ONCE(cpu >= nr_cpu_ids) ||
> -           !cpu_online(cpu) ||
> -           cpu == raw_smp_processor_id()) {
> +       if (cpu == raw_smp_processor_id() ||
> +           WARN_ON_ONCE(cpu >= nr_cpu_ids) ||
> +           !cpu_online(cpu)) {

This one looks good to me.
Feel free to add

Reviewed-by: Alexander Lobakin <aleksander.lobakin@intel.com>

To your v2 before sending.

>  nodefer:       kfree_skb_napi_cache(skb);
>                 return;
>         }
> 
> I will submit V2 tomorrow.
> 
> Thanks,
> Jason

Thanks,
Olek
Jason Xing April 11, 2024, 10 a.m. UTC | #6 
On Thu, Apr 11, 2024 at 5:13 PM Alexander Lobakin
<aleksander.lobakin@intel.com> wrote:
>
> From: Jason Xing <kerneljasonxing@gmail.com>
> Date: Thu, 11 Apr 2024 15:31:23 +0800
>
> > On Thu, Apr 11, 2024 at 3:12 PM Eric Dumazet <edumazet@google.com> wrote:
> >>
> >> On Thu, Apr 11, 2024 at 8:33 AM Jason Xing <kerneljasonxing@gmail.com> wrote:
> >>>
> >>> On Thu, Apr 11, 2024 at 1:27 PM Eric Dumazet <edumazet@google.com> wrote:
> >>>>
> >>>> On Thu, Apr 11, 2024 at 5:25 AM Jason Xing <kerneljasonxing@gmail.com> wrote:
> >>>>>
> >>>>> From: Jason Xing <kernelxing@tencent.com>
> >>>>>
> >>>>> Normally, we don't face these two exceptions very often meanwhile
> >>>>> we have some chance to meet the condition where the current cpu id
> >>>>> is the same as skb->alloc_cpu.
> >>>>>
> >>>>> One simple test that can help us see the frequency of this statement
> >>>>> 'cpu == raw_smp_processor_id()':
> >>>>> 1. running iperf -s and iperf -c [ip] -P [MAX CPU]
> >>>>> 2. using BPF to capture skb_attempt_defer_free()
> >>>>>
> >>>>> I can see around 4% chance that happens to satisfy the statement.
> >>>>> So moving this statement at the beginning can save some cycles in
> >>>>> most cases.
> >>>>>
> >>>>> Signed-off-by: Jason Xing <kernelxing@tencent.com>
> >>>>> ---
> >>>>>  net/core/skbuff.c | 4 ++--
> >>>>>  1 file changed, 2 insertions(+), 2 deletions(-)
> >>>>>
> >>>>> diff --git a/net/core/skbuff.c b/net/core/skbuff.c
> >>>>> index ab970ded8a7b..b4f252dc91fb 100644
> >>>>> --- a/net/core/skbuff.c
> >>>>> +++ b/net/core/skbuff.c
> >>>>> @@ -7002,9 +7002,9 @@ void skb_attempt_defer_free(struct sk_buff *skb)
> >>>>>         unsigned int defer_max;
> >>>>>         bool kick;
> >>>>>
> >>>>> -       if (WARN_ON_ONCE(cpu >= nr_cpu_ids) ||
> >>>>> +       if (cpu == raw_smp_processor_id() ||
> >>>>>             !cpu_online(cpu) ||
> >>>>> -           cpu == raw_smp_processor_id()) {
> >>>>> +           WARN_ON_ONCE(cpu >= nr_cpu_ids)) {
> >>>>>  nodefer:       kfree_skb_napi_cache(skb);
> >>>>>                 return;
> >>>>>         }
> >>>>
> >>>> Wrong patch.
> >>>>
> >>>> cpu_online(X) is undefined and might crash if X is out of bounds on CONFIG_SMP=y
> >>>
> >>> Even if skb->alloc_cpu is larger than nr_cpu_ids, I don't know why the
> >>> integer test statement could cause crashing the kernel. It's just a
> >>> simple comparison. And if the statement is true,
> >>> raw_smp_processor_id() can guarantee the validation, right?
> >>
> >> Please read again the code you wrote, or run it with skb->alloc_cpu
> >> being set to 45000 on a full DEBUG kernel.
> >>
> >> You are focusing on skb->alloc_cpu == raw_smp_processor_id(), I am
> >> focusing on what happens
> >> when this condition is not true.
> >
> > Sorry. My bad. I put the wrong order of '!cpu_online(cpu)' and 'cpu >=
> > nr_cpu_ids'. I didn't consider the out-of-bound issue. I should have
> > done more checks :(
> >
> > The correct patch should be:
> > diff --git a/net/core/skbuff.c b/net/core/skbuff.c
> > index ab970ded8a7b..6dc577a3ea6a 100644
> > --- a/net/core/skbuff.c
> > +++ b/net/core/skbuff.c
> > @@ -7002,9 +7002,9 @@ void skb_attempt_defer_free(struct sk_buff *skb)
> >         unsigned int defer_max;
> >         bool kick;
> >
> > -       if (WARN_ON_ONCE(cpu >= nr_cpu_ids) ||
> > -           !cpu_online(cpu) ||
> > -           cpu == raw_smp_processor_id()) {
> > +       if (cpu == raw_smp_processor_id() ||
> > +           WARN_ON_ONCE(cpu >= nr_cpu_ids) ||
> > +           !cpu_online(cpu)) {
>
> This one looks good to me.
> Feel free to add
>
> Reviewed-by: Alexander Lobakin <aleksander.lobakin@intel.com>
>
> To your v2 before sending.

Thanks! I will:)
diff mbox series

Patch

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index ab970ded8a7b..b4f252dc91fb 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -7002,9 +7002,9 @@  void skb_attempt_defer_free(struct sk_buff *skb)
 	unsigned int defer_max;
 	bool kick;
 
-	if (WARN_ON_ONCE(cpu >= nr_cpu_ids) ||
+	if (cpu == raw_smp_processor_id() ||
 	    !cpu_online(cpu) ||
-	    cpu == raw_smp_processor_id()) {
+	    WARN_ON_ONCE(cpu >= nr_cpu_ids)) {
 nodefer:	kfree_skb_napi_cache(skb);
 		return;
 	}