Skip to contentSkip to conversation

selftests/bpf: Fix conflicts with built-in functions in bpf_iter_ksym

PATCH Superseded James Hilliard 2 participants 6 messages Aug 26, 2022 – Dec 3, 2022

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 selftests/bpf: Fix conflicts with built-in functions in bpf_iter_ksym

Both tolower and toupper are built in c functions, we should not redefine them as this can result in a build error.

Fixes the following errors:
progs/bpf_iter_ksym.c:10:20: error: conflicting types for built-in function 'tolower'; expected 'int(int)' [-Werror=builtin-declaration-mismatch]
10 | static inline char tolower(char c)

      |                    ^~~~~~~
progs/bpf_iter_ksym.c:5:1: note: 'tolower' is declared in header '<ctype.h>'
    4 | #include <bpf/bpf_helpers.h>
  +++ |+#include <ctype.h>
    5 |
progs/bpf_iter_ksym.c:17:20: error: conflicting types for built-in function 'toupper'; expected 'int(int)' [-Werror=builtin-declaration-mismatch]
   17 | static inline char toupper(char c)
      |                    ^~~~~~~

progs/bpf_iter_ksym.c:17:20: note: 'toupper' is declared in header '<ctype.h>'

---
 tools/testing/selftests/bpf/progs/bpf_iter_ksym.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/progs/bpf_iter_ksym.c +3 -3
index 285c008cbf9c..9ba14c37bbcc 100644
@@ -7,14 +7,14 @@ char _license[] SEC("license") = "GPL";
 
 unsigned long last_sym_value = 0;
 
-static inline char tolower(char c)
+static inline char to_lower(char c)
 {
 	if (c >= 'A' && c <= 'Z')
 		c += ('a' - 'A');
 	return c;
 }
 
