From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f74.google.com (mail-ej1-f74.google.com [209.85.218.74]) (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 74C57344D90 for ; Fri, 24 Apr 2026 08:49:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777020553; cv=none; b=ZA20R9l1GYMZq8/J+b3zNwKb8up/ACfZHG6CGr0QHxeuRx20bdfaqMTOASKjqHFlqxN5SeFjb0VO26qahBFfZqQjUd3dWtIK/YZNVkvU+ZOpvzdqIDuAg2gMYmrgjGdPPyTyCMWxYCEHr957Au3biCuMnxQWSAQSKjUysXBQx1w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777020553; c=relaxed/simple; bh=QWGFycIggrzer+24r8IUUQ544hu3QAGAwn5g4AM9ElU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=YmlkiQBJXiUjCyFvmrLe+D4w8kETfhtmNGfNyjQbVOF+SuaGk/xQPG310HA+Rzmp6h/+klUtflAkeACNVZRsVFaQouFF7mPPPYuimj89srg/x5sbCzyge6//T1xBDbgMG+l3uRwVJnjvxzjRBdh6IcRaCvBn152/3rUlvq5tJLw= 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=I83BDVEn; arc=none smtp.client-ip=209.85.218.74 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="I83BDVEn" Received: by mail-ej1-f74.google.com with SMTP id a640c23a62f3a-b9c0bdea9faso673462566b.2 for ; Fri, 24 Apr 2026 01:49:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1777020551; x=1777625351; 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=chjLWLOIpt5H2yMUpJCdXjXW1BJ6wL0l1ZmewdyTk+Q=; b=I83BDVEn6Rxm/1hfB6HdAA64YYYt7ihbJD6ISjhLmQ4BoXY2l2PTQvlMr/vOCbEH/k zdQRzCF9EnL0eoDFEVN7WMiK+JPQeQ/Yn3abXLjC3COc6JTBsnN7NdWueS8Q31rbL4/T BVoaBzZGyCM/JQbIc1sdjUcnn6/ezIRvqV2mVN9VSTBkG92Xrdm9wceWZ/6+hHI7XV9J 5bEg6Ood4FPs13htZy62zZR4L7Fgfr7e5Lv1WwxHPVetiOKnI3rOEkAl/5qVxThSF5iV MKZEFrc/oMPTeT8coXBWCKWvnEh5Ax/RAgGr/rhLoKv4zmGEQiGLvxZ0ZQRcD7xzFJI2 cGHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777020551; x=1777625351; 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=chjLWLOIpt5H2yMUpJCdXjXW1BJ6wL0l1ZmewdyTk+Q=; b=jyYNZxd+tYMPuwhBJ5VWNgamjJeY+mI6MLb5pS1du0qz0PrdcxYuUid+m65is55EXj Iq7n+7kl6+bopQNo/uvobKrxHE8WEaj+Lmkct4zUnLexA/9go21cyaK6EQOfDPV5oB5q AGZ7urLz1j7GIhsssesr7Xc+w3Yz4d9Om1pFpgIZtfQSv8gt1GEBN329i2g2JqfE9dBu E8q9M8d8t00jbP6/qyoUaao9t1UgehvaV3eQb1fyzs9l6GIxD8o/3A95fGcyh4zRClRN lqisFBYs7P7KinS/pcDs/e8W8e/84Se1IJ/YkxJY5IPsjZ+QqhS8FmIlhTLOQTPZuUiR DUBA== X-Forwarded-Encrypted: i=1; AFNElJ95JfJOrK/68X0KZA5Jr/znDUB69gHSBf+8ctyHp54/vbOANLJSfq3KFs+JnIdJ8HAB6abCSX8nx/iEmig=@vger.kernel.org X-Gm-Message-State: AOJu0Yyn83FqkcttHZZjuOodsXegBfOAm7ZGxSjcPqV/ho8Flh7XbrGD TOTiueTAMmDIQoPiKWk8PTsqupsXj4TSLciEft5Qxmdb8t0JojQvg8+DHm7yXuWqy/IGCetPxH4 owQ== X-Received: from ejbwt10.prod.google.com ([2002:a17:906:ee8a:b0:b9b:9f09:c27e]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a17:907:cd09:b0:b9e:f58:c581 with SMTP id a640c23a62f3a-ba41b3dff09mr1835202166b.45.1777020550736; Fri, 24 Apr 2026 01:49:10 -0700 (PDT) Date: Fri, 24 Apr 2026 09:49:03 +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-2-tabba@google.com> Subject: [PATCH 1/6] KVM: arm64: Fix FEAT_Debugv8p9 to check DebugVer, not PMUVer 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_Debugv8p9 is incorrectly defined against ID_AA64DFR0_EL1.PMUVer instead of ID_AA64DFR0_EL1.DebugVer. All three consumers of the macro gate features that are architecturally tied to FEAT_Debugv8p9 (DebugVer = 0b1011, DDI0487 M.b A2.2.10): - HDFGRTR2_EL2.nMDSELR_EL1, HDFGWTR2_EL2.nMDSELR_EL1: MDSELR_EL1 is present only when FEAT_Debugv8p9 is implemented (D24.3.21). - MDCR_EL2.EBWE: the Extended Breakpoint and Watchpoint Enable bit is RES0 unless FEAT_Debugv8p9 is implemented (D24.3.17). Neither register has any dependency on PMUVer. FEAT_Debugv8p9 and FEAT_PMUv3p9 are independent. Per DDI0487 M.b A2.2.10, FEAT_Debugv8p9 is unconditionally mandatory from Armv8.9, whereas FEAT_PMUv3p9 is mandatory only when FEAT_PMUv3 is implemented. An Armv8.9 CPU without a PMU has DebugVer = 0b1011 but PMUVer = 0b0000, so the wrong field check would cause KVM to incorrectly treat EBWE and MDSELR_EL1 as RES0 on such hardware. Fixes: 4bc0fe089840 ("KVM: arm64: Add sanitisation for FEAT_FGT2 registers") Signed-off-by: Fuad Tabba --- arch/arm64/kvm/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kvm/config.c b/arch/arm64/kvm/config.c index f35b8dddd7c1..093290b366e6 100644 --- a/arch/arm64/kvm/config.c +++ b/arch/arm64/kvm/config.c @@ -192,7 +192,7 @@ struct reg_feat_map_desc { #define FEAT_SRMASK ID_AA64MMFR4_EL1, SRMASK, IMP #define FEAT_PoPS ID_AA64MMFR4_EL1, PoPS, IMP #define FEAT_PFAR ID_AA64PFR1_EL1, PFAR, IMP -#define FEAT_Debugv8p9 ID_AA64DFR0_EL1, PMUVer, V3P9 +#define FEAT_Debugv8p9 ID_AA64DFR0_EL1, DebugVer, V8P9 #define FEAT_PMUv3_SS ID_AA64DFR0_EL1, PMSS, IMP #define FEAT_SEBEP ID_AA64DFR0_EL1, SEBEP, IMP #define FEAT_EBEP ID_AA64DFR1_EL1, EBEP, IMP -- 2.54.0.rc2.544.gc7ae2d5bb8-goog