Skip to contentSkip to conversation

eal: fix check when retrieving current cpu affinity

PATCH Superseded David Marchand 4 participants 9 messages Feb 14, 2019 – Mar 7, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 eal: fix check when retrieving current cpu affinity

pthread_getaffinity_np returns a >0 value when failing.

This is mainly for the sake of correctness.
The only case where it could fail is when passing an incorrect cpuset size wrt to the kernel.

Fixes 2eba8d21f3c9 ("eal: restrict cores auto detection")
---
 lib/librte_eal/common/eal_common_options.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
lib/librte_eal/common/eal_common_options.c +2 -3
index 6c96f45..1f45f82 100644
@@ -1343,10 +1343,9 @@ static int xdigit2val(unsigned char c)
 	unsigned int lcore_id;
 	unsigned int removed = 0;
 	rte_cpuset_t affinity_set;
-	pthread_t tid = pthread_self();
 
-	if (pthread_getaffinity_np(tid, sizeof(rte_cpuset_t),
-				&affinity_set) < 0)
+	if (pthread_getaffinity_np(pthread_self(), sizeof(rte_cpuset_t),
+				&affinity_set))
 		CPU_ZERO(&affinity_set);
 
 	for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
Signature · 1 line
1.8.3.1
#1 lore raw
Quoted 20 lines · David Marchand

pthread_getaffinity_np returns a >0 value when failing.

This is mainly for the sake of correctness.
The only case where it could fail is when passing an incorrect cpuset size wrt to the kernel.

Fixes 2eba8d21f3c9 ("eal: restrict cores auto detection")
---
  lib/librte_eal/common/eal_common_options.c | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
lib/librte_eal/common/eal_common_options.c +0 -0
index 6c96f45..1f45f82 100644
@@ -1343,10 +1343,9 @@ static int xdigit2val(unsigned char c)
  	unsigned int lcore_id;
  	unsigned int removed = 0;

lib/librte_eal/common/eal_common_options.c static int xdigit2val(unsigned char c) · line 1351

Quoted 10 lines
lib/librte_eal/common/eal_common_options.c +2 -3
  	rte_cpuset_t affinity_set;
-	pthread_t tid = pthread_self();
 
-	if (pthread_getaffinity_np(tid, sizeof(rte_cpuset_t),
-				&affinity_set) < 0)
+	if (pthread_getaffinity_np(pthread_self(), sizeof(rte_cpuset_t),
+				&affinity_set))
  		CPU_ZERO(&affinity_set);
 
  	for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
CC stable?
Signature · 2 lines
Thanks,
Anatoly
#2 lore raw
Quoted 30 lines · Anatoly
Quoted 6 lines · David Marchand

pthread_getaffinity_np returns a >0 value when failing.

This is mainly for the sake of correctness.
The only case where it could fail is when passing an incorrect cpuset size wrt to the kernel.

Review

Quoted 7 lines
Fixes 2eba8d21f3c9 ("eal: restrict cores auto detection")
---
  lib/librte_eal/common/eal_common_options.c | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/lib/librte_eal/common/eal_common_options.c

Quoted 15 lines

index 6c96f45..1f45f82 100644

lib/librte_eal/common/eal_common_options.c +2 -3
@@ -1343,10 +1343,9 @@ static int xdigit2val(unsigned char c)
      unsigned int lcore_id;
      unsigned int removed = 0;
      rte_cpuset_t affinity_set;
-     pthread_t tid = pthread_self();
 
-     if (pthread_getaffinity_np(tid, sizeof(rte_cpuset_t),
-                             &affinity_set) < 0)
+     if (pthread_getaffinity_np(pthread_self(), sizeof(rte_cpuset_t),
+                             &affinity_set))
              CPU_ZERO(&affinity_set);
 
Quoted 4 lines

lib/librte_eal/common/eal_common_options.c static int xdigit2val(unsigned char c) · line 1351

Quoted 2 lines
lib/librte_eal/common/eal_common_options.c +0 -0
      for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
CC stable?

Not really sure about CCing stable for this.

I did not get errors with pthread_getaffinity_np so far. Afaiu, it would need the kernel and libc to have different cpuset sizes. I did not investigate in which situations it could happen.

Signature · 1 line
David Marchand
#3 lore raw
Quoted 41 lines · David Marchand

On Thu, Feb 14, 2019 at 5:44 PM Burakov, Anatoly <[email protected] <mailto:[email protected]>> wrote:

    On 14-Feb-19 1:27 PM, David Marchand wrote:
     > pthread_getaffinity_np returns a >0 value when failing.
     >
     > This is mainly for the sake of correctness.
     > The only case where it could fail is when passing an incorrect cpuset
     > size wrt to the kernel.
     >
     > Fixes: 2eba8d21f3c9 ("eal: restrict cores auto detection")
     > Signed-off-by: David Marchand <[email protected]
    <mailto:[email protected]>>
     > ---
     >   lib/librte_eal/common/eal_common_options.c | 5 ++---
     >   1 file changed, 2 insertions(+), 3 deletions(-)
     >
     > diff --git a/lib/librte_eal/common/eal_common_options.c
    b/lib/librte_eal/common/eal_common_options.c
     > index 6c96f45..1f45f82 100644
     > --- a/lib/librte_eal/common/eal_common_options.c
     > +++ b/lib/librte_eal/common/eal_common_options.c
     > @@ -1343,10 +1343,9 @@ static int xdigit2val(unsigned char c)
     >       unsigned int lcore_id;
     >       unsigned int removed = 0;
     >       rte_cpuset_t affinity_set;
     > -     pthread_t tid = pthread_self();
     >
     > -     if (pthread_getaffinity_np(tid, sizeof(rte_cpuset_t),
     > -                             &affinity_set) < 0)
     > +     if (pthread_getaffinity_np(pthread_self(),
    sizeof(rte_cpuset_t),
     > +                             &affinity_set))
     >               CPU_ZERO(&affinity_set);
     >
     >       for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
     >
    CC: stable?
