From: David Ahern <dsahern@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: acme@ghostprotocols.net, mingo@kernel.org, fweisbec@gmail.com,
peterz@infradead.org, jolsa@redhat.com, namhyung@kernel.org,
xiaoguangrong@linux.vnet.ibm.com, David Ahern <dsahern@gmail.com>
Subject: [PATCH 06/13] perf kvm: handle realloc failures
Date: Wed, 8 May 2013 22:31:42 -0600 [thread overview]
Message-ID: <1368073909-8825-7-git-send-email-dsahern@gmail.com> (raw)
In-Reply-To: <1368073909-8825-1-git-send-email-dsahern@gmail.com>
Save previous pointer and free on failure.
Signed-off-by: David Ahern <dsahern@gmail.com>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
---
tools/perf/builtin-kvm.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index 533501e..24b78ae 100644
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -328,6 +328,7 @@ static int kvm_events_hash_fn(u64 key)
static bool kvm_event_expand(struct kvm_event *event, int vcpu_id)
{
int old_max_vcpu = event->max_vcpu;
+ void *prev;
if (vcpu_id < event->max_vcpu)
return true;
@@ -335,9 +336,11 @@ static bool kvm_event_expand(struct kvm_event *event, int vcpu_id)
while (event->max_vcpu <= vcpu_id)
event->max_vcpu += DEFAULT_VCPU_NUM;
+ prev = event->vcpu;
event->vcpu = realloc(event->vcpu,
event->max_vcpu * sizeof(*event->vcpu));
if (!event->vcpu) {
+ free(prev);
pr_err("Not enough memory\n");
return false;
}
--
1.7.10.1
next prev parent reply other threads:[~2013-05-09 4:32 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-09 4:31 [PATCH 00/13] perf: kvm live mode David Ahern
2013-05-09 4:31 ` [PATCH 01/13] perf evlist: restore methods removed in earlier cleanup David Ahern
2013-05-09 4:31 ` [PATCH 02/13] perf evlist: move tracepoint processing code to evlist.c David Ahern
2013-05-09 4:31 ` [PATCH 03/13] perf evlist: add initialzation function for tracepoints David Ahern
2013-05-09 8:40 ` Namhyung Kim
2013-05-09 4:31 ` [PATCH 04/13] perf session: export a few functions for event processing David Ahern
2013-05-10 12:14 ` Jiri Olsa
2013-05-10 14:07 ` David Ahern
2013-05-09 4:31 ` [PATCH 05/13] perf top: move CONSOLE_CLEAR to header file David Ahern
2013-05-09 4:31 ` David Ahern [this message]
2013-05-09 4:31 ` [PATCH 07/13] perf kvm: split out tracepoints from record args David Ahern
2013-05-10 12:39 ` Jiri Olsa
2013-05-26 0:10 ` David Ahern
2013-05-09 4:31 ` [PATCH 08/13] perf stats: fix divide by 0 in variance David Ahern
2013-05-09 4:31 ` [PATCH 09/13] perf stats: add max and min stats David Ahern
2013-05-09 4:31 ` [PATCH 10/13] perf kvm: add live mode David Ahern
2013-05-09 8:45 ` Namhyung Kim
2013-05-09 13:56 ` David Ahern
2013-05-09 8:51 ` Ingo Molnar
2013-05-09 13:54 ` David Ahern
2013-05-10 0:28 ` Namhyung Kim
2013-05-10 0:34 ` David Ahern
2013-05-10 8:08 ` Ingo Molnar
2013-05-09 12:32 ` Runzhen
2013-05-09 13:29 ` David Ahern
2013-05-09 4:31 ` [PATCH 11/13] perf kvm: add min and max stats to display David Ahern
2013-05-09 4:31 ` [PATCH 12/13] perf kvm: option to print events that exceed a threshold David Ahern
2013-05-09 4:31 ` [PATCH 13/13] perf kvm: debug for missing vmexit/vmentry event David Ahern
2013-05-09 12:53 ` [PATCH 00/13] perf: kvm live mode Xiao Guangrong
2013-05-13 9:40 ` Gleb Natapov
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=1368073909-8825-7-git-send-email-dsahern@gmail.com \
--to=dsahern@gmail.com \
--cc=acme@ghostprotocols.net \
--cc=fweisbec@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=xiaoguangrong@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