korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-29 15:14:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

tools build: Add test for setns()

Browse Source 
And provide an alternative implementation to keep perf building on older
distros as we're about to add initial support for namespaces.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Krister Johansen <kjlx@templeofstupid.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-bqdwijunhjlvps1ardykhw1i@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2017-07-18 17:15:29 -03:00
parent 59291f1982
commit 86bcdb5a43
8 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/build/Makefile.feature
View File

@ -64,7 +64,8 @@ FEATURE_TESTS_BASIC := \
get_cpuid \
bpf \
sched_getcpu \
sdt
sdt \
setns
# FEATURE_TESTS_BASIC + FEATURE_TESTS_EXTRA is the complete list
# of all feature tests

6
tools/build/feature/Makefile
View File

@ -49,7 +49,8 @@ FILES= \
test-sdt.bin \
test-cxx.bin \
test-jvmti.bin \
test-sched_getcpu.bin
test-sched_getcpu.bin \
test-setns.bin
FILES := $(addprefix $(OUTPUT),$(FILES))
@ -95,6 +96,9 @@ $(OUTPUT)test-glibc.bin:
$(OUTPUT)test-sched_getcpu.bin:
$(BUILD)
$(OUTPUT)test-setns.bin:
$(BUILD)
DWARFLIBS := -ldw
ifeq ($(findstring -static,${LDFLAGS}),-static)
DWARFLIBS += -lelf -lebl -lz -llzma -lbz2

5
tools/build/feature/test-all.c
View File

@ -153,6 +153,10 @@
# include "test-sdt.c"
#undef main
#define main main_test_setns
# include "test-setns.c"
#undef main
int main(int argc, char *argv[])
{
main_test_libpython();
@ -188,6 +192,7 @@ int main(int argc, char *argv[])
main_test_libcrypto();
main_test_sched_getcpu();
main_test_sdt();
main_test_setns();
return 0;
}

7
tools/build/feature/test-setns.c Normal file
View File

@ -0,0 +1,7 @@
#define _GNU_SOURCE
#include <sched.h>
int main(void)
{
return setns(0, 0);
}

5
tools/perf/Makefile.config
View File

@ -330,6 +330,11 @@ ifeq ($(feature-sched_getcpu), 1)
CFLAGS += -DHAVE_SCHED_GETCPU_SUPPORT
endif
ifeq ($(feature-setns), 1)
CFLAGS += -DHAVE_SETNS_SUPPORT
$(call detected,CONFIG_SETNS)
endif
ifndef NO_LIBELF
CFLAGS += -DHAVE_LIBELF_SUPPORT
EXTLIBS += -lelf

4
tools/perf/util/Build
View File

@ -104,6 +104,10 @@ ifndef CONFIG_LIBELF
libperf-y += symbol-minimal.o
endif
ifndef CONFIG_SETNS
libperf-y += setns.o
endif
libperf-$(CONFIG_DWARF) += probe-finder.o
libperf-$(CONFIG_DWARF) += dwarf-aux.o
libperf-$(CONFIG_DWARF) += dwarf-regs.o

8
tools/perf/util/setns.c Normal file
View File

@ -0,0 +1,8 @@
#include "util.h"
#include <unistd.h>
#include <sys/syscall.h>
int setns(int fd, int nstype)
{
return syscall(__NR_setns, fd, nstype);
}

4
tools/perf/util/util.h
View File

@ -58,4 +58,8 @@ const char *perf_tip(const char *dirpath);
int sched_getcpu(void);
#endif
#ifndef HAVE_SETNS_SUPPORT
int setns(int fd, int nstype);
#endif
#endif /* GIT_COMPAT_UTIL_H */