Skip to contentSkip to conversation

selftests/futex: clang-inspired fixes

PATCH Superseded John Hubbard 2 participants 15 messages May 29, 2024 – May 30, 2024

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 cover selftests/futex: clang-inspired fixes

Hi,

Here's a few fixes that are part of my effort to get all selftests building cleanly under clang. Plus one that I noticed by inspection.

Changes since the first version:

1) Rebased onto Linux 6.10-rc1
2) Added Reviewed-by's.

...and it turns out that all three patches are still required, on -rc1, in order to get a clean clang build.

Enjoy!

thanks,
John Hubbard

John Hubbard (3):
selftests/futex: don't redefine .PHONY targets (all, clean) selftests/futex: don't pass a const char* to asprintf(3) selftests/futex: pass _GNU_SOURCE without a value to the compiler

 tools/testing/selftests/futex/Makefile                      | 2 --
 tools/testing/selftests/futex/functional/Makefile           | 2 +-
 tools/testing/selftests/futex/functional/futex_requeue_pi.c | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

base-commit: e0cce98fe279b64f4a7d81b7f5c3a23d80b92fbc

Signature · 1 line
2.45.1
#1 lore raw

PATCH v2 1/3 selftests/futex: don't redefine .PHONY targets (all, clean)

The .PHONY targets "all" and "clean" are both defined in the file that is included in the very next line: ../lib.mk.

---
 tools/testing/selftests/futex/Makefile | 2 --
 1 file changed, 2 deletions(-)
tools/testing/selftests/futex/Makefile +0 -2
index 11e157d7533b..78ab2cd111f6 100644
@@ -3,8 +3,6 @@ SUBDIRS := functional
 
 TEST_PROGS := run.sh
 
-.PHONY: all clean
-
 include ../lib.mk
 
 all:
Signature · 1 line
2.45.1
maintainer
#2 lore raw

Re: [PATCH v2 1/3] selftests/futex: don't redefine .PHONY targets (all, clean)

Quoted 3 lines · John Hubbard

The .PHONY targets "all" and "clean" are both defined in the file that is included in the very next line: ../lib.mk.

What problems are you seeing without this patch?
If I recall correctly, futex needs these defined.

Please provide information on why this change is
needed.

Quoted 11 lines
---
  tools/testing/selftests/futex/Makefile | 2 --
  1 file changed, 2 deletions(-)
tools/testing/selftests/futex/Makefile +0 -0
index 11e157d7533b..78ab2cd111f6 100644

tools/testing/selftests/futex/Makefile SUBDIRS := functional · line 8

Quoted 8 lines
tools/testing/selftests/futex/Makefile +0 -2
@@ -3,8 +3,6 @@ SUBDIRS := functional
 
  TEST_PROGS := run.sh
 
-.PHONY: all clean
-
  include ../lib.mk
 
  all:

thanks,
-- Shuah

#3 lore raw

Re: [PATCH v2 1/3] selftests/futex: don't redefine .PHONY targets (all, clean)

Quoted 6 lines · Shuah Khan
Quoted 3 lines · John Hubbard

The .PHONY targets "all" and "clean"  are both defined in the file that is included in the very next line: ../lib.mk.

What problems are you seeing without this patch?

Code duplication. It's a sin. :)

Quoted 1 line

If I recall correctly, futex needs these defined.

And so they are defined, in the very next line:

include ../lib.mk

...which has this:

.PHONY: run_tests all clean install emit_tests gen_mods_dir clean_mods_dir

Quoted 3 lines

Please provide information on why this change is
needed.

This patch is a valid cleanup, and doesn't introduce any problems that I'm aware of. If there *are* problems that show up, those would be deeper bugs, and I'll be happy to look into them and post solutions if it comes up.

We don't just let latent bugs rest in peace. We fix them.

thanks,

Signature · 2 lines
John Hubbard
NVIDIA
Quoted 20 lines
Quoted 12 lines

