Skip to contentSkip to conversation

tools build: Add test-reallocarray.c to test-all.c to fix the build Was: Re: reallocarray failure on centos:7 superseded by raw data API

PATCH In review Arnaldo Carvalho de Melo 2 participants 4 messages Feb 14, 2019 9 messages not in the archive BPF

lore
Share & tools
lore
#9 lore raw

PATCH 1/1 tools build: Add test-reallocarray.c to test-all.c to fix the build Was: Re: reallocarray failure on centos:7 superseded by raw data API

In reply to a message not in the archive

Em Wed, Feb 13, 2019 at 09:30:11PM -0800, Andrii Nakryiko escreveu:

Quoted 11 lines

On Wed, Feb 13, 2019 at 6:21 AM Arnaldo Carvalho de Melo

Quoted 10 lines

Em Wed, Feb 13, 2019 at 10:38:55AM -0300, Arnaldo Carvalho de Melo escreveu:

Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 5 lines
Quoted 5 lines

make[2]: *** [/tmp/build/perf/libbpf.a] Error 2
make[2]: *** Waiting for unfinished jobs....
CC /tmp/build/perf/debug.o

I thought you had mentioned something about this?

Yeah, libbpf has feature detection for reallocarray, because it's not available everywhere yet. This is done by libbpf's Makefile, but for cmake I added this (similar to what bcc does):

So, I have the fix below in my tree, no need for that __weak function after all :-)

Jin, your bisect to something seeming unrelated:

c30fb4c perf build: Add missing FEATURE_CHECK_LDFLAGS-libcrypto

Was another cset that introduced a check with problems and when fixed made test-all.c build successfully on modern systems but not on your system, ubuntu 16.04, so it assumed that reallocarray() was present and didn't trigger the libc_compat.h fallback which ended up breaking your build.

Thanks,

- Arnaldo

commit e2d2f7369b4b968bab4fdd2830a9a1a39b6b7443

Author: Arnaldo Carvalho de Melo <[email protected]>
Date:   Thu Feb 14 12:01:04 2019 -0300

tools build: Add test-reallocarray.c to test-all.c to fix the build

When a test is in the FEATURE_TESTS_BASIC list in tools/build/Makefile.feature must be added to tools/build/feature/test-all.c, because the successfull compilation and linking of that test-all.bin file means that all the features listed in FEATURE_TESTS_BASIC are present in the system, so we don't have to go on feature by feature test building them.

Since reallocarray() is expected to be present in modern systems, it has a place in FEATURE_TESTS_BASIC, so that we speed up the build process building just that file.

For older systems, such as ubuntu:16.04 (build failure reported by Jin Yao) debian:8, and for the current flagship RHEL distro, RHEL7, the build will fail as test-all.bin (without test-reallocarray.c included) passes but reallocarray() isn't present, making the build fail with:

