lkml.org 
[lkml]   [2018]   [May]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V2 15/20] perf buildid-cache: kcore_copy: Calculate offset from phnum
    Date
    In preparation to add more program headers, calculate offset from the
    number of phdrs.

    Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
    ---
    tools/perf/util/symbol-elf.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
    index 4e7b71e8ac0e..4aec12102e19 100644
    --- a/tools/perf/util/symbol-elf.c
    +++ b/tools/perf/util/symbol-elf.c
    @@ -1682,7 +1682,7 @@ int kcore_copy(const char *from_dir, const char *to_dir)
    struct kcore kcore;
    struct kcore extract;
    int idx = 0, err = -1;
    - off_t offset = page_size, sz, modules_offset = 0;
    + off_t offset, sz, modules_offset = 0;
    struct kcore_copy_info kci = { .stext = 0, };
    char kcore_filename[PATH_MAX];
    char extract_filename[PATH_MAX];
    @@ -1710,6 +1710,10 @@ int kcore_copy(const char *from_dir, const char *to_dir)
    if (kcore__copy_hdr(&kcore, &extract, kci.phnum))
    goto out_extract_close;

    + offset = gelf_fsize(extract.elf, ELF_T_EHDR, 1, EV_CURRENT) +
    + gelf_fsize(extract.elf, ELF_T_PHDR, kci.phnum, EV_CURRENT);
    + offset = round_up(offset, page_size);
    +
    if (kcore__add_phdr(&extract, idx++, offset, kci.kernel_map.addr,
    kci.kernel_map.len))
    goto out_extract_close;
    --
    1.9.1
    \
     
     \ /
      Last update: 2018-05-17 11:26    [W:3.683 / U:0.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site