---
  tools/testing/selftests/futex/Makefile | 2 --

  1 file changed, 2 deletions(-)
tools/testing/selftests/futex/Makefile +0 -0
index 11e157d7533b..78ab2cd111f6 100644
@@ -3,8 +3,6 @@ SUBDIRS := functional
Quoted 5 lines

  TEST_PROGS := run.sh
-.PHONY: all clean
-
  include ../lib.mk
  all:

thanks,
-- Shuah

maintainer
#4 lore raw

Re: [PATCH v2 1/3] selftests/futex: don't redefine .PHONY targets (all, clean)

Quoted 9 lines · John Hubbard
Quoted 6 lines · Shuah Khan
Quoted 3 lines · John Hubbard

The .PHONY targets "all" and "clean"  are both defined in the file that is included in the very next line: ../lib.mk.

What problems are you seeing without this patch?

Code duplication. It's a sin. :)

Please mention that you are removing duplicate code.

futex Makefile overrides CLEAN - just making sure it does the cleanup correctly.

thanks,
-- Shuah

#5 lore raw

Re: [PATCH v2 1/3] selftests/futex: don't redefine .PHONY targets (all, clean)

Quoted 7 lines · Shuah Khan
Quoted 6 lines · John Hubbard
Quoted 5 lines · Shuah Khan
Quoted 3 lines · John Hubbard

The .PHONY targets "all" and "clean"  are both defined in the file that is included in the very next line: ../lib.mk.

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

What problems are you seeing without this patch?

Code duplication. It's a sin. :)

Please mention that you are removing duplicate code.

futex Makefile overrides CLEAN - just making sure it

(Overrides of Makefile things are per-item, so to speak, not per file, just to be clear.)

Quoted 2 lines

does the cleanup correctly.

OK sure, I'll update the commit message and post a v3, coming soon.

thanks,

Signature · 2 lines
John Hubbard
NVIDIA
#6 lore raw

PATCH v2 2/3 selftests/futex: don't pass a const char* to asprintf(3)

In reply to John Hubbard

When building with clang, via:

make LLVM=1 -C tools/testing/selftests

...clang issues a warning, because test_name is passed into asprintf(3), which then changes it.

Fix this by simply removing the const qualifier. This is a local automatic variable in a very short function, so there is not much need to use the compiler to enforce const-ness at this scope.

[1] https://lore.kernel.org/all/20240329-selftests-libmk-llvm-rfc-v1-1-2f9ed7d1c49f@valentinobst.de/

Fixes f17d8a87ecb5 ("selftests: fuxex: Report a unique test name per run of futex_requeue_pi")
---
 tools/testing/selftests/futex/functional/futex_requeue_pi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/futex/functional/futex_requeue_pi.c +1 -1