Quoted 6 lines

Not really sure about CCing stable for this.

I did not get errors with pthread_getaffinity_np so far. Afaiu, it would need the kernel and libc to have different cpuset sizes. I did not investigate in which situations it could happen.

You're incorrectly handling error condition - that's a bug regardless of how likely it is to occur :)

Signature · 2 lines
Thanks,
Anatoly
#4 lore raw
Quoted 7 lines · Anatoly
Quoted 6 lines · David Marchand

On Thu, Feb 14, 2019 at 5:44 PM Burakov, Anatoly <[email protected] <mailto:[email protected]>> wrote:
CC: stable?

Not really sure about CCing stable for this.

Quoted 8 lines
Quoted 4 lines

I did not get errors with pthread_getaffinity_np so far. Afaiu, it would need the kernel and libc to have different cpuset sizes. I did not investigate in which situations it could happen.

You're incorrectly handling error condition - that's a bug regardless of how likely it is to occur :)

Ok will resend with Cc:

Signature · 1 line
David Marchand
#5 lore raw

PATCH v2 1/1 eal: fix check when retrieving current cpu affinity

In reply to David Marchand

pthread_getaffinity_np returns a >0 value when failing.

This is mainly for the sake of correctness.
The only case where it could fail is when passing an incorrect cpuset size wrt to the kernel.

Fixes 2eba8d21f3c9 ("eal: restrict cores auto detection")

---
Changelog since v1:
- added missing Cc: [email protected]

---
 lib/librte_eal/common/eal_common_options.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
lib/librte_eal/common/eal_common_options.c +2 -3
index 6c96f45..1f45f82 100644
@@ -1343,10 +1343,9 @@ static int xdigit2val(unsigned char c)
 	unsigned int lcore_id;
 	unsigned int removed = 0;
 	rte_cpuset_t affinity_set;
-	pthread_t tid = pthread_self();
 
-	if (pthread_getaffinity_np(tid, sizeof(rte_cpuset_t),
-				&affinity_set) < 0)
+	if (pthread_getaffinity_np(pthread_self(), sizeof(rte_cpuset_t),
+				&affinity_set))
 		CPU_ZERO(&affinity_set);
 
 	for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
Signature · 1 line
1.8.3.1
Reviewed-by on v2 1/1
#6 lore raw
Quoted 10 lines · David Marchand

pthread_getaffinity_np returns a >0 value when failing.

This is mainly for the sake of correctness.
The only case where it could fail is when passing an incorrect cpuset size wrt to the kernel.

Fixes 2eba8d21f3c9 ("eal: restrict cores auto detection")

---

Signature · 2 lines
Thanks,
Anatoly
#7 lore raw

20/02/2019 17:02, Burakov, Anatoly:

Quoted 7 lines · David Marchand
Quoted 6 lines

pthread_getaffinity_np returns a >0 value when failing.

This is mainly for the sake of correctness.
The only case where it could fail is when passing an incorrect cpuset size wrt to the kernel.

Quoted 5 lines
Quoted 3 lines
Fixes 2eba8d21f3c9 ("eal: restrict cores auto detection")

Applied, thanks

Reviewed-by on v2 1/1
#8 lore raw
In reply to David Marchand

בתאריך יום ג׳, 19 בפבר׳ 2019, 22:38, מאת David Marchand ‏< [email protected]>:

Quoted 39 lines

pthread_getaffinity_np returns a >0 value when failing.

This is mainly for the sake of correctness.
The only case where it could fail is when passing an incorrect cpuset size wrt to the kernel.

Fixes 2eba8d21f3c9 ("eal: restrict cores auto detection")

---
Changelog since v1:
- added missing Cc: [email protected]

---
 lib/librte_eal/common/eal_common_options.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
lib/librte_eal/common/eal_common_options.c +2 -4
index 6c96f45..1f45f82 100644
@@ -1343,10 +1343,9 @@ static int xdigit2val(unsigned char c)
        unsigned int lcore_id;
        unsigned int removed = 0;
        rte_cpuset_t affinity_set;
-       pthread_t tid = pthread_self();
 
-       if (pthread_getaffinity_np(tid, sizeof(rte_cpuset_t),
-                               &affinity_set) < 0)
+       if (pthread_getaffinity_np(pthread_self(), sizeof(rte_cpuset_t),
+                               &affinity_set))
                CPU_ZERO(&affinity_set);
 
        for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
--

1.8.3.1