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=1795114366; b=G8PBhskk1VTujLObVYdx997dSSCvXTqRnve3BxzV6NEgFHnXEW3xaTm9Z5taXP3qUjM5 YR+HIr+NERoh/O19fBC0n2Oebe0zZQ092jAg7Sxv5DnbWY7t0sl6QMbtGW4gKivJ/WJdw 0AwoNd2R8ugc8frivj5lIQO7gRxz9jByeYJuMmL32mErja9leoybuVU2EfX0WNiFx/+5Q EoKx7nBIE/5InzRb/MF++Bz1JHijDe2oeDDCSD+GJ/Ze5QMK2EQ4paeccppO0KJeVa4Kc nxKoybvhDa9wuyZvQLDEMiKxHSEhq0HmJMw/UzdR4ENsmFRziXr4yq2lMnTNzqniyyw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795114366; 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=AHJ6vsYYQy4ZksSL7GxZoPUPCozguL3MZwWjlTE9XOs=; b=zbKvjRXH/AM0GZBNGq3X5XY6vpYwj2zxr642pnVEh/E2Ffr7JsrWtDEErMqMToQBuw5N kBSjpN0mFXhAWh4eRXRyUhqF4VfuHoAOdTfC4Tejbk1yydiuHgVeje2pxRsjWiahGEdvN gtbRBhny2K9uvuhzV0kNNWTQd9jx+UPvkrKR/qgERLjRoPsrgDwSBAmcmEImF/3yRSrxL JwBcYiWe1ZVmgSaFJIe2POUFltXzFAhsekhqt0dE0GX40VA82OLtCTW65uTE5q+aC9FqO fVE4zKPIk53LmCYWCtIqphMaoassM3OgkJGhDEdxvVy4l2CP0OylvCgiDr4FgxiD35w== 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=Wzc4c+OL; 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 71A916072309 for ; Thu, 19 Nov 2026 18:52:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 71A916072309 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=Wzc4c+OL Received: by mail-oi1-f199.google.com with SMTP id 5614622812f47-4cbf700ddccso164963b6e.0 for ; Thu, 19 Nov 2026 10:52:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1795114364; x=1795719164; 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=AHJ6vsYYQy4ZksSL7GxZoPUPCozguL3MZwWjlTE9XOs=; b=Wzc4c+OLTCQBedhbweaUILehwOwpk8UGZepyB1JKwHSjXkS/54EEQH0n6DmEeuEPja OT1Jj6VIdqXnEI0RwH6/b/K+yNw369Lhl8ki/GjLcqXiW9+/i2k+ncbrYGrq+zHziTZN eOXRKnbkw7glyoV+p+d6ZZ7qNZpGFECEal+dCv9t0F39vuL/8zah5prbl/WBB7UddSsf iqNd0QQRw7FzzTmdrHev5GkOML4rtse19SzsaRYnKqsmj7ZXWecmr/FdbhJFx0ngdGmv soFtYDZNDXnqCII4Flxcc3WZ2LUq4xAIL0NTXCVn6ftkWuq2DuSL7OUUD2tpNDJ99IsS DzhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795114364; x=1795719164; 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=AHJ6vsYYQy4ZksSL7GxZoPUPCozguL3MZwWjlTE9XOs=; b=QKqFxhulBJmaHQTRYfJmdu5CaYAYG6WaIydzOTc/U6Ly/jQVVB28IUbmsozdu0aWPl DcFbqnV0TfZzUfpLqr6KkbvoVh5JN54TdlokjkDEAY220/9iFdIKSLNfNFpXb6KAC4DH Q1GQfbQ3rgZkj/drBVfBoQE0/4LT6eDtM11VzFoVs0cwMEUJGADnlw8DlNzrGnYls/y9 iG+UL2Pdd4JicQKXlJeZqewCd9qRvXEWk/NZTw/LRRvJ1YUOpcOdk7UR9WjpnSdln06u V2nwSpCCgaWM8iuJeG0aAzfD8IHq1bRuW/+7ZjuVCyJiRHAGRwGjISDJc7hdGIJ1FLJn BjHg== X-Forwarded-Encrypted: i=1; AL+hErGgjG0izxxvD+UAtL2HpZSIPjbIr0qFaA7jopdNIVPbziMyHe3AgSXHYDGaWG0UUM6FLqZVMWTKUXCyDlM=@vger.kernel.org X-Gm-Message-State: APuU4Z9G3eYvb+0fnWMw9Pu+PcbPMOYpSiutUuEB0kQlcCOiyFfd8n41 Tkm+EvWuh468O3K0dTKtDYnJfAMqhS65NZRCIN2TM2OC/0B2n/FLxSc8SzuinhDidw8iZXCLGyv Gka1GGSuqpaMwyTtHy5mgWi0XtQ== X-Received: from iobi29-n2.prod.google.com ([2002:a05:6602:c69d:20b0:9c7:67b2:21c8]) (user=coltonlewis job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6808:67c7:b0:4f5:98d:d1ae with SMTP id 5614622812f47-57a0bb8d52cmr963272b6e.55.1795114364230; Thu, 19 Nov 2026 10:52:44 -0800 (PST) Date: Thu, 19 Nov 2026 18:52:11 +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-30-coltonlewis@google.com> Subject: [PATCH v10 29/33] KVM: arm64: Forward FGT traps for PMXEVTYPER_EL0 and PMXEVCNTR_EL0 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" When an L1 hypervisor runs a nested L2 guest with a Partitioned PMU (vMDCR_EL2.TPM == 0), L1 relies on fine-grained traps in HDFGRTR_EL2 and HDFGWTR_EL2 (PMEVTYPERn_EL0, PMCCFILTR_EL0, and PMEVCNTRn_EL0) rather than coarse-grained MDCR_EL2.TPM traps. Add SYS_PMXEVTYPER_EL0 and SYS_PMXEVCNTR_EL0 to encoding_to_fgt[] in arch/arm64/kvm/emulate-nested.c so L0 forwards fine-grained traps on selector-indexed PMU accesses to L1, using PMSELR_SEL to check HDFG{R,W}TR_EL2.PMCCFILTR_EL0 when PMSELR_EL0.SEL == 31 and HDFG{R,W}TR_EL2.PMEVTYPERn_EL0 otherwise. Signed-off-by: Colton Lewis --- arch/arm64/kvm/emulate-nested.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/arm64/kvm/emulate-nested.c b/arch/arm64/kvm/emulate-nested.c index 1cd2f42452fe7..9da7e98b4d18f 100644 --- a/arch/arm64/kvm/emulate-nested.c +++ b/arch/arm64/kvm/emulate-nested.c @@ -1319,6 +1319,7 @@ static DEFINE_XARRAY(sr_forward_xa); enum fg_filter_id { __NO_FGF__, HCRX_FGTnXS, + PMSELR_SEL, /* Must be last */ __NR_FG_FILTER_IDS__ @@ -1870,6 +1871,8 @@ static const struct encoding_to_trap_config encoding_to_fgt[] __initconst = { SR_FGT(SYS_PMCNTENSET_EL0, HDFGRTR, PMCNTEN, 1), SR_FGT(SYS_PMCCNTR_EL0, HDFGRTR, PMCCNTR_EL0, 1), SR_FGT(SYS_PMCCFILTR_EL0, HDFGRTR, PMCCFILTR_EL0, 1), + SR_FGF(SYS_PMXEVTYPER_EL0, HDFGRTR, PMEVTYPERn_EL0, 1, PMSELR_SEL), + SR_FGT(SYS_PMXEVCNTR_EL0, HDFGRTR, PMEVCNTRn_EL0, 1), SR_FGT_RANGE(SYS_PMEVTYPERn_EL0(0), SYS_PMEVTYPERn_EL0(30), HDFGRTR, PMEVTYPERn_EL0, 1), @@ -2609,6 +2612,16 @@ bool triage_sysreg_trap(struct kvm_vcpu *vcpu, int *sr_index) case HDFGRTR_GROUP: fgtreg = is_read ? HDFGRTR_EL2 : HDFGWTR_EL2; + switch (tc.fgf) { + case __NO_FGF__: + break; + + case PMSELR_SEL: + if (SYS_FIELD_GET(PMSELR_EL0, SEL, + kvm_pmu_get_pmselr(vcpu)) == 31) + tc.bit = HDFGRTR_EL2_PMCCFILTR_EL0_SHIFT; + break; + } break; case HAFGRTR_GROUP: -- 2.56.1.708.g77570a6a1d-goog