From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oi1-f202.google.com (mail-oi1-f202.google.com [209.85.167.202]) (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 9E8133B637A for ; Thu, 9 Jul 2026 22:37:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783636644; cv=none; b=M+y1eN0dph0AGtDJMYWpKpBsf8rVYCU1maA5102fS5gQm9onwPVicEWZWWTKPWLL4drBTcUqZPOMCkB1OP7WA63NTBTTUu46QcZ0mhVoJYhTT/Odd1c25zcA0Oz5zfydPBA/NixV6zeZMT99FWk31JoWALfpFJ6jiXrGnJ0GvK4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783636644; c=relaxed/simple; bh=3up1sBtO4PIJV4dpkOl/Oq19tQ7laWLZmhnYXu8p8ro=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Ms40P3Z/6Zdpx4CFnvxwfINuGQJoE+iHI6b9J9C8wMdRXyK19z58XIHUTrortT5EYFQ8tWW4WP8iaZ+vkprdy/Hvi71klo/N1ABtG53KeQXgtmtNkgqwxI9Rhv/71AEAAbeV+wzO3nHRQUCFeL8xG7zF/6Dz2dxkg/AJn026zuE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--coltonlewis.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=ZoiN8z5M; arc=none smtp.client-ip=209.85.167.202 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.b="ZoiN8z5M" Received: by mail-oi1-f202.google.com with SMTP id 5614622812f47-487059fb570so484598b6e.0 for ; Thu, 09 Jul 2026 15:37:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1783636640; x=1784241440; darn=lists.linux.dev; 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=/sSD/MdR7z212lU1O4WIMPoRpCWIEcBrC5jBLx8jitA=; b=ZoiN8z5MkDuL9bUGGdel0hToTdiHLlBVx6qlr9ZKRZOSW0LmO7GHKMavXjVly6Ws8c QY2P9a57zjFa0RNzuhM9oZhC/TdY+rKjsYOEj5Xl+Y/ff6LEUuLLtXek3wki7oQw+Yko 5V+pb2jtvFFkiYFvtknmIl+1m3e40dBLAV3aAWuZWZqKo4vum/ZraH7SnSGrNe6/FOHE jDnLjTX81VAciMdJtjUmKEpoMmaPgmJuFbLBl9rRgwvwoCn/8zGOjRtczMhDJE4fQOna 67oHS8vsrYJLKIQ4fW3QCPQTdPSPTGP2YOezAP+Rs78QfzwGeyWY16bBx0DklOBgeRI6 o8Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783636640; x=1784241440; 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=/sSD/MdR7z212lU1O4WIMPoRpCWIEcBrC5jBLx8jitA=; b=oUKpUnh/wmgevqVtCXqTXmA2DLVJdoJPHW3TvIlLi1kkNDB41x7MoIWK+5gM3zGP+0 uCJF9XNIf876OddWnxF2eChYh4Yc2EuQ09qRHx2jCtrd9OfJFCAQ3EMefmmCmqwixWz5 DEuArlNDu529ZhEtij39lzCcjQAv/5XTgn7uXSvd3POIMocDfiqmmElj3yeEPqj+pKQy ck+rl7QZXQqS1+v9t2lcZ4Kwyy+fjRF1e0fMEgKml4dQK4Xge9VcSSnB+A876/LVYThv zJd3it8sE+ETnPJkUVVS2nbpzjowW5CYL6pBKU/J+H5FxJK4eYqkTw8tSjl2M1w5PbNY 0f5w== X-Forwarded-Encrypted: i=1; AFNElJ/lV2qsjSwRpm3OTsD1Omm/mH6qH728JuviYDQk3Dnev1olrG+wlZqIYu64nDeRmrnrbNf5nwI=@lists.linux.dev X-Gm-Message-State: AOJu0Yw2K+38kxEJ4KROS/LOp41QxGQsCzscCKeBd+T0Z3yyf+xguLqC Aa6wCgVUt6ak7KA/FvKplE5TdBYoDjJth+3/Tf534mkGFF1Xv+JowOs29a/itSsGpIyLICP2c9y EL77LFmg1+LDxW5QPRWxtqoEjEQ== X-Received: from ilpy16.prod.google.com ([2002:a92:c750:0:b0:501:bcc7:5e68]) (user=coltonlewis job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6808:152b:b0:4a4:934:b316 with SMTP id 5614622812f47-4a40934b663mr1606708b6e.21.1783636639699; Thu, 09 Jul 2026 15:37:19 -0700 (PDT) Date: Thu, 9 Jul 2026 22:36:03 +0000 In-Reply-To: <20260709223604.12934-1-coltonlewis@google.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260709223604.12934-1-coltonlewis@google.com> X-Mailer: git-send-email 2.55.0.795.g602f6c329a-goog Message-ID: <20260709223604.12934-7-coltonlewis@google.com> Subject: [PATCH 6.6 v3 6/6] arm64: Revamp HCR_EL2.E2H RES1 detection From: Colton Lewis To: stable@vger.kernel.org Cc: oliver.upton@linux.dev, sashal@kernel.org, gregkh@linuxfoundation.org, mizhang@google.com, catalin.marinas@arm.com, will@kernel.org, maz@kernel.org, james.morse@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, mark.rutland@arm.com, ahmed.genidi@arm.com, leo.yan@arm.com, miguel.luis@oracle.com, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Jan Kotas , Colton Lewis Content-Type: text/plain; charset="UTF-8" From: Marc Zyngier [ Upstream commit ca88ecdce5f51874a7c151809bd2c936ee0d3805 ] We currently have two ways to identify CPUs that only implement FEAT_VHE and not FEAT_E2H0: - either they advertise it via ID_AA64MMFR4_EL1.E2H0, - or the HCR_EL2.E2H bit is RAO/WI However, there is a third category of "cpus" that fall between these two cases: on CPUs that do not implement FEAT_FGT, it is IMPDEF whether an access to ID_AA64MMFR4_EL1 can trap to EL2 when the register value is zero. A consequence of this is that on systems such as Neoverse V2, a NV guest cannot reliably detect that it is in a VHE-only configuration (E2H is writable, and ID_AA64MMFR0_EL1 is 0), despite the hypervisor's best effort to repaint the id register. Replace the RAO/WI test by a sequence that makes use of the VHE register remnapping between EL1 and EL2 to detect this situation, and work out whether we get the VHE behaviour even after having set HCR_EL2.E2H to 0. This solves the NV problem, and provides a more reliable acid test for CPUs that do not completely follow the letter of the architecture while providing a RES1 behaviour for HCR_EL2.E2H. Suggested-by: Mark Rutland Acked-by: Mark Rutland Acked-by: Catalin Marinas Reviewed-by: Oliver Upton Tested-by: Jan Kotas Signed-off-by: Marc Zyngier Link: https://lore.kernel.org/r/15A85F2B-1A0C-4FA7-9FE4-EEC2203CC09E@global.cadence.com [ Backport: Resolved conflict in arch/arm64/include/asm/el2_setup.h by replacing msr_hcr_el2 macro usages with raw msr hcr_el2 (since the macro is missing in 6.6.y). ] Signed-off-by: Colton Lewis --- arch/arm64/include/asm/el2_setup.h | 38 +++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/arch/arm64/include/asm/el2_setup.h b/arch/arm64/include/asm/el2_setup.h index 76b0d50d286d5..4c7467b382b60 100644 --- a/arch/arm64/include/asm/el2_setup.h +++ b/arch/arm64/include/asm/el2_setup.h @@ -24,22 +24,48 @@ * ID_AA64MMFR4_EL1.E2H0 < 0. On such CPUs HCR_EL2.E2H is RES1, but it * can reset into an UNKNOWN state and might not read as 1 until it has * been initialized explicitly. - * - * Fruity CPUs seem to have HCR_EL2.E2H set to RAO/WI, but - * don't advertise it (they predate this relaxation). - * * Initalize HCR_EL2.E2H so that later code can rely upon HCR_EL2.E2H * indicating whether the CPU is running in E2H mode. */ mrs_s x1, SYS_ID_AA64MMFR4_EL1 sbfx x1, x1, #ID_AA64MMFR4_EL1_E2H0_SHIFT, #ID_AA64MMFR4_EL1_E2H0_WIDTH cmp x1, #0 - b.ge .LnVHE_\@ + b.lt .LnE2H0_\@ + /* + * Unfortunately, HCR_EL2.E2H can be RES1 even if not advertised + * as such via ID_AA64MMFR4_EL1.E2H0: + * + * - Fruity CPUs predate the !FEAT_E2H0 relaxation, and seem to + * have HCR_EL2.E2H implemented as RAO/WI. + * + * - On CPUs that lack FEAT_FGT, a hypervisor can't trap guest + * reads of ID_AA64MMFR4_EL1 to advertise !FEAT_E2H0. NV + * guests on these hosts can write to HCR_EL2.E2H without + * trapping to the hypervisor, but these writes have no + * functional effect. + * + * Handle both cases by checking for an essential VHE property + * (system register remapping) to decide whether we're + * effectively VHE-only or not. + */ + msr hcr_el2, x0 // Setup HCR_EL2 as nVHE + isb + mov x1, #1 // Write something to FAR_EL1 + msr far_el1, x1 + isb + mov x1, #2 // Try to overwrite it via FAR_EL2 + msr far_el2, x1 + isb + mrs x1, far_el1 // If we see the latest write in FAR_EL1, + cmp x1, #2 // we can safely assume we are VHE only. + b.ne .LnVHE_\@ // Otherwise, we know that nVHE works. + +.LnE2H0_\@: orr x0, x0, #HCR_E2H -.LnVHE_\@: msr hcr_el2, x0 isb +.LnVHE_\@: .endm .macro __init_el2_sctlr -- 2.55.0.795.g602f6c329a-goog