From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.167.199 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795114341; b=JIAt1Ow65it40xv1JjeVaSBhpQXSwN5hvC4xAV6zMXABZ7kcTtlAtXzjyUQKbjnqynrE KRYPa7JpPBr4F3V2V8AlioJcx6eqOZvxQGbYhVB9Y+ZWfz85XLn1r38WJWFHQx2/dcxrg P1V//npj3x6EYSqCUW6NR9EtegTgIh4JjE4zi10wIiZ0eJ+cyQsLoVmLlBHJ+BCWtyv1y oWA1VX9n9PRTaptzqJ21tH7q+bGKc+XoK9zSgpKaG6tyiLJKBBgRwFNTGJhR792ZfS8B4 2vlOQ4gn6yAS1j68Z2MZ7BQFasZgEXMZd5a1aQ4YLSxIY2+qZnB27RtBCAHXl8kDyew== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795114341; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Received:Date:In-Reply-To: Mime-Version:References:X-Mailer:Message-ID:Subject:From:To:Cc: Content-Type; bh=KQsSEkRceSASTHzJzgBIIkzZNEt4co2b8TqRiek6Jc4=; b=oo7RihqVUZsfB53SKSVXtW8GZJEDhgTDFdCkno3AS/yJbXfumBXC2ycnARpZvQFHiH+i KAK7ftTQiZna24xhSlgmHVxlByPdebN/Qv4FULfxqNZrvwUvl3dbTZ9aN8FfH6ix5+nic nFMFYhFiIqFjpVYGx8uuwm/cZs1+dbFZg6P0mB0mrP2rsxdSMd1uDNiKZWKwNAO5LSTFq 5JRee4WwUAltHfnfrHRsyYcGaBj00ZItsV8Anhf4TiWTpa1KEcQJUbILnKOPTQIY3cQD/ GHiQIUhpHC/n/QRup1N09nxlcy8lqVzAsUahsXRIsqw23Mj8d5+hmRExymmKrB1W10Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--coltonlewis.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=UmgNvltQ; arc=none smtp.remote-ip=209.85.167.199 Received: from mail-oi1-f199.google.com (mail-oi1-f199.google.com [209.85.167.199]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 06BD860A263E for ; Thu, 19 Nov 2026 18:52:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 06BD860A263E Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--coltonlewis.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=UmgNvltQ Received: by mail-oi1-f199.google.com with SMTP id 5614622812f47-4b26d8d2498so171498b6e.2 for ; Thu, 19 Nov 2026 10:52:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1795114340; x=1795719140; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=KQsSEkRceSASTHzJzgBIIkzZNEt4co2b8TqRiek6Jc4=; b=UmgNvltQccgHR7edr+trvn5fl8FJlquOD13iSw9vmFIXF22si+Vc93c3JWnyWrq8l1 qLBf4fhjAkfGuE765fXwvCKbIjmQaMMXViR400Vlh3N7IjJLV9KdBk+GkLYb7L1nFTwC ZFdvgtJwZUFpRLf0GdHxt7xeNc6OjjxYC8XMGoFhoulfRWbUFNUWd5wlKBaHBNiUuaD4 RKjLFqvrT7U0XdhagwArYm+w8jjruww+USpIDrTIHkoGNLKCB5bzFVYZBvWhiyO4IKkC n+WwSQ/SOrtY02XzGmIqnUrdk1BXnbZkkms3qJ6Gl4tuBwynzIUBKfZPXjH4NJdAk/Fb kb3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795114340; x=1795719140; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=KQsSEkRceSASTHzJzgBIIkzZNEt4co2b8TqRiek6Jc4=; b=JZmE3/SCyCe2tOp71G8442qdl11JvaoQjiSCOQpff2/RWr3q0Orur/YWMWGw4b/3Yi 100jvYor2bJmXTmlg7eAkl96U2LXSIzPd+r72NwjA1Sl1/QZ0DYA4s7Bi+9gjbneCvsU 9OCt1wjGtPHDu0A0j9LHaoBPAA+oRZ6Z6U4EZBC/jl69L7y51hkSPc9fPja89WpbqzmN wkfKmimV6KzhogJdD4Es51rnLmfLSHagVfgwLCaDWfguxm1UfXrNKhfM7CA6FaLgsBxE 5hXD/IcL3RBIvjIS7IZYK1pxiUoI/Yx3BYPWnJ7ft7P64N8CRztmojca/CGOhRoM91Xy d2pQ== X-Forwarded-Encrypted: i=1; AL+hErHK//ory+QZHHUKcwwPybWjHDO7vbZ4LtbrnbBzIXEVtNqDgjnNTrrW4eO2zaptbJzUpBBVrJzRyatyYk4=@vger.kernel.org X-Gm-Message-State: APuU4Z/H2v4voc5tqowNpDsbeN7nZWdhaCKpuSBWnMhcgDNY37nZkIu8 km9VFmn6LoqfBbREeb/JZm3voKPizk9AmGvag8P8wVZ/yAtZwCw33pi3BOT/uSr5LklOa7w14uv bg0/AKbO74eRcBdqejJ5Y7qA8ow== X-Received: from iobmp26-n1.prod.google.com ([2002:a05:6602:a2da:10b0:9c7:5697:9ad7]) (user=coltonlewis job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6808:3193:b0:56a:cf0b:a5fb with SMTP id 5614622812f47-57a0b145c20mr991415b6e.36.1795114339806; Thu, 19 Nov 2026 10:52:19 -0800 (PST) Date: Thu, 19 Nov 2026 18:51:46 +0000 In-Reply-To: <20261119185215.632334-1-coltonlewis@google.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261119185215.632334-1-coltonlewis@google.com> X-Mailer: git-send-email 2.56.1.809.ga0b61035b5-goog Message-ID: <20261119185215.632334-5-coltonlewis@google.com> Subject: [PATCH v10 04/33] KVM: arm64: Use nr_pmu_counters in kvm_pmu_implemented_counter_mask() From: Colton Lewis To: Marc Zyngier , Oliver Upton Cc: Catalin Marinas , Will Deacon , Mark Rutland , Peter Zijlstra , Ingo Molnar , Paolo Bonzini , Russell King , Jonathan Corbet , Fuad Tabba , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Shuah Khan , James Clark , Alexandru Elisei , Mingwei Zhang , Ganapatrao Kulkarni , kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" kvm_pmu_implemented_counter_mask() returns the bitmask of all counters implemented by the VM (0..N-1 and PMCCNTR_EL0). Previously it extracted N from kvm_vcpu_read_pmcr(vcpu), which commit 600f6fa5c90c ("KVM: arm64: Let kvm_vcpu_read_pmcr() return an EL-dependent value for PMCR_EL0.N") changed to substitute MDCR_EL2.HPMN for PMCR_EL0.N whenever vcpu_has_nv(vcpu) && !vcpu_is_el2(vcpu). As a result, when kvm_vcpu_reload_pmu() services KVM_REQ_RELOAD_PMU while the vCPU is at vEL1 or vEL0 (for example, when entering a nested guest after an L1 MDCR_EL2 update), kvm_pmu_implemented_counter_mask() omits HPMN..N-1 and kvm_vcpu_reload_pmu() wipes L1's hypervisor counter bits in PMOVSSET_EL0, PMINTENSET_EL1, and PMCNTENSET_EL0. Fix this in three parts: - Read vcpu->kvm->arch.nr_pmu_counters directly in kvm_pmu_implemented_counter_mask() so the VM-wide implemented mask is independent of the vCPU's current exception level. - Use kvm_pmu_accessible_counter_mask(vcpu) & ~BIT(ARMV8_PMU_CYCLE_IDX) for PMCR_EL0.P event counter resets instead of open-coding the subtraction of kvm_pmu_hyp_counter_mask(vcpu) below EL2. - Mask trapped reads in access_pmcnten(), access_pminten(), and access_pmovs() with kvm_pmu_accessible_counter_mask(vcpu) (matching existing write masking) so retained hypervisor counter bits in HPMN..N-1 read as zero at EL1 and EL0. Fixes: 600f6fa5c90c ("KVM: arm64: Let kvm_vcpu_read_pmcr() return an EL-dependent value for PMCR_EL0.N") Fixes: 9a1c58cfefb0 ("KVM: arm64: nv: Adjust range of accessible PMCs according to HPMN") Signed-off-by: Colton Lewis --- arch/arm64/kvm/pmu-emul.c | 5 +---- arch/arm64/kvm/pmu.c | 2 +- arch/arm64/kvm/sys_regs.c | 6 +++--- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/arm64/kvm/pmu-emul.c b/arch/arm64/kvm/pmu-emul.c index ea5908df42890..9eff208547746 100644 --- a/arch/arm64/kvm/pmu-emul.c +++ b/arch/arm64/kvm/pmu-emul.c @@ -446,12 +446,9 @@ void kvm_pmu_handle_pmcr(struct kvm_vcpu *vcpu, u64 val) kvm_pmu_set_counter_value(vcpu, ARMV8_PMU_CYCLE_IDX, 0); if (val & ARMV8_PMU_PMCR_P) { - unsigned long mask = kvm_pmu_implemented_counter_mask(vcpu) & + unsigned long mask = kvm_pmu_accessible_counter_mask(vcpu) & ~BIT(ARMV8_PMU_CYCLE_IDX); - if (!vcpu_is_el2(vcpu)) - mask &= ~kvm_pmu_hyp_counter_mask(vcpu); - for_each_set_bit(i, &mask, 32) kvm_pmu_set_pmc_value(kvm_vcpu_idx_to_pmc(vcpu, i), 0, true); } diff --git a/arch/arm64/kvm/pmu.c b/arch/arm64/kvm/pmu.c index 567de460205a0..dbbe219ac874f 100644 --- a/arch/arm64/kvm/pmu.c +++ b/arch/arm64/kvm/pmu.c @@ -852,7 +852,7 @@ u8 kvm_arm_pmu_get_pmuver_limit(void) u64 kvm_pmu_implemented_counter_mask(struct kvm_vcpu *vcpu) { - u64 val = FIELD_GET(ARMV8_PMU_PMCR_N, kvm_vcpu_read_pmcr(vcpu)); + u64 val = vcpu->kvm->arch.nr_pmu_counters; if (val == 0) return BIT(ARMV8_PMU_CYCLE_IDX); diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 04947bfbd0ee5..6e8bc4618870d 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -1359,7 +1359,7 @@ static bool access_pmcnten(struct kvm_vcpu *vcpu, struct sys_reg_params *p, kvm_pmu_reprogram_counter_mask(vcpu, val); } else { - p->regval = __vcpu_sys_reg(vcpu, PMCNTENSET_EL0); + p->regval = __vcpu_sys_reg(vcpu, PMCNTENSET_EL0) & mask; } return true; @@ -1383,7 +1383,7 @@ static bool access_pminten(struct kvm_vcpu *vcpu, struct sys_reg_params *p, /* accessing PMINTENCLR_EL1 */ __vcpu_rmw_sys_reg(vcpu, PMINTENSET_EL1, &=, ~val); } else { - p->regval = __vcpu_sys_reg(vcpu, PMINTENSET_EL1); + p->regval = __vcpu_sys_reg(vcpu, PMINTENSET_EL1) & mask; } return true; @@ -1463,7 +1463,7 @@ static bool access_pmovs(struct kvm_vcpu *vcpu, struct sys_reg_params *p, /* accessing PMOVSCLR_EL0 */ __vcpu_rmw_sys_reg(vcpu, PMOVSSET_EL0, &=, ~(p->regval & mask)); } else { - p->regval = __vcpu_sys_reg(vcpu, PMOVSSET_EL0); + p->regval = __vcpu_sys_reg(vcpu, PMOVSSET_EL0) & mask; } return true; -- 2.56.1.708.g77570a6a1d-goog