From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 81D03344DA0 for ; Fri, 24 Apr 2026 08:49:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777020556; cv=none; b=AyFofbSUCE8+pYGxIdM2sh61eDT2I7eOTwhnlImpIqpx353W2nYqsMkpPBeo7lzjQn8hXE6bRiDY1A/2r5xO8lNN5ItDHDfk7i9I04nRCs4oDcURWbnWK+NN8bIOgaxXeJdCxp0QnM89t+hjlkLQnGfy3pPOVWqD+bZei4XlouE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777020556; c=relaxed/simple; bh=nELHylJPezncARiAi8KKGYsmhL2qaAXiYMmMmo3Zi9c=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=HEgIUi/NxsEqfbFzJNY3WFjKxW8rlEc++HMlpjHBrKeBA9qCeSaWqiT1umc1yNpPN714GxUiBzNRPFK3sBjIj3t7h61ZdOlV87lW0oRtRft9HnC3aITRut8jnbtxEt0xwcGsb3xGfytKOYrGeoARqV6FgYU0yzdjDtu8cr/Fu3Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--tabba.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=VrdvqxYz; arc=none smtp.client-ip=209.85.221.73 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--tabba.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="VrdvqxYz" Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-43e52dc8a04so6640395f8f.3 for ; Fri, 24 Apr 2026 01:49:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1777020553; x=1777625353; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=75xbgkgj9TP8McSEuAQtz161daMjjx48XqQqIGgEMWU=; b=VrdvqxYzf5joSvtVoKm/ilbRNIegPZkT6bb5JNpVyJ06A4LDwjEdJE4K5fZgZ63Ccs fRvKg9tVhqFDLO5Ql+HDTdNcMmsWZliZndKb2CC50fjA9dy/NZeOovhzJHluO+5bcdjT Otjm+uFdWgUrBodO8ldI5J/c5gMYHrrjVJlgtTUoqeft319t3umctJ8OM2/a+W9AgGh4 HnVxpdL//KzjEdYhg7L+2AGSoELdtuITLbFMnZyuGBuZiIUYwvgB5SZp7Jmdb5kJ8txC HLTcMQISnQBd0ljKQBpYg5kCOcwcEre8OaNDIqH3PnqSCsqVwai2vU5KuUl3Wwq+1eCD FteA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777020553; x=1777625353; h=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; bh=75xbgkgj9TP8McSEuAQtz161daMjjx48XqQqIGgEMWU=; b=UQEmP3RhOLDymBk+6mJxXR0Pci0aNY54Na57v7wv6SYHfyzxHc45YjF2idIBjfq5Ai k4RzFSHftcYxXjGIDISKRBxPEevD7yHPCcm/nuqOPFFZI2AxcH+qb4FCY9qKWrbd/Efe bJhpVKrfAj+6XYxCoiD8jhryc2FzT+pfowZcXKWOUycgVvXxHCFKvipnwbjpMmITJtC2 rR6/9m6uIGre1vFS16ZNzIYaPiysazx7Eif4BLvnRQbXv3/1EG9zA4ajR3TfzUx2C6tY OoRaQLDsAotvnpro6lI44a6sYjgH7Ya+Cj+4KqvyVeJnV0GDEx/422/bLXbu+hQsGvXN lnXA== X-Forwarded-Encrypted: i=1; AFNElJ/mn52cDBdZmaJVJCMB2aWEr1NfNOvsbmx6axHG3PhpLpBbAr5rKSmKebdbl3zPhvw2Ba/glXK65jwzlMw=@vger.kernel.org X-Gm-Message-State: AOJu0YzbvxjvWMn22MK1KQrYGm9xr6ODCgWEtAB687065BxaHABSWanA 65gWPz8RjCbRO/aKKE52jiK+Xi30GBCtidJj9pGuhQ1+YP0mdcg6rhVPTLYp95LdGeJqRI2gPJw 8JQ== X-Received: from wrpx14.prod.google.com ([2002:adf:f64e:0:b0:43d:7088:5f55]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:2f83:b0:43d:7d6f:f529 with SMTP id ffacd0b85a97d-43fe3e0dc49mr47722399f8f.31.1777020552885; Fri, 24 Apr 2026 01:49:12 -0700 (PDT) Date: Fri, 24 Apr 2026 09:49:05 +0100 In-Reply-To: <20260424084908.370776-1-tabba@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260424084908.370776-1-tabba@google.com> X-Mailer: git-send-email 2.54.0.rc2.544.gc7ae2d5bb8-goog Message-ID: <20260424084908.370776-4-tabba@google.com> Subject: [PATCH 3/6] KVM: arm64: Fix FEAT_SPE_FnE to use PMSIDR_EL1.FnE, not PMSVer From: Fuad Tabba To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: tabba@google.com, catalin.marinas@arm.com, will@kernel.org, maz@kernel.org, oupton@kernel.org, qperret@google.com, suzuki.poulose@arm.com, joey.gouly@arm.com, yuzenghui@huawei.com Content-Type: text/plain; charset="UTF-8" FEAT_SPE_FnE is architecturally detected via PMSIDR_EL1.FnE [6], not ID_AA64DFR0_EL1.PMSVer. The FEAT_X macro form (register, field, value) cannot encode a PMSIDR_EL1-based feature, so FEAT_SPE_FnE was defined identically to FEAT_SPEv1p2 (ID_AA64DFR0_EL1, PMSVer, V1P2), producing a duplicate that used PMSVer >= V1P2 as a proxy. Replace the macro with feat_spe_fne(), following the same pattern as the sibling feat_spe_fds(): guard on FEAT_SPEv1p2 and read PMSIDR_EL1.FnE [6] directly. Wire the two NEEDS_FEAT consumers to use the new function. Remove the now-unused FEAT_SPE_FnE macro. Fixes: 63d423a7635b ("KVM: arm64: Switch to table-driven FGU configuration") Signed-off-by: Fuad Tabba --- arch/arm64/kvm/config.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kvm/config.c b/arch/arm64/kvm/config.c index a722ea178f68..0622162b089e 100644 --- a/arch/arm64/kvm/config.c +++ b/arch/arm64/kvm/config.c @@ -131,7 +131,6 @@ struct reg_feat_map_desc { } #define FEAT_SPE ID_AA64DFR0_EL1, PMSVer, IMP -#define FEAT_SPE_FnE ID_AA64DFR0_EL1, PMSVer, V1P2 #define FEAT_BRBE ID_AA64DFR0_EL1, BRBE, IMP #define FEAT_TRC_SR ID_AA64DFR0_EL1, TraceVer, IMP #define FEAT_PMUv3 ID_AA64DFR0_EL1, PMUVer, IMP @@ -302,6 +301,16 @@ static bool feat_spe_fds(struct kvm *kvm) (read_sysreg_s(SYS_PMSIDR_EL1) & PMSIDR_EL1_FDS)); } +static bool feat_spe_fne(struct kvm *kvm) +{ + /* + * Revisit this if KVM ever supports SPE -- this really should + * look at the guest's view of PMSIDR_EL1. + */ + return (kvm_has_feat(kvm, FEAT_SPEv1p2) && + (read_sysreg_s(SYS_PMSIDR_EL1) & PMSIDR_EL1_FnE)); +} + static bool feat_trbe_mpam(struct kvm *kvm) { /* @@ -537,7 +546,7 @@ static const struct reg_bits_to_feat_map hdfgrtr_feat_map[] = { HDFGRTR_EL2_PMBPTR_EL1 | HDFGRTR_EL2_PMBLIMITR_EL1, FEAT_SPE), - NEEDS_FEAT(HDFGRTR_EL2_nPMSNEVFR_EL1, FEAT_SPE_FnE), + NEEDS_FEAT(HDFGRTR_EL2_nPMSNEVFR_EL1, feat_spe_fne), NEEDS_FEAT(HDFGRTR_EL2_nBRBDATA | HDFGRTR_EL2_nBRBCTL | HDFGRTR_EL2_nBRBIDR, @@ -605,7 +614,7 @@ static const struct reg_bits_to_feat_map hdfgwtr_feat_map[] = { HDFGWTR_EL2_PMBPTR_EL1 | HDFGWTR_EL2_PMBLIMITR_EL1, FEAT_SPE), - NEEDS_FEAT(HDFGWTR_EL2_nPMSNEVFR_EL1, FEAT_SPE_FnE), + NEEDS_FEAT(HDFGWTR_EL2_nPMSNEVFR_EL1, feat_spe_fne), NEEDS_FEAT(HDFGWTR_EL2_nBRBDATA | HDFGWTR_EL2_nBRBCTL, FEAT_BRBE), -- 2.54.0.rc2.544.gc7ae2d5bb8-goog