lkml.org 
[lkml]   [2018]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 08/97] Revert "perf tests: Decompress kernel module before objdump"
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    This reverts commit b0761b57e0bf11ada4c45e68f4cba1370363d90d which is
    commit 94df1040b1e6aacd8dec0ba3c61d7e77cd695f26 upstream.

    It breaks the build of perf on 4.4.y, so I'm dropping it.

    Reported-by: Pavlos Parissis <pavlos.parissis@gmail.com>
    Reported-by: Lei Chen <chenl.lei@gmail.com>
    Reported-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Wang Nan <wangnan0@huawei.com>
    Cc: kernel-team@lge.com
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    tools/perf/tests/code-reading.c | 20 +-------------------
    1 file changed, 1 insertion(+), 19 deletions(-)

    --- a/tools/perf/tests/code-reading.c
    +++ b/tools/perf/tests/code-reading.c
    @@ -182,8 +182,6 @@ static int read_object_code(u64 addr, si
    unsigned char buf2[BUFSZ];
    size_t ret_len;
    u64 objdump_addr;
    - const char *objdump_name;
    - char decomp_name[KMOD_DECOMP_LEN];
    int ret;

    pr_debug("Reading object code for memory address: %#"PRIx64"\n", addr);
    @@ -244,25 +242,9 @@ static int read_object_code(u64 addr, si
    state->done[state->done_cnt++] = al.map->start;
    }

    - objdump_name = al.map->dso->long_name;
    - if (dso__needs_decompress(al.map->dso)) {
    - if (dso__decompress_kmodule_path(al.map->dso, objdump_name,
    - decomp_name,
    - sizeof(decomp_name)) < 0) {
    - pr_debug("decompression failed\n");
    - return -1;
    - }
    -
    - objdump_name = decomp_name;
    - }
    -
    /* Read the object code using objdump */
    objdump_addr = map__rip_2objdump(al.map, al.addr);
    - ret = read_via_objdump(objdump_name, objdump_addr, buf2, len);
    -
    - if (dso__needs_decompress(al.map->dso))
    - unlink(objdump_name);
    -
    + ret = read_via_objdump(al.map->dso->long_name, objdump_addr, buf2, len);
    if (ret > 0) {
    /*
    * The kernel maps are inaccurate - assume objdump is right in

    \
     
     \ /
      Last update: 2018-04-22 16:17    [W:4.788 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site