From: Wang Nan <wangnan0@huawei.com>
To: <ast@kernel.org>, <acme@kernel.org>, <acme@redhat.com>,
<brendan.d.gregg@gmail.com>, <davem@davemloft.net>,
<hekuang@huawei.com>, <jolsa@kernel.org>,
<masami.hiramatsu.pt@hitachi.com>, <namhyung@kernel.org>,
<naveen.n.rao@linux.vnet.ibm.com>, <sukadev@linux.vnet.ibm.com>,
<wangnan0@huawei.com>, <lizefan@huawei.com>
Cc: <pi3orama@163.com>, <linux-kernel@vger.kernel.org>
Subject: [PATCH v6 06/16] perf tools: Prevent calling machine__delete() on non-allocated machine
Date: Thu, 17 Dec 2015 10:55:14 +0000 [thread overview]
Message-ID: <1450349724-178569-7-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1450349724-178569-1-git-send-email-wangnan0@huawei.com>
To prevent futher commits calling machine__delete() on non-allocated
'struct machine' (which would cause memory corruption), this patch
enforces machine__init(), record whether a machine structure is
dynamically allocated or not, and warn if machine__delete() is called
on incorrect object.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/tests/vmlinux-kallsyms.c | 4 ++--
tools/perf/util/machine.c | 13 ++++++++-----
tools/perf/util/machine.h | 3 ++-
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/tools/perf/tests/vmlinux-kallsyms.c b/tools/perf/tests/vmlinux-kallsyms.c
index f0bfc9e..441e93d 100644
--- a/tools/perf/tests/vmlinux-kallsyms.c
+++ b/tools/perf/tests/vmlinux-kallsyms.c
@@ -35,8 +35,8 @@ int test__vmlinux_matches_kallsyms(int subtest __maybe_unused)
* Init the machines that will hold kernel, modules obtained from
* both vmlinux + .ko files and from /proc/kallsyms split by modules.
*/
- machine__init(&kallsyms, "", HOST_KERNEL_ID);
- machine__init(&vmlinux, "", HOST_KERNEL_ID);
+ machine__init(&kallsyms, "", HOST_KERNEL_ID, false);
+ machine__init(&vmlinux, "", HOST_KERNEL_ID, false);
/*
* Step 2:
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index ad79297..59a3c01 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1,3 +1,4 @@
+#include <asm/bug.h>
#include "callchain.h"
#include "debug.h"
#include "event.h"
@@ -23,7 +24,7 @@ static void dsos__init(struct dsos *dsos)
pthread_rwlock_init(&dsos->lock, NULL);
}
-int machine__init(struct machine *machine, const char *root_dir, pid_t pid)
+int machine__init(struct machine *machine, const char *root_dir, pid_t pid, bool allocated)
{
memset(machine, 0, sizeof(*machine));
map_groups__init(&machine->kmaps, machine);
@@ -65,6 +66,7 @@ int machine__init(struct machine *machine, const char *root_dir, pid_t pid)
}
machine->current_tid = NULL;
+ machine->allocated = allocated;
return 0;
}
@@ -74,7 +76,7 @@ struct machine *machine__new_host(void)
struct machine *machine = malloc(sizeof(*machine));
if (machine != NULL) {
- machine__init(machine, "", HOST_KERNEL_ID);
+ machine__init(machine, "", HOST_KERNEL_ID, true);
if (machine__create_kernel_maps(machine) < 0)
goto out_delete;
@@ -137,12 +139,13 @@ void machine__exit(struct machine *machine)
void machine__delete(struct machine *machine)
{
machine__exit(machine);
- free(machine);
+ WARN_ONCE((machine->allocated ? free(machine), 0 : -1),
+ "WARNING: deleting a non-allocated machine. Skip.\n");
}
void machines__init(struct machines *machines)
{
- machine__init(&machines->host, "", HOST_KERNEL_ID);
+ machine__init(&machines->host, "", HOST_KERNEL_ID, false);
machines->guests = RB_ROOT;
machines->symbol_filter = NULL;
}
@@ -163,7 +166,7 @@ struct machine *machines__add(struct machines *machines, pid_t pid,
if (machine == NULL)
return NULL;
- if (machine__init(machine, root_dir, pid) != 0) {
+ if (machine__init(machine, root_dir, pid, true) != 0) {
free(machine);
return NULL;
}
diff --git a/tools/perf/util/machine.h b/tools/perf/util/machine.h
index 2c2b443..24dfd46 100644
--- a/tools/perf/util/machine.h
+++ b/tools/perf/util/machine.h
@@ -28,6 +28,7 @@ struct machine {
pid_t pid;
u16 id_hdr_size;
bool comm_exec;
+ bool allocated;
char *root_dir;
struct rb_root threads;
pthread_rwlock_t threads_lock;
@@ -131,7 +132,7 @@ void machines__set_symbol_filter(struct machines *machines,
void machines__set_comm_exec(struct machines *machines, bool comm_exec);
struct machine *machine__new_host(void);
-int machine__init(struct machine *machine, const char *root_dir, pid_t pid);
+int machine__init(struct machine *machine, const char *root_dir, pid_t pid, bool allocated);
void machine__exit(struct machine *machine);
void machine__delete_threads(struct machine *machine);
void machine__delete(struct machine *machine);
--
1.8.3.4
next prev parent reply other threads:[~2015-12-17 11:08 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-17 10:55 [PATCH v6 00/16] perf tools: BPF related update and other improvements Wang Nan
2015-12-17 10:55 ` [PATCH v6 01/16] perf tools: Fix PowerPC native building Wang Nan
2015-12-17 10:55 ` [PATCH v6 02/16] tools: Move Makefile.arch from perf/config to tools/scripts Wang Nan
2015-12-17 10:55 ` [PATCH v6 03/16] perf: bpf: Fix build breakage due to libbpf Wang Nan
2015-12-17 10:55 ` [PATCH v6 04/16] perf test: Fix false TEST_OK result for 'perf test hist' Wang Nan
2015-12-17 10:55 ` [PATCH v6 05/16] perf test: Reset err after using it hold errcode in hist testcases Wang Nan
2015-12-17 10:55 ` Wang Nan [this message]
2015-12-17 10:55 ` [PATCH v6 07/16] perf test: Check environment before start real BPF test Wang Nan
2015-12-17 10:55 ` [PATCH v6 08/16] perf tools: Add API to config maps in bpf object Wang Nan
2015-12-17 10:55 ` [PATCH v6 09/16] perf tools: Enable BPF object configure syntax Wang Nan
2015-12-17 10:55 ` [PATCH v6 10/16] perf record: Apply config to BPF objects before recording Wang Nan
2015-12-17 10:55 ` [PATCH v6 11/16] perf tools: Enable passing event to BPF object Wang Nan
2015-12-17 10:55 ` [PATCH v6 12/16] perf tools: Support perf event alias name Wang Nan
2015-12-17 10:55 ` [PATCH v6 13/16] perf tools: Support setting different slots in a BPF map separately Wang Nan
2015-12-17 10:55 ` [PATCH v6 14/16] perf tools: Enable indices setting syntax for BPF maps Wang Nan
2015-12-17 10:55 ` [PATCH v6 15/16] perf tools: Introduce bpf-output event Wang Nan
2015-12-17 10:55 ` [PATCH v6 16/16] perf data: Support converting data from bpf_perf_event_output() Wang Nan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1450349724-178569-7-git-send-email-wangnan0@huawei.com \
--to=wangnan0@huawei.com \
--cc=acme@kernel.org \
--cc=acme@redhat.com \
--cc=ast@kernel.org \
--cc=brendan.d.gregg@gmail.com \
--cc=davem@davemloft.net \
--cc=hekuang@huawei.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=namhyung@kernel.org \
--cc=naveen.n.rao@linux.vnet.ibm.com \
--cc=pi3orama@163.com \
--cc=sukadev@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®