From: Peter Zijlstra <peterz@infradead.org>
To: Borislav Petkov <bp@alien8.de>
Cc: mingo@kernel.org, a.p.zijlstra@chello.nl, hpa@zytor.com,
linux-kernel@vger.kernel.org, stable@kernel.org,
ak@linux.intel.com, tglx@linutronix.de,
linux-tip-commits@vger.kernel.org
Subject: Re: [tip:perf/urgent] perf/x86/intel/lbr: Demand proper privileges for PERF_SAMPLE_BRANCH_KERNEL
Date: Mon, 6 May 2013 10:07:37 +0200 [thread overview]
Message-ID: <20130506080737.GA13410@dyad.programming.kicks-ass.net> (raw)
In-Reply-To: <20130504111907.GA3411@pd.tnic>
> > @@ -318,8 +318,11 @@ static void intel_pmu_setup_sw_lbr_filter(struct perf_event *event)
> > if (br_type & PERF_SAMPLE_BRANCH_USER)
> > mask |= X86_BR_USER;
> >
> > - if (br_type & PERF_SAMPLE_BRANCH_KERNEL)
> > + if (br_type & PERF_SAMPLE_BRANCH_KERNEL) {
> > + if (perf_paranoid_kernel() && !capable(CAP_SYS_ADMIN))
> > + return -EACCES;
>
> It is probably not too late to amend this patch and remove the "-EACCES":
>
> arch/x86/kernel/cpu/perf_event_intel_lbr.c: In function ‘intel_pmu_setup_sw_lbr_filter’:
> arch/x86/kernel/cpu/perf_event_intel_lbr.c:323:4: warning: ‘return’ with a value, in function returning void [enabled by default]
Oh urgh, looks like I forgot a refresh before posting..
This one actually compiles a defconfig bzImage.
---
Subject: perf, x86, lbr: Demand proper privileges for PERF_SAMPLE_BRANCH_KERNEL
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Fri May 03 14:07:49 CEST 2013
We should always have proper privileges when requesting kernel data.
Cc: Andi Kleen <ak@linux.intel.com>
Cc: eranian@google.com
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-deb8yrh5fq2bijn5tlmezkmd@git.kernel.org
---
arch/x86/kernel/cpu/perf_event_intel_lbr.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
--- a/arch/x86/kernel/cpu/perf_event_intel_lbr.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_lbr.c
@@ -310,7 +310,7 @@ void intel_pmu_lbr_read(void)
* - in case there is no HW filter
* - in case the HW filter has errata or limitations
*/
-static void intel_pmu_setup_sw_lbr_filter(struct perf_event *event)
+static int intel_pmu_setup_sw_lbr_filter(struct perf_event *event)
{
u64 br_type = event->attr.branch_sample_type;
int mask = 0;
@@ -318,8 +318,11 @@ static void intel_pmu_setup_sw_lbr_filte
if (br_type & PERF_SAMPLE_BRANCH_USER)
mask |= X86_BR_USER;
- if (br_type & PERF_SAMPLE_BRANCH_KERNEL)
+ if (br_type & PERF_SAMPLE_BRANCH_KERNEL) {
+ if (perf_paranoid_kernel() && !capable(CAP_SYS_ADMIN))
+ return -EACCES;
mask |= X86_BR_KERNEL;
+ }
/* we ignore BRANCH_HV here */
@@ -339,6 +342,8 @@ static void intel_pmu_setup_sw_lbr_filte
* be used by fixup code for some CPU
*/
event->hw.branch_reg.reg = mask;
+
+ return 0;
}
/*
@@ -375,7 +380,7 @@ static int intel_pmu_setup_hw_lbr_filter
int intel_pmu_setup_lbr_filter(struct perf_event *event)
{
- int ret = 0;
+ int ret;
/*
* no LBR on this PMU
@@ -386,7 +391,9 @@ int intel_pmu_setup_lbr_filter(struct pe
/*
* setup SW LBR filter
*/
- intel_pmu_setup_sw_lbr_filter(event);
+ ret = intel_pmu_setup_sw_lbr_filter(event);
+ if (ret)
+ return ret;
/*
* setup HW LBR filter, if any
next prev parent reply other threads:[~2013-05-06 8:09 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-03 12:11 [PATCH 0/3] Various perf patches Peter Zijlstra
2013-05-03 12:11 ` [PATCH 1/3] perf, x86: Blacklist all MEM_*_RETIRED events for IVB Peter Zijlstra
2013-05-03 14:35 ` Andi Kleen
2013-05-03 17:00 ` Peter Zijlstra
2013-05-15 14:20 ` Stephane Eranian
2013-05-15 16:51 ` Peter Zijlstra
2013-05-16 15:42 ` Stephane Eranian
2013-05-16 16:07 ` Andi Kleen
2013-05-16 16:26 ` Stephane Eranian
2013-05-04 8:20 ` [tip:perf/urgent] perf/x86: Blacklist all MEM_*_RETIRED events for Ivy Bridge tip-bot for Peter Zijlstra
2013-05-03 12:11 ` [PATCH 2/3] perf, x86, lbr: Fix LBR filter Peter Zijlstra
2013-05-03 14:34 ` Andi Kleen
2013-05-04 6:34 ` Ingo Molnar
2013-05-04 8:21 ` [tip:perf/urgent] perf/x86/intel/lbr: " tip-bot for Peter Zijlstra
2013-05-03 12:11 ` [PATCH 3/3] perf, x86, lbr: Demand proper privileges for PERF_SAMPLE_BRANCH_KERNEL Peter Zijlstra
2013-05-03 14:41 ` Andi Kleen
2013-05-04 8:22 ` [tip:perf/urgent] perf/x86/intel/lbr: " tip-bot for Peter Zijlstra
2013-05-04 11:19 ` Borislav Petkov
2013-05-05 9:05 ` Ingo Molnar
2013-05-06 8:07 ` Peter Zijlstra [this message]
2013-05-06 9:42 ` Ingo Molnar
2013-05-15 13:37 ` [PATCH 3/3] perf, x86, lbr: " Stephane Eranian
2013-05-15 14:30 ` Peter Zijlstra
2013-05-16 9:09 ` Peter Zijlstra
2013-05-16 9:17 ` Peter Zijlstra
2013-05-16 10:09 ` Michael Neuling
2013-05-16 10:09 ` Michael Neuling
2013-05-16 10:15 ` Michael Neuling
2013-05-16 10:15 ` Michael Neuling
2013-05-16 11:16 ` Peter Zijlstra
2013-05-16 11:16 ` Peter Zijlstra
2013-05-16 15:36 ` Stephane Eranian
2013-05-16 15:36 ` Stephane Eranian
2013-05-17 11:12 ` Peter Zijlstra
2013-05-17 11:12 ` Peter Zijlstra
2013-05-17 11:32 ` Michael Neuling
2013-05-17 11:32 ` Michael Neuling
2013-05-17 11:39 ` Peter Zijlstra
2013-05-17 11:39 ` Peter Zijlstra
2013-05-17 21:39 ` Stephane Eranian
2013-05-17 21:39 ` Stephane Eranian
2013-05-17 22:14 ` Michael Neuling
2013-05-17 22:14 ` Michael Neuling
2013-05-17 22:59 ` Stephane Eranian
2013-05-17 22:59 ` Stephane Eranian
2013-05-21 5:41 ` Michael Neuling
2013-05-21 5:41 ` Michael Neuling
2013-05-21 8:50 ` Peter Zijlstra
2013-05-21 8:50 ` Peter Zijlstra
2013-05-21 13:46 ` Stephane Eranian
2013-05-21 13:46 ` Stephane Eranian
2013-05-21 13:55 ` Stephane Eranian
2013-05-21 13:55 ` Stephane Eranian
2013-05-22 6:43 ` Anshuman Khandual
2013-05-22 12:23 ` Stephane Eranian
2013-05-22 14:51 ` Anshuman Khandual
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=20130506080737.GA13410@dyad.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=a.p.zijlstra@chello.nl \
--cc=ak@linux.intel.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=stable@kernel.org \
--cc=tglx@linutronix.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.