lkml.org 
[lkml]   [2014]   [Jul]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH V2 46/52] perf tools: Fix the lifetime of the VDSO temporary file
    The VDSO temporary file is unlinked when a session is
    deleted. That precludes the possibilities that there
    is no session or there is more than one session.
    Correctly the vdso belongs to the machine so put the
    information on 'struct machine' and get rid of the global
    variables.

    Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
    ---


    V2:
    Initialize vdso_info to NULL in machine_init()

    The change is reflected in the branch here:

    http://git.infradead.org/users/ahunter/linux-perf.git/shortlog/refs/heads/for-acme


    tools/perf/util/machine.c | 4 ++++
    tools/perf/util/machine.h | 3 +++
    tools/perf/util/session.c | 2 --
    tools/perf/util/vdso.c | 39 +++++++++++++++++++++++++++++----------
    tools/perf/util/vdso.h | 2 +-
    5 files changed, 37 insertions(+), 13 deletions(-)

    diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
    index 5d21792..1732cc1 100644
    --- a/tools/perf/util/machine.c
    +++ b/tools/perf/util/machine.c
    @@ -8,6 +8,7 @@
    #include "sort.h"
    #include "strlist.h"
    #include "thread.h"
    +#include "vdso.h"
    #include <stdbool.h>
    #include <symbol/kallsyms.h>
    #include "unwind.h"
    @@ -23,6 +24,8 @@ int machine__init(struct machine *machine, const char *root_dir, pid_t pid)
    INIT_LIST_HEAD(&machine->dead_threads);
    machine->last_match = NULL;

    + machine->vdso_info = NULL;
    +
    machine->kmaps.machine = machine;
    machine->pid = pid;

    @@ -107,6 +110,7 @@ void machine__exit(struct machine *machine)
    map_groups__exit(&machine->kmaps);
    dsos__delete(&machine->user_dsos);
    dsos__delete(&machine->kernel_dsos);
    + vdso__exit(machine);
    zfree(&machine->root_dir);
    zfree(&machine->current_tid);
    }
    diff --git a/tools/perf/util/machine.h b/tools/perf/util/machine.h
    index f91a7e1..f385f23 100644
    --- a/tools/perf/util/machine.h
    +++ b/tools/perf/util/machine.h
    @@ -20,6 +20,8 @@ union perf_event;

    extern const char *ref_reloc_sym_names[];

    +struct vdso_info;
    +
    struct machine {
    struct rb_node rb_node;
    pid_t pid;
    @@ -29,6 +31,7 @@ struct machine {
    struct rb_root threads;
    struct list_head dead_threads;
    struct thread *last_match;
    + struct vdso_info *vdso_info;
    struct list_head user_dsos;
    struct list_head kernel_dsos;
    struct map_groups kmaps;
    diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
    index ca3cd1f..5ad5e12 100644
    --- a/tools/perf/util/session.c
    +++ b/tools/perf/util/session.c
    @@ -14,7 +14,6 @@
    #include "util.h"
    #include "cpumap.h"
    #include "perf_regs.h"
    -#include "vdso.h"

    static int perf_session__open(struct perf_session *session)
    {
    @@ -176,7 +175,6 @@ void perf_session__delete(struct perf_session *session)
    if (session->file)
    perf_data_file__close(session->file);
    free(session);
    - vdso__exit();
    }

    static int process_event_synth_tracing_data_stub(struct perf_tool *tool
    diff --git a/tools/perf/util/vdso.c b/tools/perf/util/vdso.c
    index 75245f0..fdaccaf 100644
    --- a/tools/perf/util/vdso.c
    +++ b/tools/perf/util/vdso.c
    @@ -28,14 +28,17 @@ struct vdso_info {
    struct vdso_file vdso;
    };

    -static struct vdso_info vdso_info_ = {
    - .vdso = {
    - .temp_file_name = VDSO__TEMP_FILE_NAME,
    - .dso_name = VDSO__MAP_NAME,
    - },
    -};
    -
    -static struct vdso_info *vdso_info = &vdso_info_;
    +static struct vdso_info *vdso_info__new(void)
    +{
    + static const struct vdso_info vdso_info_init = {
    + .vdso = {
    + .temp_file_name = VDSO__TEMP_FILE_NAME,
    + .dso_name = VDSO__MAP_NAME,
    + },
    + };
    +
    + return memdup(&vdso_info_init, sizeof(vdso_info_init));
    +}

    static int find_vdso_map(void **start, void **end)
    {
    @@ -105,16 +108,32 @@ static char *get_file(struct vdso_file *vdso_file)
    return vdso;
    }

    -void vdso__exit(void)
    +void vdso__exit(struct machine *machine)
    {
    + struct vdso_info *vdso_info = machine->vdso_info;
    +
    + if (!vdso_info)
    + return;
    +
    if (vdso_info->vdso.found)
    unlink(vdso_info->vdso.temp_file_name);
    +
    + zfree(&machine->vdso_info);
    }

    struct dso *vdso__dso_findnew(struct machine *machine)
    {
    - struct dso *dso = dsos__find(&machine->user_dsos, VDSO__MAP_NAME, true);
    + struct vdso_info *vdso_info;
    + struct dso *dso;
    +
    + if (!machine->vdso_info)
    + machine->vdso_info = vdso_info__new();
    +
    + vdso_info = machine->vdso_info;
    + if (!vdso_info)
    + return NULL;

    + dso = dsos__find(&machine->user_dsos, VDSO__MAP_NAME, true);
    if (!dso) {
    char *file;

    diff --git a/tools/perf/util/vdso.h b/tools/perf/util/vdso.h
    index 9ab0738..7cf1576 100644
    --- a/tools/perf/util/vdso.h
    +++ b/tools/perf/util/vdso.h
    @@ -15,6 +15,6 @@ static inline bool is_vdso_map(const char *filename)
    struct machine;

    struct dso *vdso__dso_findnew(struct machine *machine);
    -void vdso__exit(void);
    +void vdso__exit(struct machine *machine);

    #endif /* __PERF_VDSO__ */
    --
    1.8.3.2



    \
     
     \ /
      Last update: 2014-07-23 14:21    [W:4.661 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site