From: David Carrillo-Cisneros <davidcc@google.com>
To: linux-kernel@vger.kernel.org
Cc: "x86@kernel.org" <x86@kernel.org>, Ingo Molnar <mingo@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
Andi Kleen <ak@linux.intel.com>, Kan Liang <kan.liang@intel.com>,
Peter Zijlstra <peterz@infradead.org>,
Paul Turner <pjt@google.com>,
Stephane Eranian <eranian@google.com>,
David Carrillo-Cisneros <davidcc@google.com>
Subject: [PATCH 1/3] perf/core: check return value of perf_event_read IPI
Date: Mon, 1 Aug 2016 19:44:53 -0700 [thread overview]
Message-ID: <1470105895-71379-2-git-send-email-davidcc@google.com> (raw)
In-Reply-To: <1470105895-71379-1-git-send-email-davidcc@google.com>
The call to smp_call_function_single in perf_event_read() may fail and,
when it does, its error value is the one to return.
Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
Reviewed-by: Stephane Eranian <eranian@google.com>
---
kernel/events/core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 9345028..ebc187f 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -3469,9 +3469,9 @@ static int perf_event_read(struct perf_event *event, bool group)
.group = group,
.ret = 0,
};
- smp_call_function_single(event->oncpu,
- __perf_event_read, &data, 1);
+ ret = smp_call_function_single(event->oncpu,
+ __perf_event_read, &data, 1);
- ret = data.ret;
+ ret = ret ? : data.ret;
} else if (event->state == PERF_EVENT_STATE_INACTIVE) {
struct perf_event_context *ctx = event->ctx;
unsigned long flags;
--
2.8.0.rc3.226.g39d4020
next prev parent reply other threads:[~2016-08-02 4:37 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-02 2:44 [PATCH 0/3] remove unnecessary IPI reading uncore events David Carrillo-Cisneros
2016-08-02 2:44 ` David Carrillo-Cisneros [this message]
2016-08-02 2:44 ` [PATCH 2/3] perf/core: introduce pmu_event_flags and PMUEF_READ_CPU_PKG David Carrillo-Cisneros
2016-08-04 14:43 ` Peter Zijlstra
2016-08-04 17:24 ` David Carrillo-Cisneros
2016-08-04 15:00 ` Peter Zijlstra
2016-08-04 17:23 ` David Carrillo-Cisneros
2016-08-04 17:27 ` Peter Zijlstra
2016-08-04 17:49 ` David Carrillo-Cisneros
2016-08-04 15:11 ` Peter Zijlstra
2016-08-02 2:44 ` [PATCH 3/3] perf/x86: use PMUEF_READ_CPU_PKG in uncore events David Carrillo-Cisneros
2016-08-02 15:11 ` [PATCH 0/3] remove unnecessary IPI reading " Andi Kleen
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=1470105895-71379-2-git-send-email-davidcc@google.com \
--to=davidcc@google.com \
--cc=ak@linux.intel.com \
--cc=eranian@google.com \
--cc=kan.liang@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=pjt@google.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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