From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.167.197 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795114343; b=KuJf0a5eb2G771MYSUEotFhlZgUzR0iZwiu0Js2rQnAokZOUcDlZiZ+xark01jj1SMe1 Qh36LqX82JfBt5ChxqO32u8MuqWqBxCtfY/8W9KuSmgYVPMdnB9U8CW9T82lxZs/Cs4Je JfMHVMrsgT0KJplOKfmGLC31LCqTq114iuRfj+qu7BSFumfOOQ/oCUZAnMRFddWpXhBPe JWphCxclx/uxhJtFklu2lPKyWpc/TfTbQhulpGtcR4bPpVkBX/9IQLFM0zvjQOvJURUBG 4Xoso/gXTWxnt+acR2lm0If0A6YG47M0F8051ts7cTNL9v16F9w4TG0EaL4m9+lU64Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795114343; 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=KP5KnQUPfka8VmyDjZcXxbg47BZ5cMwAz3YLWjZsMZ4=; b=HuJIytqewhGXfi93afHCscDnIprMXYqLWvY1pUurrKGaO2svUq9WyHLa94Jabk3SWgoq T2K4VGmcqsqfbZvqTdpwRaJ/lT1XIr1+ez85R8zmP2mnBQTb+/GRenwltKbIZL9xu48dZ rdCaDWBM7zbudO7ZfrsAMpV3n25+fBzwqTZ0EKlNISVEfL7IOyLx7V03CTjhizG+Q5/g9 Ucs8IOoN8/vCPJZN+vaLQU8mnz5nkmSP9vJ6afKYNlEiY7vlxoDWZwhz+FswkoZjNyjdV +38Ceooq4S5rl7KWyL4UCDIaOOcW1k8wfwZhoNmD+ToqzHNaU4/7JePcgFpBw341AcA== 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="U5ZtHd/v"; arc=none smtp.remote-ip=209.85.167.197 Received: from mail-oi1-f197.google.com (mail-oi1-f197.google.com [209.85.167.197]) (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 2D42560A5BCC for ; Thu, 19 Nov 2026 18:52:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 2D42560A5BCC 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=U5ZtHd/v Received: by mail-oi1-f197.google.com with SMTP id 5614622812f47-55bf11583d9so12193b6e.1 for ; Thu, 19 Nov 2026 10:52:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1795114341; x=1795719141; 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=KP5KnQUPfka8VmyDjZcXxbg47BZ5cMwAz3YLWjZsMZ4=; b=U5ZtHd/vnoU1jG+mrlyNUmMOuA1fPrQz55P0tPMFVB0Evv3bgGQWOnZEgF56vkp/nz 2ZkXqhSCQg5VxbRrQi4FN63mo5KGv8cRgTgHz9gAhsQQU7sMc6tZd0vjw931efGDbZA4 QWtH+JXKwMTY7jFYMHPL9jnSDmg94hRE7H/OR8m/IU+XnC0RMcZ2B3RrHaX7wLhoxUT1 YpygmsJFii75DAdBEJuuQDOMqrf0lvxZvV0I7ZOweIjqFesYsHJBJr6W8qG9nUA6aXHp e476XIKYyN1QQKKKsOWiU+g5PE75tzgkPXFQ45GD0vaHkvF2oRJl5feBtbk5AzzfE6+1 eY2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795114341; x=1795719141; 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=KP5KnQUPfka8VmyDjZcXxbg47BZ5cMwAz3YLWjZsMZ4=; b=rnCSL0ColU5DErTBlhdev2p9GV5KaSECPfZ/Pt4yO1db2DdadRV6Ga5Itgey0UTJr4 IGAUIX3bRcSwKwEL7XbZdkqNN6mWVUS7i8mKlODQ3NfcgYtFyoRMUKwgoM/uGbJT75oF fPvOzE805StM3HhNtrrqcXfOvCZSqwyLL2pTxrhgUA5cYjd0vqLFrQZTDyBv8savYr5A X+KiNxqCIl1TrKB1/5H7x9trNjGcysxlMsjX2lJNn/s4aZ9ec9NICI8UnZE1ITgDPdhZ tJkF5AECTToBBxBPPpad3/z/25NqSxJ3FY6maYk2I0T/xFTwHSiSptn35OjvHm0C7N5G YDPg== X-Forwarded-Encrypted: i=1; AL+hErHkNbR1pRaAu7mvSNs5orcP0qo1Ad7DtMmzkYPISY2K+OtAnkAu2dhFCZ3r5GTuAOvXUQPowhl2qdw7+gs=@vger.kernel.org X-Gm-Message-State: APuU4Z8APfWlRDVNfeGfoFslXZ0bNkRFZb5baZN8zre6qhWAlETSepma MxPMwPIPG4EvsIatjBEt/6CenD6JyAqsIbgfAuV9GAr/PjY0XMLVMkUtyQ37kkEEFY8YRlkmoIo RMYwXVvMvN5EDT4w+KVClvmurLQ== X-Received: from ilqa4.prod.google.com ([2002:a05:6e02:1204:b0:53d:3ab5:58fa]) (user=coltonlewis job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6808:1a1f:b0:4d6:9133:cfee with SMTP id 5614622812f47-5797e899a03mr1751032b6e.51.1795114340655; Thu, 19 Nov 2026 10:52:20 -0800 (PST) Date: Thu, 19 Nov 2026 18:51:47 +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-6-coltonlewis@google.com> Subject: [PATCH v10 05/33] KVM: arm64: Ignore HPMN for userspace PMU register access 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" Userspace save and restore (KVM_GET_ONE_REG / KVM_SET_ONE_REG) must observe and preserve all VM-implemented PMU counters ([0..nr_pmu_counters-1] plus PMCCNTR_EL0), independent of the vCPU's current exception level or MDCR_EL2.HPMN. Currently, two UAPI callbacks still depend on guest execution context when a nested vCPU (KVM_ARM_VCPU_HAS_EL2) is paused below EL2 (!vcpu_is_el2(vcpu)) with MDCR_EL2.HPMN < nr_pmu_counters: - set_pmreg() and get_pmreg() (backing PMINTEN{SET,CLR}_EL1, PMCNTEN{SET,CLR}_EL0, and PMOVS{SET,CLR}_EL0) mask register values with kvm_pmu_accessible_counter_mask(), which strips L1 hypervisor counter bits [HPMN..N-1]. Saving a vCPU paused in L2 hides those bits, and restoring them while paused in L2 permanently clears them. - get_pmcr() calls kvm_vcpu_read_pmcr(), which substitutes MDCR_EL2.HPMN for PMCR_EL0.N below EL2, corrupting the saved PMCR_EL0.N value. Switch set_pmreg() and get_pmreg() back to kvm_pmu_implemented_counter_mask(), and have get_pmcr() populate PMCR_EL0.N directly from vcpu->kvm->arch.nr_pmu_counters using u64_replace_bits(). Keep kvm_vcpu_read_pmcr() and kvm_pmu_accessible_counter_mask() for guest trap paths. Fixes: 9a1c58cfefb0 ("KVM: arm64: nv: Adjust range of accessible PMCs according to HPMN") Fixes: 600f6fa5c90c ("KVM: arm64: Let kvm_vcpu_read_pmcr() return an EL-dependent value for PMCR_EL0.N") Signed-off-by: Colton Lewis --- arch/arm64/kvm/sys_regs.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 6e8bc4618870d..2d9ae781acff0 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -1081,8 +1081,8 @@ static u64 reset_pmcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r) pmcr |= ARMV8_PMU_PMCR_LC; /* - * The value of PMCR.N field is included when the - * vCPU register is read via kvm_vcpu_read_pmcr(). + * The value of PMCR.N field is included when the vCPU register + * is read via kvm_vcpu_read_pmcr() or get_pmcr(). */ __vcpu_assign_sys_reg(vcpu, r->reg, pmcr); @@ -1323,7 +1323,7 @@ static bool access_pmu_evtyper(struct kvm_vcpu *vcpu, struct sys_reg_params *p, static int set_pmreg(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r, u64 val) { - u64 mask = kvm_pmu_accessible_counter_mask(vcpu); + u64 mask = kvm_pmu_implemented_counter_mask(vcpu); __vcpu_assign_sys_reg(vcpu, r->reg, val & mask); kvm_make_request(KVM_REQ_RELOAD_PMU, vcpu); @@ -1333,7 +1333,7 @@ static int set_pmreg(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r, u64 va static int get_pmreg(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r, u64 *val) { - u64 mask = kvm_pmu_accessible_counter_mask(vcpu); + u64 mask = kvm_pmu_implemented_counter_mask(vcpu); *val = __vcpu_sys_reg(vcpu, r->reg) & mask; return 0; @@ -1505,7 +1505,9 @@ static bool access_pmuserenr(struct kvm_vcpu *vcpu, struct sys_reg_params *p, static int get_pmcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r, u64 *val) { - *val = kvm_vcpu_read_pmcr(vcpu); + *val = u64_replace_bits(__vcpu_sys_reg(vcpu, PMCR_EL0), + vcpu->kvm->arch.nr_pmu_counters, + ARMV8_PMU_PMCR_N); return 0; } -- 2.56.1.708.g77570a6a1d-goog