From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D69EACCF2E8 for ; Mon, 19 Jan 2026 10:57:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=4DW5wch7f/dmXQUTIsPKstf24C/oL3K4sb+NUjJB+Nw=; b=Eiws2KQE8WPEUYfoPuJ5M2GoEn wjammUPZ6gHcXbrgpSrRqtbS+8ZZwAS4SYFk882WHVt06EZ2DYC0kR5SCTNHkSFZpzFMrm3+L2Ye5 NVVxg3LiYk1oPFd4nXbHcpS6W50VtdZUsUTEFjwQTXxxlphbadBntTlpxarT20/jMbh3JDjCkncCp y8BOfdRXAPi8izHR+wTNHMqOumfbyqg0rhqhKZCrTrRTy7Lbb8b3r1BeD3qdQSLsiqTo07YpXcSn2 pqMcZaHp4aNUs/8ycOeYt7NqAm7jae3NqH6ZAiRauEIk0ALiG7tluN18ZoNmd5GgOPZbkOokVBzhC 8rXM2R8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vhmwQ-00000001pXM-0id1; Mon, 19 Jan 2026 10:57:02 +0000 Received: from sea.source.kernel.org ([172.234.252.31]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vhmwM-00000001pTs-3Do2 for linux-arm-kernel@lists.infradead.org; Mon, 19 Jan 2026 10:56:59 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id C4B6244320; Mon, 19 Jan 2026 10:56:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A363FC19422; Mon, 19 Jan 2026 10:56:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1768820217; bh=hHBy7RNCqQdK/4x/L31X5QTyIIyoP30NeIlkbmSNm5U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oaN7AVGN0DG0+GJap2kqxp00Y4UJjoXvrnDhHVGdrDdSEtXlXwc9Lnom8UiwouSXE NaaP8p+DyJmWeugnivUPMGzmn4TM08OQom8iqfFtGBcze+AlDnKy2CEshMYSjd8ud7 h+RPZKdIWDhvwmCsqqwwRi8oxxJVhEOYqX1UDQQj/Wwh50+MdcW+9V2b9xrHf+0xQ/ meD5ho5ZDavEciEQBEfJWA1My5y3bTPmJ/fq9vQbs4xhWIFkcD8+CFednpVfsKDU7g nt01YJLRubAzB7GA+vNHGZ2ecBEB6bjKyTzHzl8dNYygEilyZ6vdPwreRYRxLYuLqX X3DVaWcUEx4MQ== Received: from sofa.misterjones.org ([185.219.108.64] helo=valley-girl.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1vhmwJ-00000003YVK-2d7J; Mon, 19 Jan 2026 10:56:55 +0000 From: Marc Zyngier To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org Cc: Joey Gouly , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Will Deacon , Quentin Perret , Fuad Tabba Subject: [PATCH 4/6] KVM: arm64: Switch pKVM host S2 over to KVM_PGTABLE_S2_AS_S1 Date: Mon, 19 Jan 2026 10:56:49 +0000 Message-ID: <20260119105651.255693-5-maz@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260119105651.255693-1-maz@kernel.org> References: <20260119105651.255693-1-maz@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, joey.gouly@arm.com, suzuki.poulose@arm.com, oupton@kernel.org, yuzenghui@huawei.com, will@kernel.org, qperret@google.com, tabba@google.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260119_025658_837387_28C23EFC X-CRM114-Status: GOOD ( 12.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Since we have the basics to use the S1 memory attributes as the final ones with FWB, flip the host over to that when FWB is present. Signed-off-by: Marc Zyngier --- arch/arm64/kvm/hyp/nvhe/mem_protect.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c index 49db32f3ddf71..38f66a56a7665 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -19,7 +19,7 @@ #include #include -#define KVM_HOST_S2_FLAGS (KVM_PGTABLE_S2_NOFWB | KVM_PGTABLE_S2_IDMAP) +#define KVM_HOST_S2_FLAGS (KVM_PGTABLE_S2_AS_S1 | KVM_PGTABLE_S2_IDMAP) struct host_mmu host_mmu; @@ -324,6 +324,8 @@ int __pkvm_prot_finalize(void) params->vttbr = kvm_get_vttbr(mmu); params->vtcr = mmu->vtcr; params->hcr_el2 |= HCR_VM; + if (cpus_have_final_cap(ARM64_HAS_STAGE2_FWB)) + params->hcr_el2 |= HCR_FWB; /* * The CMO below not only cleans the updated params to the -- 2.47.3