lkml.org 
[lkml]   [2016]   [Jul]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 18/19] perf build: Add sdt feature detection
    Date
    From: Masami Hiramatsu <mhiramat@kernel.org>

    This checks whether sys/sdt.h is available or not, which is required for
    DTRACE_PROBE().

    We can disable this feature by passing NO_SDT=1 when building.

    This flag will be used for SDT test case and further SDT events in
    perftools.

    Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
    Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
    Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
    Cc: Hemant Kumar <hemant@linux.vnet.ibm.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Link: http://lkml.kernel.org/r/146831795615.17065.17513820540591053933.stgit@devbox
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/build/Makefile.feature | 3 ++-
    tools/build/feature/Makefile | 6 +++++-
    tools/build/feature/test-all.c | 5 +++++
    tools/build/feature/test-sdt.c | 7 +++++++
    tools/perf/Makefile.perf | 3 +++
    tools/perf/config/Makefile | 10 ++++++++++
    tools/perf/tests/make | 3 ++-
    7 files changed, 34 insertions(+), 3 deletions(-)
    create mode 100644 tools/build/feature/test-sdt.c

    diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature
    index fe12bee57418..a120c6b755a9 100644
    --- a/tools/build/Makefile.feature
    +++ b/tools/build/Makefile.feature
    @@ -62,7 +62,8 @@ FEATURE_TESTS_BASIC := \
    zlib \
    lzma \
    get_cpuid \
    - bpf
    + bpf \
    + sdt

    # FEATURE_TESTS_BASIC + FEATURE_TESTS_EXTRA is the complete list
    # of all feature tests
    diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
    index d6017c1abdb0..a0b29a311816 100644
    --- a/tools/build/feature/Makefile
    +++ b/tools/build/feature/Makefile
    @@ -45,7 +45,8 @@ FILES= \
    test-zlib.bin \
    test-lzma.bin \
    test-bpf.bin \
    - test-get_cpuid.bin
    + test-get_cpuid.bin \
    + test-sdt.bin

    FILES := $(addprefix $(OUTPUT),$(FILES))

    @@ -213,6 +214,9 @@ $(OUTPUT)test-get_cpuid.bin:
    $(OUTPUT)test-bpf.bin:
    $(BUILD)

    +$(OUTPUT)test-sdt.bin:
    + $(BUILD)
    +
    -include $(OUTPUT)*.d

    ###############################
    diff --git a/tools/build/feature/test-all.c b/tools/build/feature/test-all.c
    index 843aed024a3a..699e43627397 100644
    --- a/tools/build/feature/test-all.c
    +++ b/tools/build/feature/test-all.c
    @@ -145,6 +145,10 @@
    # include "test-libcrypto.c"
    #undef main

    +#define main main_test_sdt
    +# include "test-sdt.c"
    +#undef main
    +
    int main(int argc, char *argv[])
    {
    main_test_libpython();
    @@ -178,6 +182,7 @@ int main(int argc, char *argv[])
    main_test_get_cpuid();
    main_test_bpf();
    main_test_libcrypto();
    + main_test_sdt();

    return 0;
    }
    diff --git a/tools/build/feature/test-sdt.c b/tools/build/feature/test-sdt.c
    new file mode 100644
    index 000000000000..e4531a6e80ea
    --- /dev/null
    +++ b/tools/build/feature/test-sdt.c
    @@ -0,0 +1,7 @@
    +#include <sys/sdt.h>
    +
    +int main(void)
    +{
    + DTRACE_PROBE(provider, name);
    + return 0;
    +}
    diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
    index feb2c66b110b..a129fbc1ed37 100644
    --- a/tools/perf/Makefile.perf
    +++ b/tools/perf/Makefile.perf
    @@ -81,6 +81,9 @@ include ../scripts/utilities.mak
    #
    # Define NO_LIBBPF if you do not want BPF support
    #
    +# Define NO_SDT if you do not want to define SDT event in perf tools,
    +# note that it doesn't disable SDT scanning support.
    +#
    # Define FEATURES_DUMP to provide features detection dump file
    # and bypass the feature detection

    diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
    index 5ac428060779..24803c58049a 100644
    --- a/tools/perf/config/Makefile
    +++ b/tools/perf/config/Makefile
    @@ -355,6 +355,16 @@ ifndef NO_LIBELF
    endif # NO_LIBBPF
    endif # NO_LIBELF

    +ifndef NO_SDT
    + ifneq ($(feature-sdt), 1)
    + msg := $(warning No sys/sdt.h found, no SDT events are defined, please install systemtap-sdt-devel or systemtap-sdt-dev);
    + NO_SDT := 1;
    + else
    + CFLAGS += -DHAVE_SDT_EVENT
    + $(call detected,CONFIG_SDT_EVENT)
    + endif
    +endif
    +
    ifdef PERF_HAVE_JITDUMP
    ifndef NO_DWARF
    $(call detected,CONFIG_JITDUMP)
    diff --git a/tools/perf/tests/make b/tools/perf/tests/make
    index 51966d92fc82..143f4d549769 100644
    --- a/tools/perf/tests/make
    +++ b/tools/perf/tests/make
    @@ -82,6 +82,7 @@ make_no_auxtrace := NO_AUXTRACE=1
    make_no_libbpf := NO_LIBBPF=1
    make_no_libcrypto := NO_LIBCRYPTO=1
    make_with_babeltrace:= LIBBABELTRACE=1
    +make_no_sdt := NO_SDT=1
    make_tags := tags
    make_cscope := cscope
    make_help := help
    @@ -105,7 +106,7 @@ make_minimal := NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1
    make_minimal += NO_DEMANGLE=1 NO_LIBELF=1 NO_LIBUNWIND=1 NO_BACKTRACE=1
    make_minimal += NO_LIBNUMA=1 NO_LIBAUDIT=1 NO_LIBBIONIC=1
    make_minimal += NO_LIBDW_DWARF_UNWIND=1 NO_AUXTRACE=1 NO_LIBBPF=1
    -make_minimal += NO_LIBCRYPTO=1
    +make_minimal += NO_LIBCRYPTO=1 NO_SDT=1

    # $(run) contains all available tests
    run := make_pure
    --
    2.7.4
    \
     
     \ /
      Last update: 2016-07-14 05:01    [W:4.062 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site