From: Tvrtko Ursulin <tursulin@ursulin.net>
To: Alexey Budankov <alexey.budankov@linux.intel.com>,
linux-kernel@vger.kernel.org
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>,
Thomas Gleixner <tglx@linutronix.de>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Madhavan Srinivasan <maddy@linux.vnet.ibm.com>,
Andi Kleen <ak@linux.intel.com>,
x86@kernel.org
Subject: Re: [RFC 1/4] perf: Move some access checks later in perf_event_open
Date: Wed, 27 Jun 2018 10:00:42 +0100 [thread overview]
Message-ID: <d7264619-e9cc-08fe-6a6b-ee19a28c30df@ursulin.net> (raw)
In-Reply-To: <861aa316-fa18-4385-af84-0e9445f261d1@linux.intel.com>
On 26/06/18 18:24, Alexey Budankov wrote:
> Hi,
>
> On 26.06.2018 18:36, Tvrtko Ursulin wrote:
>> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>>
>> To enable per-PMU access controls in a following patch first move all call
>> sites of perf_paranoid_kernel() to after the event has been created.
>>
>> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>> Cc: Thomas Gleixner <tglx@linutronix.de>
>> Cc: Peter Zijlstra <peterz@infradead.org>
>> Cc: Ingo Molnar <mingo@redhat.com>
>> Cc: "H. Peter Anvin" <hpa@zytor.com>
>> Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
>> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
>> Cc: Jiri Olsa <jolsa@redhat.com>
>> Cc: Namhyung Kim <namhyung@kernel.org>
>> Cc: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
>> Cc: Andi Kleen <ak@linux.intel.com>
>> Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
>> Cc: linux-kernel@vger.kernel.org
>> Cc: x86@kernel.org
>> ---
>> kernel/events/core.c | 36 ++++++++++++++++++++++--------------
>> 1 file changed, 22 insertions(+), 14 deletions(-)
>>
>> diff --git a/kernel/events/core.c b/kernel/events/core.c
>> index f490caca9aa4..12de95b0472e 100644
>> --- a/kernel/events/core.c
>> +++ b/kernel/events/core.c
>> @@ -10189,10 +10189,6 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr,
>> */
>> attr->branch_sample_type = mask;
>> }
>> - /* privileged levels capture (kernel, hv): check permissions */
>> - if ((mask & PERF_SAMPLE_BRANCH_PERM_PLM)
>> - && perf_paranoid_kernel() && !capable(CAP_SYS_ADMIN))
>> - return -EACCES;
>> }
>>
>> if (attr->sample_type & PERF_SAMPLE_REGS_USER) {
>> @@ -10409,11 +10405,6 @@ SYSCALL_DEFINE5(perf_event_open,
>> if (err)
>> return err;
>>
>> - if (!attr.exclude_kernel) {
>> - if (perf_paranoid_kernel() && !capable(CAP_SYS_ADMIN))
>> - return -EACCES;
>> - }
>> -
>> if (attr.namespaces) {
>> if (!capable(CAP_SYS_ADMIN))
>> return -EACCES;
>> @@ -10427,11 +10418,6 @@ SYSCALL_DEFINE5(perf_event_open,
>> return -EINVAL;
>> }
>>
>> - /* Only privileged users can get physical addresses */
>> - if ((attr.sample_type & PERF_SAMPLE_PHYS_ADDR) &&
>> - perf_paranoid_kernel() && !capable(CAP_SYS_ADMIN))
>> - return -EACCES;
>> -
>> /*
>> * In cgroup mode, the pid argument is used to pass the fd
>> * opened to the cgroup directory in cgroupfs. The cpu argument
>> @@ -10501,6 +10487,28 @@ SYSCALL_DEFINE5(perf_event_open,
>> goto err_cred;
>> }
>>
>> + if (!attr.exclude_kernel) {
>> + if (perf_paranoid_kernel() && !capable(CAP_SYS_ADMIN)) {
>> + err = -EACCES;
>
> I would separate this combined permissions check into a function e.g.
> static bool perf_test_pmu_paranoid(const struct pmu *pmu, int *err) to avoid
> code duplication.
My thinking was for this to be as mechanical (code movement) as
possible, but I can consider it.
Regards,
Tvrtko
>> + goto err_alloc;
>> + }
>> + }
>> +
>> + /* Only privileged users can get physical addresses */
>> + if ((attr.sample_type & PERF_SAMPLE_PHYS_ADDR) &&
>> + perf_paranoid_kernel() && !capable(CAP_SYS_ADMIN)) {
>> + err = -EACCES;
>> + goto err_alloc;
>> + }
>> +
>> + /* privileged levels capture (kernel, hv): check permissions */
>> + if ((attr.sample_type & PERF_SAMPLE_BRANCH_STACK) &&
>> + (attr.branch_sample_type & PERF_SAMPLE_BRANCH_PERM_PLM) &&
>> + perf_paranoid_kernel() && !capable(CAP_SYS_ADMIN)) {
>> + err = -EACCES;
>> + goto err_alloc;
>> + }
>> +
>> if (is_sampling_event(event)) {
>> if (event->pmu->capabilities & PERF_PMU_CAP_NO_INTERRUPT) {
>> err = -EOPNOTSUPP;
>>
>
next prev parent reply other threads:[~2018-06-27 9:00 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-26 15:36 [RFC 0/4] perf: Per PMU access controls (paranoid setting) Tvrtko Ursulin
2018-06-26 15:36 ` [RFC 1/4] perf: Move some access checks later in perf_event_open Tvrtko Ursulin
2018-06-26 17:24 ` Alexey Budankov
2018-06-27 9:00 ` Tvrtko Ursulin [this message]
2018-06-26 15:36 ` [RFC 2/4] perf: Pass pmu pointer to perf_paranoid_* helpers Tvrtko Ursulin
2018-07-03 10:24 ` Ravi Bangoria
2018-07-03 10:28 ` Tvrtko Ursulin
2018-06-26 15:36 ` [RFC 3/4] perf: Allow per PMU access control Tvrtko Ursulin
2018-06-26 17:25 ` Alexey Budankov
2018-06-27 9:15 ` Tvrtko Ursulin
2018-06-27 9:47 ` Alexey Budankov
2018-06-27 10:05 ` Tvrtko Ursulin
2018-06-27 12:58 ` Alexey Budankov
2018-06-26 15:36 ` [RFC 4/4] perf Documentation: Document the per PMU perf_event_paranoid interface Tvrtko Ursulin
2018-06-27 20:46 ` [RFC 0/4] perf: Per PMU access controls (paranoid setting) Jiri Olsa
2018-09-12 6:52 ` Alexey Budankov
2018-09-12 8:41 ` Tvrtko Ursulin
2018-09-12 16:19 ` Alexey Budankov
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=d7264619-e9cc-08fe-6a6b-ee19a28c30df@ursulin.net \
--to=tursulin@ursulin.net \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=alexey.budankov@linux.intel.com \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maddy@linux.vnet.ibm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=tvrtko.ursulin@intel.com \
--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;
as well as URLs for NNTP newsgroup(s).