index 7f3ca5c78df1..215c6cb539b4 100644
@@ -360,7 +360,7 @@ int unit_test(int broadcast, long lock, int third_party_owner, long timeout_ns)
 
 int main(int argc, char *argv[])
 {
-	const char *test_name;
+	char *test_name;
 	int c, ret;
 
 	while ((c = getopt(argc, argv, "bchlot:v:")) != -1) {
Signature · 1 line
2.45.1
maintainer
#7 lore raw

Re: [PATCH v2 2/3] selftests/futex: don't pass a const char* to asprintf(3)

Quoted 6 lines · John Hubbard

When building with clang, via:

make LLVM=1 -C tools/testing/selftests

...clang issues a warning, because test_name is passed into asprintf(3), which then changes it.

Please include the warning in the commit log.

Quoted 19 lines

Fix this by simply removing the const qualifier. This is a local automatic variable in a very short function, so there is not much need to use the compiler to enforce const-ness at this scope.

[1] https://lore.kernel.org/all/20240329-selftests-libmk-llvm-rfc-v1-1-2f9ed7d1c49f@valentinobst.de/

Fixes f17d8a87ecb5 ("selftests: fuxex: Report a unique test name per run of futex_requeue_pi")
---
  tools/testing/selftests/futex/functional/futex_requeue_pi.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/futex/functional/futex_requeue_pi.c +0 -0
index 7f3ca5c78df1..215c6cb539b4 100644

tools/testing/selftests/futex/functional/futex_requeue_pi.c int unit_test(int broadcast, long lock, int third_party_owner, long timeout_ns) · line 366

Quoted 8 lines
tools/testing/selftests/futex/functional/futex_requeue_pi.c +1 -1
@@ -360,7 +360,7 @@ int unit_test(int broadcast, long lock, int third_party_owner, long timeout_ns)
 
  int main(int argc, char *argv[])
  {
-	const char *test_name;
+	char *test_name;
  	int c, ret;
 
  	while ((c = getopt(argc, argv, "bchlot:v:")) != -1) {

thanks,
-- Shuah

#8 lore raw

Re: [PATCH v2 2/3] selftests/futex: don't pass a const char* to asprintf(3)

Quoted 9 lines · Shuah Khan
Quoted 6 lines · John Hubbard

When building with clang, via:

     make LLVM=1 -C tools/testing/selftests

...clang issues a warning, because test_name is passed into asprintf(3), which then changes it.

Please include the warning in the commit log.

Ah, OK, the warning is:

futex_requeue_pi.c:403:17: warning: passing 'const char **' to parameter of type 'char **' discards qualifiers in nested pointer types [-Wincompatible-pointer-types-discards-qualifiers]

Please let me know if you'd prefer a v3, or if you'd rather fix it up, whatever seems easiest for you.

thanks,

Signature · 2 lines
John Hubbard
NVIDIA
maintainer
#9 lore raw

Re: [PATCH v2 2/3] selftests/futex: don't pass a const char* to asprintf(3)

Quoted 13 lines · John Hubbard
Quoted 9 lines · Shuah Khan
Quoted 6 lines · John Hubbard

When building with clang, via:

     make LLVM=1 -C tools/testing/selftests

...clang issues a warning, because test_name is passed into asprintf(3), which then changes it.

Please include the warning in the commit log.

Ah, OK, the warning is:

Quoted 8 lines

futex_requeue_pi.c:403:17: warning: passing 'const char **' to parameter of type 'char **' discards qualifiers in nested pointer types [-Wincompatible-pointer-types-discards-qualifiers]

Please let me know if you'd prefer a v3, or if you'd rather fix it up, whatever seems easiest for you.

Yes please send me v3.

thanks,
-- Shuah

#10 lore raw

Re: [PATCH v2 2/3] selftests/futex: don't pass a const char* to asprintf(3)

Quoted 19 lines · Shuah Khan
Quoted 18 lines · John Hubbard
Quoted 9 lines · Shuah Khan
Quoted 6 lines · John Hubbard

When building with clang, via:

     make LLVM=1 -C tools/testing/selftests

...clang issues a warning, because test_name is passed into asprintf(3), which then changes it.

Please include the warning in the commit log.

Ah, OK, the warning is:

futex_requeue_pi.c:403:17: warning: passing 'const char **' to parameter of type 'char **' discards qualifiers in nested pointer types [-Wincompatible-pointer-types-discards-qualifiers]

Quoted 6 lines
Quoted 3 lines

Please let me know if you'd prefer a v3, or if you'd rather fix it up, whatever seems easiest for you.

Yes please send me v3.

OK, coming soon, hopefully a bit later today, in fact.

thanks,

Signature · 2 lines
John Hubbard
NVIDIA
#11 lore raw

PATCH v2 3/3 selftests/futex: pass _GNU_SOURCE without a value to the compiler

In reply to John Hubbard

It's slightly better to set _GNU_SOURCE in the source code, but if one must do it via the compiler invocation, then the best way to do so is this:

    $(CC) -D_GNU_SOURCE=

...because otherwise, if this form is used:

    $(CC) -D_GNU_SOURCE

...then that leads the compiler to set a value, as if you had passed in:

    $(CC) -D_GNU_SOURCE=1

That, in turn, leads to warnings under both gcc and clang, like this:

futex_requeue_pi.c:20: warning: "_GNU_SOURCE" redefined

Fix this by using the "-D_GNU_SOURCE=" form.

---
 tools/testing/selftests/futex/functional/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/futex/functional/Makefile +1 -1
index a392d0917b4e..994fa3468f17 100644
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 INCLUDES := -I../include -I../../ $(KHDR_INCLUDES)
-CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE -pthread $(INCLUDES) $(KHDR_INCLUDES)
+CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE= -pthread $(INCLUDES) $(KHDR_INCLUDES)
 LDLIBS := -lpthread -lrt
 
 LOCAL_HDRS := \
Signature · 1 line
2.45.1
maintainer
#12 lore raw

Re: [PATCH v2 3/3] selftests/futex: pass _GNU_SOURCE without a value to the compiler

Quoted 32 lines · John Hubbard

It's slightly better to set _GNU_SOURCE in the source code, but if one must do it via the compiler invocation, then the best way to do so is this:

     $(CC) -D_GNU_SOURCE=

...because otherwise, if this form is used:

     $(CC) -D_GNU_SOURCE

...then that leads the compiler to set a value, as if you had passed in:

     $(CC) -D_GNU_SOURCE=1

That, in turn, leads to warnings under both gcc and clang, like this:

futex_requeue_pi.c:20: warning: "_GNU_SOURCE" redefined

Fix this by using the "-D_GNU_SOURCE=" form.

---
  tools/testing/selftests/futex/functional/Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/futex/functional/Makefile +0 -0
index a392d0917b4e..994fa3468f17 100644

tools/testing/selftests/futex/functional/Makefile line 6

Quoted 7 lines
tools/testing/selftests/futex/functional/Makefile +1 -1
@@ -1,6 +1,6 @@
  # SPDX-License-Identifier: GPL-2.0
  INCLUDES := -I../include -I../../ $(KHDR_INCLUDES)
-CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE -pthread $(INCLUDES) $(KHDR_INCLUDES)
+CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE= -pthread $(INCLUDES) $(KHDR_INCLUDES)
  LDLIBS := -lpthread -lrt
 
  LOCAL_HDRS := \

This looks fine. Applied now to linux-kselftest fixes branch

thanks,
-- Shuah

maintainer
#13 lore raw
In reply to John Hubbard
Quoted 5 lines · John Hubbard

Hi,

Here's a few fixes that are part of my effort to get all selftests building cleanly under clang. Plus one that I noticed by inspection.

Quoted 7 lines

Changes since the first version:

1) Rebased onto Linux 6.10-rc1
2) Added Reviewed-by's.

...and it turns out that all three patches are still required, on -rc1, in order to get a clean clang build.

Thank you. I will apply these for the next rc.

thanks,
-- Shuah

maintainer
#14 lore raw
Quoted 8 lines · Shuah Khan
Quoted 7 lines · John Hubbard

Hi,

Here's a few fixes that are part of my effort to get all selftests building cleanly under clang. Plus one that I noticed by inspection.

Changes since the first version:

Quoted 7 lines
Quoted 5 lines

1) Rebased onto Linux 6.10-rc1
2) Added Reviewed-by's.

...and it turns out that all three patches are still required, on -rc1, in order to get a clean clang build.

Thank you. I will apply these for the next rc.

John Hubbard (3):
selftests/futex: don't redefine .PHONY targets (all, clean) selftests/futex: don't pass a const char* to asprintf(3)

Patch 1/3 and 2/3 please see changes requested.

Applied to linux-kselftest fixes branch
selftests/futex: pass _GNU_SOURCE without a value to the compiler

thanks,
-- Shuah