-static inline char toupper(char c)
+static inline char to_upper(char c)
 {
 	if (c >= 'a' && c <= 'z')
 		c -= ('a' - 'A');
@@ -54,7 +54,7 @@ int dump_ksym(struct bpf_iter__ksym *ctx)
 	type = iter->type;
 
 	if (iter->module_name[0]) {
-		type = iter->exported ? toupper(type) : tolower(type);
+		type = iter->exported ? to_upper(type) : to_lower(type);
 		BPF_SEQ_PRINTF(seq, "0x%llx %c %s [ %s ] ",
 			       value, type, iter->name, iter->module_name);
 	} else {
Signature · 1 line
2.34.1
#1 lore raw
Quoted 2 lines · James Hilliard

Both tolower and toupper are built in c functions, we should not

Really? How come? Can you point out where this is specified in C standard? From what I can tell you have to include <ctype.h> to get toupper()/tolower().

This seems like yet another GCC-BPF quirk?

Quoted 53 lines

redefine them as this can result in a build error.

Fixes the following errors:
progs/bpf_iter_ksym.c:10:20: error: conflicting types for built-in function 'tolower'; expected 'int(int)' [-Werror=builtin-declaration-mismatch]
10 | static inline char tolower(char c)

      |                    ^~~~~~~
progs/bpf_iter_ksym.c:5:1: note: 'tolower' is declared in header '<ctype.h>'
    4 | #include <bpf/bpf_helpers.h>
  +++ |+#include <ctype.h>
    5 |
progs/bpf_iter_ksym.c:17:20: error: conflicting types for built-in function 'toupper'; expected 'int(int)' [-Werror=builtin-declaration-mismatch]
   17 | static inline char toupper(char c)
      |                    ^~~~~~~

progs/bpf_iter_ksym.c:17:20: note: 'toupper' is declared in header '<ctype.h>'

---
 tools/testing/selftests/bpf/progs/bpf_iter_ksym.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/progs/bpf_iter_ksym.c +3 -4
index 285c008cbf9c..9ba14c37bbcc 100644
@@ -7,14 +7,14 @@ char _license[] SEC("license") = "GPL";
 
 unsigned long last_sym_value = 0;
 
-static inline char tolower(char c)
+static inline char to_lower(char c)
 {
        if (c >= 'A' && c <= 'Z')
                c += ('a' - 'A');
        return c;
 }
 
-static inline char toupper(char c)
+static inline char to_upper(char c)
 {
        if (c >= 'a' && c <= 'z')
                c -= ('a' - 'A');
@@ -54,7 +54,7 @@ int dump_ksym(struct bpf_iter__ksym *ctx)
        type = iter->type;
 
        if (iter->module_name[0]) {
-               type = iter->exported ? toupper(type) : tolower(type);
+               type = iter->exported ? to_upper(type) : to_lower(type);
                BPF_SEQ_PRINTF(seq, "0x%llx %c %s [ %s ] ",
                               value, type, iter->name, iter->module_name);
        } else {
--

2.34.1

#2 lore raw
Quoted 9 lines · Andrii Nakryiko
Quoted 2 lines · James Hilliard

Both tolower and toupper are built in c functions, we should not

Really? How come? Can you point out where this is specified in C standard? From what I can tell you have to include <ctype.h> to get toupper()/tolower().

See background on this sort of issue:
https://stackoverflow.com/a/20582607
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=12213

(C99, 7.1.3p1) "All identifiers with external linkage in any of the following subclauses (including the future library directions) are always reserved for use as identifiers with external linkage."

Quoted 2 lines

This seems like yet another GCC-BPF quirk?

Seems GCC takes a stricter interpretation of the standard here than llvm.

It's also documented behavior in GCC:
https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html#index-std-2

See:
The ISO C90 functions abort, abs, acos, asin, atan2, atan, calloc, ceil, cosh, cos, exit, exp, fabs, floor, fmod, fprintf, fputs, free, frexp, fscanf, isalnum, isalpha, iscntrl, isdigit, isgraph, islower, isprint, ispunct, isspace, isupper, isxdigit, tolower, toupper, labs, ldexp, log10, log, malloc, memchr, memcmp, memcpy, memset, modf, pow, printf, putchar, puts, realloc, scanf, sinh, sin, snprintf, sprintf, sqrt, sscanf, strcat, strchr, strcmp, strcpy,
strcspn, strlen, strncat, strncmp, strncpy, strpbrk, strrchr, strspn, strstr, tanh, tan, vfprintf, vprintf and vsprintf are all recognized as built-in functions
unless -fno-builtin is specified (or -fno-builtin-function is specified for an individual function).

We could disable builtin functions but it seems more correct to just rename it so that it doesn't conflict.

Quoted 54 lines
Quoted 54 lines

redefine them as this can result in a build error.

Fixes the following errors:
progs/bpf_iter_ksym.c:10:20: error: conflicting types for built-in function 'tolower'; expected 'int(int)' [-Werror=builtin-declaration-mismatch]
10 | static inline char tolower(char c)

      |                    ^~~~~~~
progs/bpf_iter_ksym.c:5:1: note: 'tolower' is declared in header '<ctype.h>'
    4 | #include <bpf/bpf_helpers.h>
  +++ |+#include <ctype.h>
    5 |
progs/bpf_iter_ksym.c:17:20: error: conflicting types for built-in function 'toupper'; expected 'int(int)' [-Werror=builtin-declaration-mismatch]
   17 | static inline char toupper(char c)
      |                    ^~~~~~~

progs/bpf_iter_ksym.c:17:20: note: 'toupper' is declared in header '<ctype.h>'

---
 tools/testing/selftests/bpf/progs/bpf_iter_ksym.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/progs/bpf_iter_ksym.c +3 -4
index 285c008cbf9c..9ba14c37bbcc 100644
@@ -7,14 +7,14 @@ char _license[] SEC("license") = "GPL";
 
 unsigned long last_sym_value = 0;
 
-static inline char tolower(char c)
+static inline char to_lower(char c)
 {
        if (c >= 'A' && c <= 'Z')
                c += ('a' - 'A');
        return c;
 }
 
-static inline char toupper(char c)
+static inline char to_upper(char c)
 {
        if (c >= 'a' && c <= 'z')
                c -= ('a' - 'A');
@@ -54,7 +54,7 @@ int dump_ksym(struct bpf_iter__ksym *ctx)
        type = iter->type;
 
        if (iter->module_name[0]) {
-               type = iter->exported ? toupper(type) : tolower(type);
+               type = iter->exported ? to_upper(type) : to_lower(type);
                BPF_SEQ_PRINTF(seq, "0x%llx %c %s [ %s ] ",
                               value, type, iter->name, iter->module_name);
        } else {
--

2.34.1

#3 lore raw
Quoted 13 lines · James Hilliard
Quoted 9 lines · Andrii Nakryiko
Quoted 2 lines · James Hilliard

Both tolower and toupper are built in c functions, we should not

Really? How come? Can you point out where this is specified in C standard? From what I can tell you have to include <ctype.h> to get toupper()/tolower().

Quoted 8 lines

See background on this sort of issue:
https://stackoverflow.com/a/20582607
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=12213

(C99, 7.1.3p1) "All identifiers with external linkage in any of the following subclauses (including the future library directions) are always reserved for use as identifiers with external linkage."

Sigh, ok. Ghost functions: you can't use them without ctype.h, but you can't define your own either. Very nice.

Can you please put all these details into a commit for the future? With that:

Quoted 80 lines
Quoted 2 lines

This seems like yet another GCC-BPF quirk?

Seems GCC takes a stricter interpretation of the standard here than llvm.

It's also documented behavior in GCC:
https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html#index-std-2

See:
The ISO C90 functions abort, abs, acos, asin, atan2, atan, calloc, ceil, cosh, cos, exit, exp, fabs, floor, fmod, fprintf, fputs, free, frexp, fscanf, isalnum, isalpha, iscntrl, isdigit, isgraph, islower, isprint, ispunct, isspace, isupper, isxdigit, tolower, toupper, labs, ldexp, log10, log, malloc, memchr, memcmp, memcpy, memset, modf, pow, printf, putchar, puts, realloc, scanf, sinh, sin, snprintf, sprintf, sqrt, sscanf, strcat, strchr, strcmp, strcpy,
strcspn, strlen, strncat, strncmp, strncpy, strpbrk, strrchr, strspn, strstr, tanh, tan, vfprintf, vprintf and vsprintf are all recognized as built-in functions
unless -fno-builtin is specified (or -fno-builtin-function is specified for an individual function).

We could disable builtin functions but it seems more correct to just rename it so that it doesn't conflict.

Quoted 54 lines
Quoted 54 lines

redefine them as this can result in a build error.

Fixes the following errors:
progs/bpf_iter_ksym.c:10:20: error: conflicting types for built-in function 'tolower'; expected 'int(int)' [-Werror=builtin-declaration-mismatch]
10 | static inline char tolower(char c)

      |                    ^~~~~~~
progs/bpf_iter_ksym.c:5:1: note: 'tolower' is declared in header '<ctype.h>'
    4 | #include <bpf/bpf_helpers.h>
  +++ |+#include <ctype.h>
    5 |
progs/bpf_iter_ksym.c:17:20: error: conflicting types for built-in function 'toupper'; expected 'int(int)' [-Werror=builtin-declaration-mismatch]
   17 | static inline char toupper(char c)
      |                    ^~~~~~~

progs/bpf_iter_ksym.c:17:20: note: 'toupper' is declared in header '<ctype.h>'

---
 tools/testing/selftests/bpf/progs/bpf_iter_ksym.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/progs/bpf_iter_ksym.c +3 -4
index 285c008cbf9c..9ba14c37bbcc 100644
@@ -7,14 +7,14 @@ char _license[] SEC("license") = "GPL";
 
 unsigned long last_sym_value = 0;
 
-static inline char tolower(char c)
+static inline char to_lower(char c)
 {
        if (c >= 'A' && c <= 'Z')
                c += ('a' - 'A');
        return c;
 }
 
-static inline char toupper(char c)
+static inline char to_upper(char c)
 {
        if (c >= 'a' && c <= 'z')
                c -= ('a' - 'A');
@@ -54,7 +54,7 @@ int dump_ksym(struct bpf_iter__ksym *ctx)
        type = iter->type;
 
        if (iter->module_name[0]) {
-               type = iter->exported ? toupper(type) : tolower(type);
+               type = iter->exported ? to_upper(type) : to_lower(type);
                BPF_SEQ_PRINTF(seq, "0x%llx %c %s [ %s ] ",
                               value, type, iter->name, iter->module_name);
        } else {
--

2.34.1

#4 lore raw
Quoted 25 lines · Andrii Nakryiko
Quoted 13 lines · James Hilliard
Quoted 9 lines · Andrii Nakryiko
Quoted 2 lines · James Hilliard

Both tolower and toupper are built in c functions, we should not

Really? How come? Can you point out where this is specified in C standard? From what I can tell you have to include <ctype.h> to get toupper()/tolower().

Quoted 8 lines

See background on this sort of issue:
https://stackoverflow.com/a/20582607
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=12213

(C99, 7.1.3p1) "All identifiers with external linkage in any of the following subclauses (including the future library directions) are always reserved for use as identifiers with external linkage."

Quoted 4 lines

Sigh, ok. Ghost functions: you can't use them without ctype.h, but you can't define your own either. Very nice.

Can you please put all these details into a commit for the future? With that:

Sure

Quoted 2 lines

Is this good to apply or should I send a v2?

Quoted 81 lines
Quoted 81 lines
Quoted 3 lines

This seems like yet another GCC-BPF quirk?

Seems GCC takes a stricter interpretation of the standard here than llvm.

It's also documented behavior in GCC:
https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html#index-std-2

See:
The ISO C90 functions abort, abs, acos, asin, atan2, atan, calloc, ceil, cosh, cos, exit, exp, fabs, floor, fmod, fprintf, fputs, free, frexp, fscanf, isalnum, isalpha, iscntrl, isdigit, isgraph, islower, isprint, ispunct, isspace, isupper, isxdigit, tolower, toupper, labs, ldexp, log10, log, malloc, memchr, memcmp, memcpy, memset, modf, pow, printf, putchar, puts, realloc, scanf, sinh, sin, snprintf, sprintf, sqrt, sscanf, strcat, strchr, strcmp, strcpy,
strcspn, strlen, strncat, strncmp, strncpy, strpbrk, strrchr, strspn, strstr, tanh, tan, vfprintf, vprintf and vsprintf are all recognized as built-in functions
unless -fno-builtin is specified (or -fno-builtin-function is specified for an individual function).

We could disable builtin functions but it seems more correct to just rename it so that it doesn't conflict.

Quoted 54 lines
Quoted 54 lines

redefine them as this can result in a build error.

Fixes the following errors:
progs/bpf_iter_ksym.c:10:20: error: conflicting types for built-in function 'tolower'; expected 'int(int)' [-Werror=builtin-declaration-mismatch]
10 | static inline char tolower(char c)

      |                    ^~~~~~~
progs/bpf_iter_ksym.c:5:1: note: 'tolower' is declared in header '<ctype.h>'
    4 | #include <bpf/bpf_helpers.h>
  +++ |+#include <ctype.h>
    5 |
progs/bpf_iter_ksym.c:17:20: error: conflicting types for built-in function 'toupper'; expected 'int(int)' [-Werror=builtin-declaration-mismatch]
   17 | static inline char toupper(char c)
      |                    ^~~~~~~

progs/bpf_iter_ksym.c:17:20: note: 'toupper' is declared in header '<ctype.h>'

---
 tools/testing/selftests/bpf/progs/bpf_iter_ksym.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/progs/bpf_iter_ksym.c +3 -4
index 285c008cbf9c..9ba14c37bbcc 100644
@@ -7,14 +7,14 @@ char _license[] SEC("license") = "GPL";
 
 unsigned long last_sym_value = 0;
 
-static inline char tolower(char c)
+static inline char to_lower(char c)
 {
        if (c >= 'A' && c <= 'Z')
                c += ('a' - 'A');
        return c;
 }
 
-static inline char toupper(char c)
+static inline char to_upper(char c)
 {
        if (c >= 'a' && c <= 'z')
                c -= ('a' - 'A');
@@ -54,7 +54,7 @@ int dump_ksym(struct bpf_iter__ksym *ctx)
        type = iter->type;
 
        if (iter->module_name[0]) {
-               type = iter->exported ? toupper(type) : tolower(type);
+               type = iter->exported ? to_upper(type) : to_lower(type);
                BPF_SEQ_PRINTF(seq, "0x%llx %c %s [ %s ] ",
                               value, type, iter->name, iter->module_name);
        } else {
--

2.34.1

#5 lore raw
Quoted 31 lines · James Hilliard
Quoted 28 lines · Andrii Nakryiko
Quoted 13 lines · James Hilliard
Quoted 9 lines · Andrii Nakryiko
Quoted 2 lines · James Hilliard

Both tolower and toupper are built in c functions, we should not

Really? How come? Can you point out where this is specified in C standard? From what I can tell you have to include <ctype.h> to get toupper()/tolower().

Quoted 8 lines

See background on this sort of issue:
https://stackoverflow.com/a/20582607
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=12213

(C99, 7.1.3p1) "All identifiers with external linkage in any of the following subclauses (including the future library directions) are always reserved for use as identifiers with external linkage."

Sigh, ok. Ghost functions: you can't use them without ctype.h, but you can't define your own either. Very nice.

Quoted 8 lines
Quoted 1 line

Can you please put all these details into a commit for the future? With that:

Sure

Quoted 2 lines

Is this good to apply or should I send a v2?

please add those details and resend v2?

Quoted 82 lines
Quoted 82 lines
Quoted 82 lines
Quoted 4 lines

This seems like yet another GCC-BPF quirk?

Seems GCC takes a stricter interpretation of the standard here than llvm.

It's also documented behavior in GCC:
https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html#index-std-2

See:
The ISO C90 functions abort, abs, acos, asin, atan2, atan, calloc, ceil, cosh, cos, exit, exp, fabs, floor, fmod, fprintf, fputs, free, frexp, fscanf, isalnum, isalpha, iscntrl, isdigit, isgraph, islower, isprint, ispunct, isspace, isupper, isxdigit, tolower, toupper, labs, ldexp, log10, log, malloc, memchr, memcmp, memcpy, memset, modf, pow, printf, putchar, puts, realloc, scanf, sinh, sin, snprintf, sprintf, sqrt, sscanf, strcat, strchr, strcmp, strcpy,
strcspn, strlen, strncat, strncmp, strncpy, strpbrk, strrchr, strspn, strstr, tanh, tan, vfprintf, vprintf and vsprintf are all recognized as built-in functions
unless -fno-builtin is specified (or -fno-builtin-function is specified for an individual function).

We could disable builtin functions but it seems more correct to just rename it so that it doesn't conflict.

Quoted 54 lines
Quoted 54 lines

redefine them as this can result in a build error.

Fixes the following errors:
progs/bpf_iter_ksym.c:10:20: error: conflicting types for built-in function 'tolower'; expected 'int(int)' [-Werror=builtin-declaration-mismatch]
10 | static inline char tolower(char c)

      |                    ^~~~~~~
progs/bpf_iter_ksym.c:5:1: note: 'tolower' is declared in header '<ctype.h>'
    4 | #include <bpf/bpf_helpers.h>
  +++ |+#include <ctype.h>
    5 |
progs/bpf_iter_ksym.c:17:20: error: conflicting types for built-in function 'toupper'; expected 'int(int)' [-Werror=builtin-declaration-mismatch]
   17 | static inline char toupper(char c)
      |                    ^~~~~~~

progs/bpf_iter_ksym.c:17:20: note: 'toupper' is declared in header '<ctype.h>'

---
 tools/testing/selftests/bpf/progs/bpf_iter_ksym.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/progs/bpf_iter_ksym.c +3 -4
index 285c008cbf9c..9ba14c37bbcc 100644
@@ -7,14 +7,14 @@ char _license[] SEC("license") = "GPL";
 
 unsigned long last_sym_value = 0;
 
-static inline char tolower(char c)
+static inline char to_lower(char c)
 {
        if (c >= 'A' && c <= 'Z')
                c += ('a' - 'A');
        return c;
 }
 
-static inline char toupper(char c)
+static inline char to_upper(char c)
 {
        if (c >= 'a' && c <= 'z')
                c -= ('a' - 'A');
@@ -54,7 +54,7 @@ int dump_ksym(struct bpf_iter__ksym *ctx)
        type = iter->type;
 
        if (iter->module_name[0]) {
-               type = iter->exported ? toupper(type) : tolower(type);
+               type = iter->exported ? to_upper(type) : to_lower(type);
                BPF_SEQ_PRINTF(seq, "0x%llx %c %s [ %s ] ",
                               value, type, iter->name, iter->module_name);
        } else {
--

2.34.1