From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 81D7BC27C55 for ; Mon, 10 Jun 2024 11:02:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=QwNU09GKoypTtzovAIx1JIYUZMy6ZMQI7ROPoiPTdo0=; b=Fokv24m4RS99ZM 7vs1CXx3o3JE7lMz6poTRC7v2Ms8wUwERK9zE2/UKCb6TewgyA8rQ2c+eZChY/aNmmi446+8V4nKc +XbQ45y1TrJyaBO5lPvwKdRsrlC7bpIE93meDjaK+qcz/TzM17PUmn0j37D++MnhK5EV/wwTRSq3p zo75KddErmdOpqfyrDneGc9thyjRv7G2vQGRBdDclG77aYPL5TNyCr/3ZG1z89hu0fldZRhIvNBVB 2vOe3GM1qHeWf0I/H38NlgKwOPo3IYh55qqEP6O19TYQA2CF8gWKZC/yDl1PsKk0HGsb+JBsOzDE8 TJLNqO/aG3nFbBSqNy5g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sGcnI-00000004kx5-2hFy; Mon, 10 Jun 2024 11:02:32 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sGcnE-00000004kvg-2OtO for linux-arm-kernel@lists.infradead.org; Mon, 10 Jun 2024 11:02:30 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C935812FC; Mon, 10 Jun 2024 04:02:51 -0700 (PDT) Received: from J2N7QTR9R3 (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 040AA3F73B; Mon, 10 Jun 2024 04:02:23 -0700 (PDT) Date: Mon, 10 Jun 2024 12:02:21 +0100 From: Mark Rutland To: "Rob Herring (Arm)" Cc: Russell King , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Will Deacon , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Zenghui Yu , Catalin Marinas , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, kvmarm@lists.linux.dev Subject: Re: [PATCH 5/9] KVM: arm64: pmu: Use arm_pmuv3.h register accessors Message-ID: References: <20240607-arm-pmu-3-9-icntr-v1-0-c7bd2dceff3b@kernel.org> <20240607-arm-pmu-3-9-icntr-v1-5-c7bd2dceff3b@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240607-arm-pmu-3-9-icntr-v1-5-c7bd2dceff3b@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240610_040228_751597_F3809554 X-CRM114-Status: GOOD ( 20.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Jun 07, 2024 at 02:31:30PM -0600, Rob Herring (Arm) wrote: > Commit df29ddf4f04b ("arm64: perf: Abstract system register accesses > away") split off PMU register accessor functions to a standalone header. > Let's use it for KVM PMU code and get rid one copy of the ugly switch > macro. > > Signed-off-by: Rob Herring (Arm) > --- > arch/arm64/include/asm/arm_pmuv3.h | 13 ++++++++ > arch/arm64/kvm/pmu.c | 67 +++++--------------------------------- > 2 files changed, 22 insertions(+), 58 deletions(-) Acked-by: Mark Rutland Mark. > > diff --git a/arch/arm64/include/asm/arm_pmuv3.h b/arch/arm64/include/asm/arm_pmuv3.h > index e96ce7900fc7..1ed91334fede 100644 > --- a/arch/arm64/include/asm/arm_pmuv3.h > +++ b/arch/arm64/include/asm/arm_pmuv3.h > @@ -33,6 +33,14 @@ static inline void write_pmevtypern(int n, unsigned long val) > PMEVN_SWITCH(n, WRITE_PMEVTYPERN); > } > > +#define RETURN_READ_PMEVTYPERN(n) \ > + return read_sysreg(pmevtyper##n##_el0) > +static inline unsigned long read_pmevtypern(int n) > +{ > + PMEVN_SWITCH(n, RETURN_READ_PMEVTYPERN); > + return 0; > +} > + > static inline unsigned long read_pmmir(void) > { > return read_cpuid(PMMIR_EL1); > @@ -96,6 +104,11 @@ static inline void write_pmccfiltr(u64 val) > write_sysreg(val, pmccfiltr_el0); > } > > +static inline u64 read_pmccfiltr(void) > +{ > + return read_sysreg(pmccfiltr_el0); > +} > + > static inline void write_pmovsclr(u64 val) > { > write_sysreg(val, pmovsclr_el0); > diff --git a/arch/arm64/kvm/pmu.c b/arch/arm64/kvm/pmu.c > index e633b4434c6a..01c9a9efdd1c 100644 > --- a/arch/arm64/kvm/pmu.c > +++ b/arch/arm64/kvm/pmu.c > @@ -6,6 +6,8 @@ > #include > #include > > +#include > + > static DEFINE_PER_CPU(struct kvm_pmu_events, kvm_pmu_events); > > /* > @@ -62,63 +64,16 @@ void kvm_clr_pmu_events(u64 clr) > pmu->events_guest &= ~clr; > } > > -#define PMEVTYPER_READ_CASE(idx) \ > - case idx: \ > - return read_sysreg(pmevtyper##idx##_el0) > - > -#define PMEVTYPER_WRITE_CASE(idx) \ > - case idx: \ > - write_sysreg(val, pmevtyper##idx##_el0); \ > - break > - > -#define PMEVTYPER_CASES(readwrite) \ > - PMEVTYPER_##readwrite##_CASE(0); \ > - PMEVTYPER_##readwrite##_CASE(1); \ > - PMEVTYPER_##readwrite##_CASE(2); \ > - PMEVTYPER_##readwrite##_CASE(3); \ > - PMEVTYPER_##readwrite##_CASE(4); \ > - PMEVTYPER_##readwrite##_CASE(5); \ > - PMEVTYPER_##readwrite##_CASE(6); \ > - PMEVTYPER_##readwrite##_CASE(7); \ > - PMEVTYPER_##readwrite##_CASE(8); \ > - PMEVTYPER_##readwrite##_CASE(9); \ > - PMEVTYPER_##readwrite##_CASE(10); \ > - PMEVTYPER_##readwrite##_CASE(11); \ > - PMEVTYPER_##readwrite##_CASE(12); \ > - PMEVTYPER_##readwrite##_CASE(13); \ > - PMEVTYPER_##readwrite##_CASE(14); \ > - PMEVTYPER_##readwrite##_CASE(15); \ > - PMEVTYPER_##readwrite##_CASE(16); \ > - PMEVTYPER_##readwrite##_CASE(17); \ > - PMEVTYPER_##readwrite##_CASE(18); \ > - PMEVTYPER_##readwrite##_CASE(19); \ > - PMEVTYPER_##readwrite##_CASE(20); \ > - PMEVTYPER_##readwrite##_CASE(21); \ > - PMEVTYPER_##readwrite##_CASE(22); \ > - PMEVTYPER_##readwrite##_CASE(23); \ > - PMEVTYPER_##readwrite##_CASE(24); \ > - PMEVTYPER_##readwrite##_CASE(25); \ > - PMEVTYPER_##readwrite##_CASE(26); \ > - PMEVTYPER_##readwrite##_CASE(27); \ > - PMEVTYPER_##readwrite##_CASE(28); \ > - PMEVTYPER_##readwrite##_CASE(29); \ > - PMEVTYPER_##readwrite##_CASE(30) > - > /* > * Read a value direct from PMEVTYPER where idx is 0-30 > * or PMCCFILTR_EL0 where idx is ARMV8_PMU_CYCLE_IDX (31). > */ > static u64 kvm_vcpu_pmu_read_evtype_direct(int idx) > { > - switch (idx) { > - PMEVTYPER_CASES(READ); > - case ARMV8_PMU_CYCLE_IDX: > - return read_sysreg(pmccfiltr_el0); > - default: > - WARN_ON(1); > - } > + if (idx == ARMV8_PMU_CYCLE_IDX) > + return read_pmccfiltr(); > > - return 0; > + return read_pmevtypern(idx); > } > > /* > @@ -127,14 +82,10 @@ static u64 kvm_vcpu_pmu_read_evtype_direct(int idx) > */ > static void kvm_vcpu_pmu_write_evtype_direct(int idx, u32 val) > { > - switch (idx) { > - PMEVTYPER_CASES(WRITE); > - case ARMV8_PMU_CYCLE_IDX: > - write_sysreg(val, pmccfiltr_el0); > - break; > - default: > - WARN_ON(1); > - } > + if (idx == ARMV8_PMU_CYCLE_IDX) > + write_pmccfiltr(val); > + else > + write_pmevtypern(idx, val); > } > > /* > > -- > 2.43.0 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel