lkml.org 
[lkml]   [2018]   [Mar]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 132/177] perf tests kmod-path: Dont fail if compressed modules arent supported
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Kim Phillips <kim.phillips@arm.com>


    [ Upstream commit 805b151a1afd24414706a7f6ae275fbb9649be74 ]

    __kmod_path__parse() uses is_supported_compression() to determine and
    parse out compressed module file extensions. On systems without zlib,
    this test fails and __kmod_path__parse() continues to strcmp "ko" with
    "gz". Don't do this on those systems.

    Signed-off-by: Kim Phillips <kim.phillips@arm.com>
    Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Fixes: 3c8a67f50a1e ("perf tools: Add kmod_path__parse function")
    Link: http://lkml.kernel.org/r/20170503131402.c66e314460026c80cd787b34@arm.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    tools/perf/tests/kmod-path.c | 2 ++
    1 file changed, 2 insertions(+)

    --- a/tools/perf/tests/kmod-path.c
    +++ b/tools/perf/tests/kmod-path.c
    @@ -61,6 +61,7 @@ int test__kmod_path__parse(int subtest _
    M("/xxxx/xxxx/x-x.ko", PERF_RECORD_MISC_KERNEL, true);
    M("/xxxx/xxxx/x-x.ko", PERF_RECORD_MISC_USER, false);

    +#ifdef HAVE_ZLIB_SUPPORT
    /* path alloc_name alloc_ext kmod comp name ext */
    T("/xxxx/xxxx/x.ko.gz", true , true , true, true, "[x]", "gz");
    T("/xxxx/xxxx/x.ko.gz", false , true , true, true, NULL , "gz");
    @@ -96,6 +97,7 @@ int test__kmod_path__parse(int subtest _
    M("x.ko.gz", PERF_RECORD_MISC_CPUMODE_UNKNOWN, true);
    M("x.ko.gz", PERF_RECORD_MISC_KERNEL, true);
    M("x.ko.gz", PERF_RECORD_MISC_USER, false);
    +#endif

    /* path alloc_name alloc_ext kmod comp name ext */
    T("[test_module]", true , true , true, false, "[test_module]", NULL);

    \
     
     \ /
      Last update: 2018-03-23 12:15    [W:4.148 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site