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 17/20] perf buildid-cache: kcore_copy: Iterate phdrs
    Date
    In preparation to add more program headers, iterate phdrs instead of
    assuming there is only one for the kernel text and one for the modules.

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

    diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
    index 3e76a0efd15c..91b8cfb045ec 100644
    --- a/tools/perf/util/symbol-elf.c
    +++ b/tools/perf/util/symbol-elf.c
    @@ -1701,10 +1701,11 @@ 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, sz, modules_offset = 0;
    + off_t offset, sz;
    struct kcore_copy_info kci = { .stext = 0, };
    char kcore_filename[PATH_MAX];
    char extract_filename[PATH_MAX];
    + struct phdr_data *p;

    INIT_LIST_HEAD(&kci.phdrs);

    @@ -1733,14 +1734,10 @@ int kcore_copy(const char *from_dir, const char *to_dir)
    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;
    + kcore_copy__for_each_phdr(&kci, p) {
    + off_t offs = p->rel + offset;

    - if (kci.modules_map.addr) {
    - modules_offset = offset + kci.kernel_map.len;
    - if (kcore__add_phdr(&extract, idx, modules_offset,
    - kci.modules_map.addr, kci.modules_map.len))
    + if (kcore__add_phdr(&extract, idx++, offs, p->addr, p->len))
    goto out_extract_close;
    }

    @@ -1748,14 +1745,12 @@ int kcore_copy(const char *from_dir, const char *to_dir)
    if (sz < 0 || sz > offset)
    goto out_extract_close;

    - if (copy_bytes(kcore.fd, kci.kernel_map.offset, extract.fd, offset,
    - kci.kernel_map.len))
    - goto out_extract_close;
    + kcore_copy__for_each_phdr(&kci, p) {
    + off_t offs = p->rel + offset;

    - if (modules_offset && copy_bytes(kcore.fd, kci.modules_map.offset,
    - extract.fd, modules_offset,
    - kci.modules_map.len))
    - goto out_extract_close;
    + if (copy_bytes(kcore.fd, p->offset, extract.fd, offs, p->len))
    + goto out_extract_close;
    + }

    if (kcore_copy__compare_file(from_dir, to_dir, "modules"))
    goto out_extract_close;
    --
    1.9.1
    \
     
     \ /
      Last update: 2018-05-17 11:26    [W:4.778 / U:0.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site