mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-04-11 00:44:01 +00:00
a96c03e8cd
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
$
Reported-by: Jin Yao <yao.jin@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexei Starovoitov <ast@fb.com>
Cc: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Jakub Kicinski <jakub.kicinski@netronome.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Song Liu <songliubraving@fb.com>
Cc: Yonghong Song <yhs@fb.com>
Fixes: 531b014e7a ("tools: bpf: make use of reallocarray")
Link: https://lkml.kernel.org/n/tip-aonqku8axii8rxki5g11w40b@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
224 lines
4.6 KiB
C
224 lines
4.6 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* test-all.c: Try to build all the main testcases at once.
|
|
*
|
|
* A well-configured system will have all the prereqs installed, so we can speed
|
|
* up auto-detection on such systems.
|
|
*/
|
|
|
|
/*
|
|
* Quirk: Python and Perl headers cannot be in arbitrary places, so keep
|
|
* these 3 testcases at the top:
|
|
*/
|
|
#define main main_test_libpython
|
|
# include "test-libpython.c"
|
|
#undef main
|
|
|
|
#define main main_test_libpython_version
|
|
# include "test-libpython-version.c"
|
|
#undef main
|
|
|
|
#define main main_test_libperl
|
|
# include "test-libperl.c"
|
|
#undef main
|
|
|
|
#define main main_test_hello
|
|
# include "test-hello.c"
|
|
#undef main
|
|
|
|
#define main main_test_libelf
|
|
# include "test-libelf.c"
|
|
#undef main
|
|
|
|
#define main main_test_libelf_mmap
|
|
# include "test-libelf-mmap.c"
|
|
#undef main
|
|
|
|
#define main main_test_get_current_dir_name
|
|
# include "test-get_current_dir_name.c"
|
|
#undef main
|
|
|
|
#define main main_test_glibc
|
|
# include "test-glibc.c"
|
|
#undef main
|
|
|
|
#define main main_test_dwarf
|
|
# include "test-dwarf.c"
|
|
#undef main
|
|
|
|
#define main main_test_dwarf_getlocations
|
|
# include "test-dwarf_getlocations.c"
|
|
#undef main
|
|
|
|
#define main main_test_eventfd
|
|
# include "test-eventfd.c"
|
|
#undef main
|
|
|
|
#define main main_test_libelf_getphdrnum
|
|
# include "test-libelf-getphdrnum.c"
|
|
#undef main
|
|
|
|
#define main main_test_libelf_gelf_getnote
|
|
# include "test-libelf-gelf_getnote.c"
|
|
#undef main
|
|
|
|
#define main main_test_libelf_getshdrstrndx
|
|
# include "test-libelf-getshdrstrndx.c"
|
|
#undef main
|
|
|
|
#define main main_test_libunwind
|
|
# include "test-libunwind.c"
|
|
#undef main
|
|
|
|
#define main main_test_libaudit
|
|
# include "test-libaudit.c"
|
|
#undef main
|
|
|
|
#define main main_test_libslang
|
|
# include "test-libslang.c"
|
|
#undef main
|
|
|
|
#define main main_test_gtk2
|
|
# include "test-gtk2.c"
|
|
#undef main
|
|
|
|
#define main main_test_gtk2_infobar
|
|
# include "test-gtk2-infobar.c"
|
|
#undef main
|
|
|
|
#define main main_test_libbfd
|
|
# include "test-libbfd.c"
|
|
#undef main
|
|
|
|
#define main main_test_backtrace
|
|
# include "test-backtrace.c"
|
|
#undef main
|
|
|
|
#define main main_test_libnuma
|
|
# include "test-libnuma.c"
|
|
#undef main
|
|
|
|
#define main main_test_numa_num_possible_cpus
|
|
# include "test-numa_num_possible_cpus.c"
|
|
#undef main
|
|
|
|
#define main main_test_timerfd
|
|
# include "test-timerfd.c"
|
|
#undef main
|
|
|
|
#define main main_test_stackprotector_all
|
|
# include "test-stackprotector-all.c"
|
|
#undef main
|
|
|
|
#define main main_test_libdw_dwarf_unwind
|
|
# include "test-libdw-dwarf-unwind.c"
|
|
#undef main
|
|
|
|
#define main main_test_sync_compare_and_swap
|
|
# include "test-sync-compare-and-swap.c"
|
|
#undef main
|
|
|
|
#define main main_test_zlib
|
|
# include "test-zlib.c"
|
|
#undef main
|
|
|
|
#define main main_test_pthread_attr_setaffinity_np
|
|
# include "test-pthread-attr-setaffinity-np.c"
|
|
#undef main
|
|
|
|
#define main main_test_pthread_barrier
|
|
# include "test-pthread-barrier.c"
|
|
#undef main
|
|
|
|
#define main main_test_sched_getcpu
|
|
# include "test-sched_getcpu.c"
|
|
#undef main
|
|
|
|
# if 0
|
|
/*
|
|
* Disable libbabeltrace check for test-all, because the requested
|
|
* library version is not released yet in most distributions. Will
|
|
* reenable later.
|
|
*/
|
|
|
|
#define main main_test_libbabeltrace
|
|
# include "test-libbabeltrace.c"
|
|
#undef main
|
|
#endif
|
|
|
|
#define main main_test_lzma
|
|
# include "test-lzma.c"
|
|
#undef main
|
|
|
|
#define main main_test_get_cpuid
|
|
# include "test-get_cpuid.c"
|
|
#undef main
|
|
|
|
#define main main_test_bpf
|
|
# include "test-bpf.c"
|
|
#undef main
|
|
|
|
#define main main_test_libcrypto
|
|
# include "test-libcrypto.c"
|
|
#undef main
|
|
|
|
#define main main_test_sdt
|
|
# include "test-sdt.c"
|
|
#undef main
|
|
|
|
#define main main_test_setns
|
|
# include "test-setns.c"
|
|
#undef main
|
|
|
|
#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();
|
|
main_test_libperl();
|
|
main_test_hello();
|
|
main_test_libelf();
|
|
main_test_libelf_mmap();
|
|
main_test_get_current_dir_name();
|
|
main_test_glibc();
|
|
main_test_dwarf();
|
|
main_test_dwarf_getlocations();
|
|
main_test_eventfd();
|
|
main_test_libelf_getphdrnum();
|
|
main_test_libelf_gelf_getnote();
|
|
main_test_libelf_getshdrstrndx();
|
|
main_test_libunwind();
|
|
main_test_libaudit();
|
|
main_test_libslang();
|
|
main_test_gtk2(argc, argv);
|
|
main_test_gtk2_infobar(argc, argv);
|
|
main_test_libbfd();
|
|
main_test_backtrace();
|
|
main_test_libnuma();
|
|
main_test_numa_num_possible_cpus();
|
|
main_test_timerfd();
|
|
main_test_stackprotector_all();
|
|
main_test_libdw_dwarf_unwind();
|
|
main_test_sync_compare_and_swap(argc, argv);
|
|
main_test_zlib();
|
|
main_test_pthread_attr_setaffinity_np();
|
|
main_test_pthread_barrier();
|
|
main_test_lzma();
|
|
main_test_get_cpuid();
|
|
main_test_bpf();
|
|
main_test_libcrypto();
|
|
main_test_sched_getcpu();
|
|
main_test_sdt();
|
|
main_test_setns();
|
|
main_test_libaio();
|
|
main_test_reallocarray();
|
|
|
|
return 0;
|
|
}
|