Attachment 607866 Details for Bug 846702 – perf top: Don't process samples with no valid machine object

perf top: Don't process samples with no valid machine object

01-perf-top-Dont-process-samples-with-no-valid-machine-object.patch (text/plain), 2.76 KB, created by IBM Bug Proxy on 2012-08-29 11:04:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: IBM Bug Proxy

Created: 2012-08-29 11:04:36 UTC

Size: 2.76 KB

patch

obsolete

>Backport of commit 0c095715b388d19d7a0b7e8eaceeceb018f5b3d1
>Author: Joerg Roedel <joerg.roedel@amd.com>
>Date:   Fri Feb 10 18:05:04 2012 +0100
>
>perf top: Don't process samples with no valid machine object
>
>The perf sample processing code relies on a valid machine object. Make
>sure that this path is only entered when such a object exists.
>
>A counter for samples where no machine object exits is also introduced
>to give the user a message about these samples.
>
>Reported-by: David Ahern <dsahern@gmail.com>
>Reported-by: Jason Wang <jasowang@redhat.com>
>Cc: David Ahern <dsahern@gmail.com>
>Cc: Ingo Molnar <mingo@elte.hu>
>Cc: Jason Wang <jasowang@redhat.com>
>Cc: Paul Mackerras <paulus@samba.org>
>Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
>Link: http://lkml.kernel.org/r/1328893505-4115-2-git-send-email-joerg.roedel@amd.com
>Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
>Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
>---
>--- linux-2.6.32-257.el6.x86_64/tools/perf/~builtin-top.c	2012-04-17 12:08:09.596932270 +0530
>+++ linux-2.6.32-257.el6.x86_64/tools/perf/builtin-top.c	2012-04-17 12:12:04.995012071 +0530
>@@ -661,6 +661,12 @@ static void perf_event__process_sample(s
> 		return;
> 	}
> 
>+	if (!machine) {
>+		pr_err("%u unprocessable samples recorded.",
>+		       top->session->hists.stats.nr_unprocessable_samples++);
>+		return;
>+	}
>+
> 	if (event->header.misc & PERF_RECORD_MISC_EXACT_IP)
> 		top->exact_samples++;
> 
>--- linux-2.6.32-257.el6.x86_64/tools/perf/util/~hist.h	2012-04-17 12:08:22.875934357 +0530
>+++ linux-2.6.32-257.el6.x86_64/tools/perf/util/hist.h	2012-04-17 12:12:04.995012071 +0530
>@@ -32,6 +32,7 @@ struct events_stats {
> 	u32 nr_unknown_events;
> 	u32 nr_invalid_chains;
> 	u32 nr_unknown_id;
>+	u32 nr_unprocessable_samples;
> };
> 
> enum hist_column {
>--- linux-2.6.32-257.el6.x86_64/tools/perf/util/~session.c	2012-04-17 12:08:37.782965099 +0530
>+++ linux-2.6.32-257.el6.x86_64/tools/perf/util/session.c	2012-04-17 12:12:04.996088083 +0530
>@@ -796,6 +796,10 @@ static int perf_session_deliver_event(st
> 			++session->hists.stats.nr_unknown_id;
> 			return -1;
> 		}
>+		if (machine == NULL) {
>+			++session->hists.stats.nr_unprocessable_samples;
>+			return -1;
>+		}
> 		return tool->sample(tool, event, sample, evsel, machine);
> 	case PERF_RECORD_MMAP:
> 		return tool->mmap(tool, event, sample, machine);
>@@ -964,6 +968,12 @@ static void perf_session__warn_about_err
>  			    session->hists.stats.nr_invalid_chains,
>  			    session->hists.stats.nr_events[PERF_RECORD_SAMPLE]);
>  	}
>+
>+	if (session->hists.stats.nr_unprocessable_samples != 0) {
>+		ui__warning("%u unprocessable samples recorded.\n"
>+			    "Do you have a KVM guest running and not using 'perf kvm'?\n",
>+			    session->hists.stats.nr_unprocessable_samples);
>+	}
> }
> 
> #define session_done()	(*(volatile int *)(&session_done))

Actions: View

Attachments on bug 846702: 607866 | 607867