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 76A42C71130 for ; Mon, 7 Jul 2025 17:04:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=35bFJ1o4b9vNe4qRhuL0Lr8xiGxXJ7RcKPiuncsF4MA=; b=tyYSultrx2XwqbEPO9K3wl1Gvt 6uV5dw8zCaoXM9RPCR1GgvAPIDDDKVQg+txyNfFevpqCnx23DNbGE+viZPgDvkOVKXKw9YF/Z8ebN DpjCQsZiAd1sGWKTZwPzDRYpJr4GEnfZcQR8qsnI26Ng9t9xt/bXOr1wUWYLQSoE0OfrvxVEUpQEK 75R7hDcLE4SQzfSnzT3C/Xow4C5DyA/62pgI9Mos1+YzZ1anR0hW0sHPh0rK77twuemUdCTEWB7XY fMJF1W+av+Nj1AwpRPp/aMKuDhBPMLuzgc/DDdsISAphu/2IxWebUIgoSfwBvfsQTSE9kD3/mJfbz 1NuHT6Nw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uYpG4-000000036tP-1WE6; Mon, 07 Jul 2025 17:04:00 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uYoSz-00000002zVs-2GPF for linux-arm-kernel@lists.infradead.org; Mon, 07 Jul 2025 16:13:18 +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 30B30168F; Mon, 7 Jul 2025 09:13:04 -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 E71B83F694; Mon, 7 Jul 2025 09:13:12 -0700 (PDT) Date: Mon, 7 Jul 2025 17:13:10 +0100 From: Mark Rutland To: Colton Lewis Cc: kvm@vger.kernel.org, Paolo Bonzini , Jonathan Corbet , Russell King , Catalin Marinas , Will Deacon , Marc Zyngier , Oliver Upton , Mingwei Zhang , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Shuah Khan , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-perf-users@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: Re: [PATCH v3 04/22] KVM: arm64: Cleanup PMU includes Message-ID: References: <20250626200459.1153955-1-coltonlewis@google.com> <20250626200459.1153955-5-coltonlewis@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250626200459.1153955-5-coltonlewis@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250707_091317_667712_A87A7BB9 X-CRM114-Status: GOOD ( 24.60 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Jun 26, 2025 at 08:04:40PM +0000, Colton Lewis wrote: > From: Marc Zyngier > > Reorganize these tangled headers. In prior versions of this series, there was some earlier text explaining that there was a circular header dependency. In v2: https://lore.kernel.org/linux-arm-kernel/20250620221326.1261128-6-coltonlewis@google.com/ ... it said: | asm/kvm_host.h includes asm/arm_pmu.h which includes perf/arm_pmuv3.h | which includes asm/arm_pmuv3.h which includes asm/kvm_host.h This | causes compilation problems why trying to use anything defined in any | of the headers in any other headers. Was there some reason for dropping that? It's a bit odd to start without a problem statement. > > * Respect the move defining the interface between KVM and PMU in its > own header asm/kvm_pmu.h > > * Define an empty struct arm_pmu so it is defined for those interface > functions when compiling with CONFIG_KVM but not CONFIG_ARM_PMU Which functions in particular are those? What prevents them from depending on CONFIG_ARM_PMU? Mark. > Signed-off-by: Marc Zyngier > Signed-off-by: Colton Lewis > --- > arch/arm64/include/asm/arm_pmuv3.h | 2 +- > arch/arm64/include/asm/kvm_host.h | 15 +-------------- > arch/arm64/include/asm/kvm_pmu.h | 15 +++++++++++++++ > arch/arm64/kvm/debug.c | 1 + > arch/arm64/kvm/hyp/include/hyp/switch.h | 1 + > arch/arm64/kvm/pmu.c | 2 ++ > arch/arm64/kvm/sys_regs.c | 1 + > include/linux/perf/arm_pmu.h | 5 +++++ > virt/kvm/kvm_main.c | 1 + > 9 files changed, 28 insertions(+), 15 deletions(-) > > diff --git a/arch/arm64/include/asm/arm_pmuv3.h b/arch/arm64/include/asm/arm_pmuv3.h > index 8a777dec8d88..32c003a7b810 100644 > --- a/arch/arm64/include/asm/arm_pmuv3.h > +++ b/arch/arm64/include/asm/arm_pmuv3.h > @@ -6,7 +6,7 @@ > #ifndef __ASM_PMUV3_H > #define __ASM_PMUV3_H > > -#include > +#include > > #include > #include > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > index 27ed26bd4381..2df76689381a 100644 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@ -14,6 +14,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -1487,25 +1488,11 @@ void kvm_arch_vcpu_ctxflush_fp(struct kvm_vcpu *vcpu); > void kvm_arch_vcpu_ctxsync_fp(struct kvm_vcpu *vcpu); > void kvm_arch_vcpu_put_fp(struct kvm_vcpu *vcpu); > > -static inline bool kvm_pmu_counter_deferred(struct perf_event_attr *attr) > -{ > - return (!has_vhe() && attr->exclude_host); > -} > - > #ifdef CONFIG_KVM > -void kvm_set_pmu_events(u64 set, struct perf_event_attr *attr); > -void kvm_clr_pmu_events(u64 clr); > -bool kvm_set_pmuserenr(u64 val); > void kvm_enable_trbe(void); > void kvm_disable_trbe(void); > void kvm_tracing_set_el1_configuration(u64 trfcr_while_in_guest); > #else > -static inline void kvm_set_pmu_events(u64 set, struct perf_event_attr *attr) {} > -static inline void kvm_clr_pmu_events(u64 clr) {} > -static inline bool kvm_set_pmuserenr(u64 val) > -{ > - return false; > -} > static inline void kvm_enable_trbe(void) {} > static inline void kvm_disable_trbe(void) {} > static inline void kvm_tracing_set_el1_configuration(u64 trfcr_while_in_guest) {} > diff --git a/arch/arm64/include/asm/kvm_pmu.h b/arch/arm64/include/asm/kvm_pmu.h > index baf028d19dfc..ad3247b46838 100644 > --- a/arch/arm64/include/asm/kvm_pmu.h > +++ b/arch/arm64/include/asm/kvm_pmu.h > @@ -11,9 +11,15 @@ > #include > #include > #include > +#include > > #define KVM_ARMV8_PMU_MAX_COUNTERS 32 > > +#define kvm_pmu_counter_deferred(attr) \ > + ({ \ > + !has_vhe() && (attr)->exclude_host; \ > + }) > + > #if IS_ENABLED(CONFIG_HW_PERF_EVENTS) && IS_ENABLED(CONFIG_KVM) > struct kvm_pmc { > u8 idx; /* index into the pmu->pmc array */ > @@ -68,6 +74,9 @@ int kvm_arm_pmu_v3_has_attr(struct kvm_vcpu *vcpu, > int kvm_arm_pmu_v3_enable(struct kvm_vcpu *vcpu); > > struct kvm_pmu_events *kvm_get_pmu_events(void); > +void kvm_set_pmu_events(u64 set, struct perf_event_attr *attr); > +void kvm_clr_pmu_events(u64 clr); > +bool kvm_set_pmuserenr(u64 val); > void kvm_vcpu_pmu_restore_guest(struct kvm_vcpu *vcpu); > void kvm_vcpu_pmu_restore_host(struct kvm_vcpu *vcpu); > void kvm_vcpu_pmu_resync_el0(void); > @@ -161,6 +170,12 @@ static inline u64 kvm_pmu_get_pmceid(struct kvm_vcpu *vcpu, bool pmceid1) > > #define kvm_vcpu_has_pmu(vcpu) ({ false; }) > static inline void kvm_pmu_update_vcpu_events(struct kvm_vcpu *vcpu) {} > +static inline void kvm_set_pmu_events(u64 set, struct perf_event_attr *attr) {} > +static inline void kvm_clr_pmu_events(u64 clr) {} > +static inline bool kvm_set_pmuserenr(u64 val) > +{ > + return false; > +} > static inline void kvm_vcpu_pmu_restore_guest(struct kvm_vcpu *vcpu) {} > static inline void kvm_vcpu_pmu_restore_host(struct kvm_vcpu *vcpu) {} > static inline void kvm_vcpu_reload_pmu(struct kvm_vcpu *vcpu) {} > diff --git a/arch/arm64/kvm/debug.c b/arch/arm64/kvm/debug.c > index 1a7dab333f55..a554c3e368dc 100644 > --- a/arch/arm64/kvm/debug.c > +++ b/arch/arm64/kvm/debug.c > @@ -9,6 +9,7 @@ > > #include > #include > +#include > > #include > #include > diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/include/hyp/switch.h > index 7599844908c0..825b81749972 100644 > --- a/arch/arm64/kvm/hyp/include/hyp/switch.h > +++ b/arch/arm64/kvm/hyp/include/hyp/switch.h > @@ -14,6 +14,7 @@ > #include > #include > #include > +#include > #include > > #include > diff --git a/arch/arm64/kvm/pmu.c b/arch/arm64/kvm/pmu.c > index 6b48a3d16d0d..8bfc6b0a85f6 100644 > --- a/arch/arm64/kvm/pmu.c > +++ b/arch/arm64/kvm/pmu.c > @@ -8,6 +8,8 @@ > #include > #include > > +#include > + > static DEFINE_PER_CPU(struct kvm_pmu_events, kvm_pmu_events); > > /* > diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c > index 99fdbe174202..eaff6d63ef77 100644 > --- a/arch/arm64/kvm/sys_regs.c > +++ b/arch/arm64/kvm/sys_regs.c > @@ -18,6 +18,7 @@ > #include > #include > #include > +#include > > #include > #include > diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h > index 6dc5e0cd76ca..fb382bcd4f4b 100644 > --- a/include/linux/perf/arm_pmu.h > +++ b/include/linux/perf/arm_pmu.h > @@ -187,6 +187,11 @@ void armpmu_free_irq(int irq, int cpu); > > #define ARMV8_PMU_PDEV_NAME "armv8-pmu" > > +#else > + > +struct arm_pmu { > +}; > + > #endif /* CONFIG_ARM_PMU */ > > #define ARMV8_SPE_PDEV_NAME "arm,spe-v1" > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index e2f6344256ce..25259fcf3115 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -48,6 +48,7 @@ > #include > #include > #include > +#include > > #include > #include > -- > 2.50.0.727.gbf7dc18ff4-goog >