From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753163Ab2IGQl1 (ORCPT ); Fri, 7 Sep 2012 12:41:27 -0400 Received: from db3ehsobe003.messaging.microsoft.com ([213.199.154.141]:11516 "EHLO db3outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751221Ab2IGQlZ (ORCPT ); Fri, 7 Sep 2012 12:41:25 -0400 X-Forefront-Antispam-Report: CIP:163.181.249.109;KIP:(null);UIP:(null);IPV:NLI;H:ausb3twp02.amd.com;RD:none;EFVD:NLI X-SpamScore: -1 X-BigFish: VPS-1(zz98dIzz1202hzz8275bh8275dhz2dh668h839h944hd25hf0ah11b5h121eh1220h1288h1155h) X-WSS-ID: 0M9ZNOT-02-0BA-02 X-M-MSG: Date: Fri, 7 Sep 2012 18:41:14 +0200 From: Robert Richter To: Peter Zijlstra CC: Ingo Molnar , David Ahern , Subject: [PATCH] perf, ibs: Check syscall attribute flags Message-ID: <20120907164114.GJ8285@erda.amd.com> References: <1342826756-64663-1-git-send-email-dsahern@gmail.com> <1342826756-64663-9-git-send-email-dsahern@gmail.com> <20120906190238.GA29278@erda.amd.com> <5048F6BF.70106@gmail.com> <20120906195645.GD8285@erda.amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20120906195645.GD8285@erda.amd.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-OriginatorOrg: amd.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 06.09.12 21:56:45, Robert Richter wrote: > I tested the patch and it runs ok with my kernel patch that checks > syscall attributes for ibs. perf tools falls back and clears > exclude_guest/_host bits in attr. This is the patch that checks syscall attributes for ibs. Should be for tip:perf/urgent for ABI compatibility. -Robert >>From 1d037614edef576da441936bd8c917d31f57b179 Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Wed, 25 Jul 2012 19:12:45 +0200 Subject: [PATCH] perf, ibs: Check syscall attribute flags Current implementation simply ignores attribute flags. Thus, there is no notification to userland of unsupported features. Check syscall's attribute flags to let userland know if a feature is supported by the kernel. This is also needed to distinguish between future kernels what might support a feature. Cc: v3.5.. Signed-off-by: Robert Richter --- arch/x86/kernel/cpu/perf_event_amd_ibs.c | 11 +++++++++++ include/linux/perf_event.h | 2 ++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/cpu/perf_event_amd_ibs.c b/arch/x86/kernel/cpu/perf_event_amd_ibs.c index 7bfb5be..0456061 100644 --- a/arch/x86/kernel/cpu/perf_event_amd_ibs.c +++ b/arch/x86/kernel/cpu/perf_event_amd_ibs.c @@ -215,6 +215,14 @@ static int perf_ibs_init(struct perf_event *event) struct perf_ibs *perf_ibs; u64 max_cnt, config; int ret; + struct perf_event_attr notsupp = { + .exclude_user = 1, + .exclude_kernel = 1, + .exclude_hv = 1, + .exclude_idle = 1, + .exclude_host = 1, + .exclude_guest = 1, + }; perf_ibs = get_ibs_pmu(event->attr.type); if (perf_ibs) { @@ -229,6 +237,9 @@ static int perf_ibs_init(struct perf_event *event) if (event->pmu != &perf_ibs->pmu) return -ENOENT; + if (perf_flags(&event->attr) & perf_flags(¬supp)) + return -EINVAL; + if (config & ~perf_ibs->config_mask) return -EINVAL; diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 28f9cee..c36a04f 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -304,6 +304,8 @@ struct perf_event_attr { __u32 __reserved_2; }; +#define perf_flags(attr) (*(&(attr)->read_format + 1)) + /* * Ioctls that can be done on a perf event fd: */ -- 1.7.8.6 -- Advanced Micro Devices, Inc. Operating System Research Center