CC /tmp/build/perf/libbpf.o
MKDIR /tmp/build/perf/fs/
CC /tmp/build/perf/fs/tracing_path.o
LD /tmp/build/perf/fd/libapi-in.o
CC /tmp/build/perf/bpf.o
libbpf.c: In function 'bpf_object__add_program':
libbpf.c:367:10: error: implicit declaration of function 'reallocarray' [-Werror=implicit-function-declaration]
progs = reallocarray(progs, nr_progs + 1, sizeof(progs[0]));
^
libbpf.c:367:2: error: nested extern declaration of 'reallocarray' [-Werror=nested-externs]
progs = reallocarray(progs, nr_progs + 1, sizeof(progs[0]));
^
libbpf.c:367:8: error: assignment makes pointer from integer without a cast [-Werror=int-conversion]
progs = reallocarray(progs, nr_progs + 1, sizeof(progs[0]));
^
libbpf.c: In function 'bpf_object__elf_collect':
libbpf.c:887:10: error: assignment makes pointer from integer without a cast [-Werror=int-conversion]
reloc = reallocarray(reloc, nr_reloc,
^
libbpf.c: In function 'bpf_program__reloc_text':
libbpf.c:1394:12: error: assignment makes pointer from integer without a cast [-Werror=int-conversion]
new_insn = reallocarray(prog->insns, new_cnt, sizeof(*insn));
^
CC /tmp/build/perf/nlattr.o

Even with:

$ grep reallocarray /tmp/build/perf/FEATURE-DUMP feature-reallocarray=1
$

Which ubuntu:16.04.5 LTS doesn't have:

perfbuilder@38a153a1bba8:/$ head -2 /etc/os-release
NAME="Ubuntu"
VERSION="16.04.5 LTS (Xenial Xerus)"
perfbuilder@38a153a1bba8:/$ find /usr/include/ -name "*.h" | xargs grep -w reallocarray perfbuilder@38a153a1bba8:/$

Fix it by including it to test-all.c, which ends up forcing the individual tests to be triggered and for the build process to notice that indeed reallocarray() is not there:

perfbuilder@38a153a1bba8:/$ cat /tmp/build/perf/feature/test-all.make.output
In file included from test-all.c:178:0:
test-reallocarray.c: In function 'main_test_reallocarray':
test-reallocarray.c:7:11: error: implicit declaration of function 'reallocarray' [-Werror=implicit-function-declaration]
return !!reallocarray(NULL, 1, 1);
^
cc1: all warnings being treated as errors
perfbuilder@38a153a1bba8:/$

That is the only test that is failing on Ubuntu 16.03.5 LTS, so all tests are forced:

perfbuilder@38a153a1bba8:/tmp/build/perf/feature$ ls -lSr *.make.output <SNIP successful tests>
-rw-r--r--. 1 perfbuilder perfbuilder 0 Feb 14 15:00 test-dwarf.make.output
-rw-r--r--. 1 perfbuilder perfbuilder 0 Feb 14 14:16 test-cplus-demangle.make.output
-rw-r--r--. 1 perfbuilder perfbuilder 0 Feb 14 15:00 test-bpf.make.output
-rw-r--r--. 1 perfbuilder perfbuilder 0 Feb 14 15:00 test-backtrace.make.output
-rw-r--r--. 1 perfbuilder perfbuilder 104 Feb 14 15:00 test-bionic.make.output -rw-r--r--. 1 perfbuilder perfbuilder 107 Feb 14 15:00 test-libunwind-x86.make.output -rw-r--r--. 1 perfbuilder perfbuilder 115 Feb 14 15:00 test-libunwind-aarch64.make.output -rw-r--r--. 1 perfbuilder perfbuilder 122 Feb 14 15:00 test-libbabeltrace.make.output -rw-r--r--. 1 perfbuilder perfbuilder 254 Feb 14 15:00 test-reallocarray.make.output -rw-r--r--. 1 perfbuilder perfbuilder 312 Feb 14 15:00 test-all.make.output perfbuilder@38a153a1bba8:/tmp/build/perf/feature$

And that reallocarray() one shows:

perfbuilder@38a153a1bba8:/tmp/build/perf/feature$ cat test-reallocarray.make.output test-reallocarray.c: In function 'main':
test-reallocarray.c:7:11: error: implicit declaration of function 'reallocarray' [-Werror=implicit-function-declaration]
return !!reallocarray(NULL, 1, 1);
^
cc1: all warnings being treated as errors
perfbuilder@38a153a1bba8:/tmp/build/perf/feature$

Which now generates the expected result:

perfbuilder@38a153a1bba8:~$ grep reallocarray /tmp/build/perf/FEATURE-DUMP feature-reallocarray=0
perfbuilder@38a153a1bba8:~$

The fallback mechanism kicks in and libbpf and perf are again buildable in systems without reallocarray():

$ cat tools/include/tools/libc_compat.h
// SPDX-License-Identifier: (LGPL-2.0+ OR BSD-2-Clause) /* Copyright (C) 2018 Netronome Systems, Inc. */

#ifndef __TOOLS_LIBC_COMPAT_H
#define __TOOLS_LIBC_COMPAT_H

#include <stdlib.h>
#include <linux/overflow.h>

#ifdef COMPAT_NEED_REALLOCARRAY
static inline void *reallocarray(void *ptr, size_t nmemb, size_t size) {
size_t bytes;

if (unlikely(check_mul_overflow(nmemb, size, &bytes)))
return NULL;
return realloc(ptr, bytes);
}
#endif
#endif
$

Cc Adrian Hunter <[email protected]>
Cc Alexei Starovoitov <[email protected]>
Cc Daniel Borkmann <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Song Liu <[email protected]>
Cc Yonghong Song <[email protected]>
Fixes 531b014e7a2f ("tools: bpf: make use of reallocarray")
tools/build/feature/test-all.c +5 -0
index 74329957553a..e903b86b742f 100644
@@ -174,6 +174,10 @@
 # include "test-libaio.c"
 #undef main
 
+#define main main_test_reallocarray
+# include "test-reallocarray.c"
+#undef main
+
 int main(int argc, char *argv[])
 {
 	main_test_libpython();
@@ -214,6 +218,7 @@ int main(int argc, char *argv[])
 	main_test_sdt();
 	main_test_setns();
 	main_test_libaio();
+	main_test_reallocarray();
 
 	return 0;
 }
tools/build/feature/test-reallocarray.c +2 -0
index 8170de35150d..8f6743e31da7 100644
@@ -6,3 +6,5 @@ int main(void)
 {
 	return !!reallocarray(NULL, 1, 1);
 }
+
+#undef _GNU_SOURCE
#10 lore raw

On Thu, Feb 14, 2019 at 12:30:18PM -0300, Arnaldo Carvalho de Melo wrote:

SNIP

Quoted 28 lines
tools/build/feature/test-all.c +5 -0
index 74329957553a..e903b86b742f 100644
@@ -174,6 +174,10 @@
 # include "test-libaio.c"
 #undef main
 
+#define main main_test_reallocarray
+# include "test-reallocarray.c"
+#undef main
+
 int main(int argc, char *argv[])
 {
 	main_test_libpython();
@@ -214,6 +218,7 @@ int main(int argc, char *argv[])
 	main_test_sdt();
 	main_test_setns();
 	main_test_libaio();
+	main_test_reallocarray();
 
 	return 0;
 }
tools/build/feature/test-reallocarray.c +0 -0
index 8170de35150d..8f6743e31da7 100644

tools/build/feature/test-reallocarray.c int main(void) · line 10

Quoted 5 lines
tools/build/feature/test-reallocarray.c +2 -0
@@ -6,3 +6,5 @@ int main(void)
 {
 	return !!reallocarray(NULL, 1, 1);
 }
+
+#undef _GNU_SOURCE

nice, also test-sched_getcpu.c does not do #undef _GNU_SOURCE

jirka

Acked-by on v1 1/1
#12 lore raw
In reply to Arnaldo Carvalho de Melo

On Thu, Feb 14, 2019 at 12:30:18PM -0300, Arnaldo Carvalho de Melo wrote:

SNIP

Quoted 13 lines
Cc Adrian Hunter <[email protected]>
Cc Alexei Starovoitov <[email protected]>
Cc Daniel Borkmann <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Song Liu <[email protected]>
Cc Yonghong Song <[email protected]>
Fixes 531b014e7a2f ("tools: bpf: make use of reallocarray")

jirka

Quoted 34 lines
tools/build/feature/test-all.c +5 -0
index 74329957553a..e903b86b742f 100644
@@ -174,6 +174,10 @@
 # include "test-libaio.c"
 #undef main
 
+#define main main_test_reallocarray
+# include "test-reallocarray.c"
+#undef main
+
 int main(int argc, char *argv[])
 {
 	main_test_libpython();
@@ -214,6 +218,7 @@ int main(int argc, char *argv[])
 	main_test_sdt();
 	main_test_setns();
 	main_test_libaio();
+	main_test_reallocarray();
 
 	return 0;
 }
tools/build/feature/test-reallocarray.c +2 -0
index 8170de35150d..8f6743e31da7 100644
@@ -6,3 +6,5 @@ int main(void)
 {
 	return !!reallocarray(NULL, 1, 1);
 }
+
+#undef _GNU_SOURCE
#11 lore raw
In reply to Jiri Olsa

Em Thu, Feb 14, 2019 at 04:50:42PM +0100, Jiri Olsa escreveu:

Quoted 25 lines · Arnaldo Carvalho de Melo

SNIP

Quoted 21 lines
tools/build/feature/test-all.c +5 -0
index 74329957553a..e903b86b742f 100644
@@ -174,6 +174,10 @@
 # include "test-libaio.c"
 #undef main
 
+#define main main_test_reallocarray
+# include "test-reallocarray.c"
+#undef main
+
 int main(int argc, char *argv[])
 {
 	main_test_libpython();
@@ -214,6 +218,7 @@ int main(int argc, char *argv[])
 	main_test_sdt();
 	main_test_setns();
 	main_test_libaio();
+	main_test_reallocarray();
 
Quoted 14 lines

tools/build/feature/test-reallocarray.c int main(void) · line 10

Quoted 12 lines
tools/build/feature/test-all.c +0 -0
 	return 0;
 }
tools/build/feature/test-reallocarray.c +2 -0
index 8170de35150d..8f6743e31da7 100644
@@ -6,3 +6,5 @@ int main(void)
 {
 	return !!reallocarray(NULL, 1, 1);
 }
+
+#undef _GNU_SOURCE

nice, also test-sched_getcpu.c does not do #undef _GNU_SOURCE

Thanks, I'll fix that, since those tests are included one after the other in test-all.c, they shouldn't lead those defines in place, otherwise they will fail, as I fixed in other cases, but somehow missed this one.

[acme@quaco perf]$ grep _GNU_SOURCE tools/build/feature/test-*.c tools/build/feature/test-get_current_dir_name.c:#define _GNU_SOURCE tools/build/feature/test-get_current_dir_name.c:#undef _GNU_SOURCE tools/build/feature/test-libpython.c:#undef _GNU_SOURCE tools/build/feature/test-reallocarray.c:#define _GNU_SOURCE tools/build/feature/test-reallocarray.c:#undef _GNU_SOURCE tools/build/feature/test-sched_getcpu.c:#ifndef _GNU_SOURCE tools/build/feature/test-sched_getcpu.c:#define _GNU_SOURCE tools/build/feature/test-setns.c:#define _GNU_SOURCE tools/build/feature/test-setns.c:#undef _GNU_SOURCE [acme@quaco perf]$

Its just because all the preceding ones undef it and the ones following it doesn't define it:

$ cat tools/build/feature/test-all.c
<SNIP>
#define main main_test_libaio
# include "test-libaio.c"
#undef main

#define main main_test_reallocarray

# include "test-reallocarray.c"
#undef main

int main(int argc, char *argv[])

{
        main_test_libpython();
        main_test_libpython_version();
<SNIP>
        main_test_bpf();
        main_test_libcrypto();
        main_test_sched_getcpu();
        main_test_sdt();
        main_test_setns();
        main_test_libaio();
        main_test_reallocarray();

        return 0;
}

<SNIP>

- Arnaldo