From patchwork Wed Oct 9 18:59:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 13829125 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 4324CCEE343 for ; Wed, 9 Oct 2024 19:07:03 +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: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:In-Reply-To:References:List-Owner; bh=KXEfsDb43BkeOKBLg9STX78VQg7HrrYjq0jFNLGD0TQ=; b=0eaZzWlqwZc6pNFknwuXa+WoEl rCKyvY4Mn9CtQlGCFuEFWXc437Hasu5oLQpv6ZdFoftsvrOJKgiWY949sBTPNgNT/ENgxPgcJ6dY2 o3jR9YnCOEWwPHwJxQYdE7VwXFHFNGLDsI25mAW73trG4lPOLixrCPsa1a+pEbe0DTTgbyH0mgRfg kBxM8ALD3NFgzbaSVmDUwE37/IVXnVxOkCJwJEry2QReRB3w166FgCu9ZZYVrz6jv8e8h5h/wWWJG TtWu4kOYOFLAhWdaptoOj6MnjLr9+q0/BWQ9dzXThtoOMGQ8pqPKhEnuJqQleU5w3FbQ07UwfkJ3Z ey5wy9Ig==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1syc1M-0000000ASx5-1vCR; Wed, 09 Oct 2024 19:06:52 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1sybvQ-0000000ARFd-1CSa for linux-arm-kernel@lists.infradead.org; Wed, 09 Oct 2024 19:00:49 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 115965C5BF5; Wed, 9 Oct 2024 19:00:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E0A51C4CEC3; Wed, 9 Oct 2024 19:00:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728500443; bh=M4QYVLtutG3Mmpkmx1IWwfT8GCi4U5JB3CwqdkHxglo=; h=From:To:Cc:Subject:Date:From; b=LyvG5v/XbDqDHTg+oO/3V7QNdjdLUOupqOtvjTaPidCE6+TKSgPSwq2OZamEe9GXI jDmPFhFO4OGG7JLp4ZNF9mlPoPY96UtJ1KZLxqd+6tNnYL4uX4IUNlvtphSc9rpxnN yZbmylvc+G8GLHJV23Llu6kWfPG/6+ymuHMiYYNU4yCfK1vBnNfxk7KBqGaeySIq94 njNC7YDzYTOYT8i0rE1jdoMs9FEdkvNQCMRDgNJycPKg2ItcQZSeoiABMAAPYZHQ74 vcMKpaS1oqBzBHxXY01K4emYuw0MqtFGHGg+YzPNNUYGndfp4c0X15beuNaRlSj40a k2Di2YiDEP2uA== 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.95) (envelope-from ) id 1sybvM-001wcY-I9; Wed, 09 Oct 2024 20:00:40 +0100 From: Marc Zyngier To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org Cc: Joey Gouly , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Alexandru Elisei , Mark Brown Subject: [PATCH v4 00/36] KVM: arm64: Add EL2 support to FEAT_S1PIE/S1POE Date: Wed, 9 Oct 2024 19:59:43 +0100 Message-Id: <20241009190019.3222687-1-maz@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, joey.gouly@arm.com, suzuki.poulose@arm.com, oliver.upton@linux.dev, yuzenghui@huawei.com, alexandru.elisei@arm.com, broonie@kernel.org 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-20241009_120044_461563_B6B2A901 X-CRM114-Status: GOOD ( 15.73 ) 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 This series serves a few purposes: - Complete the S1PIE/S1POE support to include EL2 - Sneak in the EL2 system register world switch As mentioned in few of the patches, this implementation relies on a very recent fix to the architecture (D22677 in [0]). Patches on top of v6.12-rc1. * From v3 [3]: - Added a few extra patches to deal with S1POE at EL2, including AT - Fix CPTR_EL2.E0POE non-sensical trap entry - Make sure that TVM and TRVM are handling the EL1 PIE/POE traps - Simplify some of the visibility cruft - Rebased on v6.12-rc1 * From v2 [2]: - Correctly reprogram the context for AT in the fast path when S1PIE is in use - Generalised sysreg RES0/RES1 masking, and added TCR2_EL2 RES0/RES1 bit handling - Fix TCR2_EL1, PIR_EL1, PIRE0_EL1 access with VHE - Add a bunch of missing registers to get_el2_to_el1_mapping() - Correctly map {TCR2,PIR,PIRE0}_EL2 to their EL1 equivalent on NV - Disable hierarchical permissions when S1PIE is enabled - Make EL2 world switch directly act on the vcpu rather than an arbitrary context - Remove SKL{0,1} from the TCR2_EL2 description * From the initial posting [1]: - Rebased on top of the AT support branch, which is currently sitting in kvmarm/next - Add handling for S1 indirect permission in AT, which I'm sure will give Alexandru another king-sized headache - Picked Mark Brown's series dealing with TCRX and S1PIE visibility, and slapped an extra fix on top for good measure - Picked up RBs from Joey, with thanks. [0] https://developer.arm.com/documentation/102105/ka-04/ [1] https://lore.kernel.org/r/20240813144738.2048302-1-maz@kernel.org [2] https://lore.kernel.org/r/20240903153834.1909472-1-maz@kernel.org [3] https://lore.kernel.org/r/20240911135151.401193-1-maz@kernel.org Marc Zyngier (33): arm64: Drop SKL0/SKL1 from TCR2_EL2 arm64: Remove VNCR definition for PIRE0_EL2 arm64: Add encoding for PIRE0_EL2 KVM: arm64: Drop useless struct s2_mmu in __kvm_at_s1e2() KVM: arm64: nv: Add missing EL2->EL1 mappings in get_el2_to_el1_mapping() KVM: arm64: nv: Handle CNTHCTL_EL2 specially KVM: arm64: nv: Save/Restore vEL2 sysregs KVM: arm64: Correctly access TCR2_EL1, PIR_EL1, PIRE0_EL1 with VHE KVM: arm64: Extend masking facility to arbitrary registers arm64: Define ID_AA64MMFR1_EL1.HAFDBS advertising FEAT_HAFT KVM: arm64: Add TCR2_EL2 to the sysreg arrays KVM: arm64: Sanitise TCR2_EL2 KVM: arm64: Add save/restore for TCR2_EL2 KVM: arm64: Add PIR{,E0}_EL2 to the sysreg arrays KVM: arm64: Add save/restore for PIR{,E0}_EL2 KVM: arm64: Handle PIR{,E0}_EL2 traps KVM: arm64: Sanitise ID_AA64MMFR3_EL1 KVM: arm64: Add AT fast-path support for S1PIE KVM: arm64: Split S1 permission evaluation into direct and hierarchical parts KVM: arm64: Disable hierarchical permissions when S1PIE is enabled KVM: arm64: Implement AT S1PIE support KVM: arm64: Rely on visibility to let PIR*_ELx/TCR2_ELx UNDEF arm64: Add encoding for POR_EL2 KVM: arm64: Add a composite EL2 visibility helper KVM: arm64: Drop bogus CPTR_EL2.E0POE trap routing KVM: arm64: Subject S1PIE/S1POE registers to HCR_EL2.{TVM,TRVM} KVM: arm64: Add basic support for POR_EL2 KVM: arm64: Add save/retore support for POR_EL2 KVM: arm64: Add POE save/restore for AT emulation fast-path KVM: arm64: Disable hierarchical permissions when POE is enabled KVM: arm64: Make PAN conditions part of the S1 walk context KVM: arm64: Handle stage-1 permission overlays KVM: arm64: Handle WXN attribute Mark Brown (3): KVM: arm64: Define helper for EL2 registers with custom visibility KVM: arm64: Hide TCR2_EL1 from userspace when disabled for guests KVM: arm64: Hide S1PIE registers from userspace when disabled for guests arch/arm64/include/asm/kvm_host.h | 37 +- arch/arm64/include/asm/vncr_mapping.h | 1 - arch/arm64/kvm/at.c | 470 ++++++++++++++++++--- arch/arm64/kvm/emulate-nested.c | 12 +- arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 5 +- arch/arm64/kvm/hyp/nvhe/sysreg-sr.c | 2 +- arch/arm64/kvm/hyp/vhe/sysreg-sr.c | 161 ++++++- arch/arm64/kvm/nested.c | 34 +- arch/arm64/kvm/sys_regs.c | 141 ++++++- arch/arm64/tools/sysreg | 12 +- include/kvm/arm_arch_timer.h | 3 + 11 files changed, 766 insertions(+), 112 deletions(-)