From mboxrd@z Thu Jan 1 00:00:00 1970 From: Will Deacon Subject: Re: [PATCH v4 20/23] arm64: perf: Count EL2 events if the kernel is running in HYP Date: Mon, 15 Feb 2016 17:22:47 +0000 Message-ID: <20160215172247.GL6298@arm.com> References: <1455216004-19499-1-git-send-email-marc.zyngier@arm.com> <1455216004-19499-21-git-send-email-marc.zyngier@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org, Catalin Marinas , linux-kernel@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org To: Marc Zyngier Return-path: Content-Disposition: inline In-Reply-To: <1455216004-19499-21-git-send-email-marc.zyngier@arm.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu List-Id: kvm.vger.kernel.org On Thu, Feb 11, 2016 at 06:40:01PM +0000, Marc Zyngier wrote: > When the kernel is running in HYP (with VHE), it is necessary to > include EL2 events if the user requests counting kernel or > hypervisor events. > > Reviewed-by: Christoffer Dall > Acked-by: Catalin Marinas > Signed-off-by: Marc Zyngier > --- > arch/arm64/kernel/perf_event.c | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c > index f7ab14c..6013a38 100644 > --- a/arch/arm64/kernel/perf_event.c > +++ b/arch/arm64/kernel/perf_event.c > @@ -20,6 +20,7 @@ > */ > > #include > +#include > > #include > #include > @@ -693,10 +694,15 @@ static int armv8pmu_set_event_filter(struct hw_perf_event *event, > return -EPERM; > if (attr->exclude_user) > config_base |= ARMV8_EXCLUDE_EL0; > - if (attr->exclude_kernel) > - config_base |= ARMV8_EXCLUDE_EL1; > - if (!attr->exclude_hv) > - config_base |= ARMV8_INCLUDE_EL2; > + if (is_kernel_in_hyp_mode()) { > + if (!attr->exclude_kernel || !attr->exclude_hv) > + config_base |= ARMV8_INCLUDE_EL2; Hmm, so if userspace sets exclude_kernel but not exclude_user and exclude_hv, what should we do? I'm slightly tempted to reject the filter with -EINVAL... Will