From patchwork Tue Jan 30 20:45:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 13538044 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 76018C48286 for ; Tue, 30 Jan 2024 20:46:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=SLMbhecernvfW8UjR1KUMbKGPrgtFX7IkLAP2On2SlE=; b=3IZ23yfH4V6qdI 0dsu0jh90GHe1RH8HtOQHTMkleSij52B8Bd676gETV773dgcb0ZRwigzGbWfnjjUJYMIwXNbfNvqW QncmbiEWwRUzgHnEamTvn/6q0sTxGp/Q1VdpLx0dBrRFrLyd6JK+ddKExzyy54qhlqU1ubiRqUn4I Y3xaYbyuIITkzsyqWG+0E9VxJjtyI7PCkU07/S62kPSJucnCV5x135r+bH9jUYEGCWctTwj0RwQP/ JdUUF+IzBpezhe2ZB3vHbfXk/hjxuUxsF6J8I2v//4GdQp1kOCFkNriiWt7fAQ3SANZ0Qi2rLUNHN yUkWECBX6lcGV2x4FkrA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rUuza-00000000WDq-3p8o; Tue, 30 Jan 2024 20:46:02 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rUuzM-00000000W43-1LFv for linux-arm-kernel@lists.infradead.org; Tue, 30 Jan 2024 20:45:49 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 74C6161062; Tue, 30 Jan 2024 20:45:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 167E4C433F1; Tue, 30 Jan 2024 20:45:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706647547; bh=TslrQQTy8inB70RnuWi+lLXP9OJHgh1SOHNDymI5k9M=; h=From:To:Cc:Subject:Date:From; b=hxNpx91N0mKhEW4xu+aysPZaKrI3ELudvvNiEH17u0Bt630y7bl0LWVW7PlOneQ84 SdM2i7pSEcc0et9HYejsi/AJPzfRwE2gVT9ojkq9bm00yszNlNIESsVsQlI6bKyU1C 3OinhCV4Oyo7ZwkQm7KSul0h2aSUFqzYpu+CwhDsW/cOs5nv8kzw65sA/YiHlitymD m7sSXMdL1PtT6LNUWjNV1pWGNTFW2rKAQ5IU6NgGbiM2YAi13KpkALQi3On4dFcxrC DIjjLUpfmOdoWbDRwNEjFyLEsxTRyrq/ayxyxLE78bg1Bo1aK4cV+doBJjWjnX8CR+ GPPb4JTjcW9NQ== 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 1rUuzI-00GNsE-Nw; Tue, 30 Jan 2024 20:45:44 +0000 From: Marc Zyngier To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org Cc: James Morse , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Catalin Marinas , Will Deacon , Joey Gouly , Mark Brown Subject: [PATCH v2 00/25] KVM/arm64: VM configuration enforcement Date: Tue, 30 Jan 2024 20:45:07 +0000 Message-Id: <20240130204533.693853-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, james.morse@arm.com, suzuki.poulose@arm.com, oliver.upton@linux.dev, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org, joey.gouly@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-20240130_124548_463624_01907896 X-CRM114-Status: GOOD ( 11.43 ) 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 is the second version of this configurationm enforcement series after some really awesome reviewing with from Joey. I think I have taken most of the feedback into account, but please shout if I have ignored something. * From v1: [1] - Fix embarrassing crash with FEAT_MOPS - Better error handling in the FGT code - Added/Fixed comments - Simplified the __vcpu_sys_reg() macro - Fixed FEAT_PIR handling - Folded in Oliver's PMU rework [1] https://lore.kernel.org/all/20240122201852.262057-1-maz@kernel.org Marc Zyngier (25): arm64: sysreg: Add missing ID_AA64ISAR[13]_EL1 fields and variants KVM: arm64: Add feature checking helpers KVM: arm64: nv: Add sanitising to VNCR-backed sysregs KVM: arm64: nv: Add sanitising to EL2 configuration registers KVM: arm64: nv: Add sanitising to VNCR-backed FGT sysregs KVM: arm64: nv: Add sanitising to VNCR-backed HCRX_EL2 KVM: arm64: nv: Drop sanitised_sys_reg() helper KVM: arm64: Unify HDFG[WR]TR_GROUP FGT identifiers KVM: arm64: nv: Correctly handle negative polarity FGTs KVM: arm64: nv: Turn encoding ranges into discrete XArray stores KVM: arm64: Drop the requirement for XARRAY_MULTI KVM: arm64: nv: Move system instructions to their own sys_reg_desc array KVM: arm64: Always populate the trap configuration xarray KVM: arm64: Register AArch64 system register entries with the sysreg xarray KVM: arm64: Use the xarray as the primary sysreg/sysinsn walker KVM: arm64: Rename __check_nv_sr_forward() to triage_sysreg_trap() KVM: arm64: Add Fine-Grained UNDEF tracking information KVM: arm64: Propagate and handle Fine-Grained UNDEF bits KVM: arm64: Move existing feature disabling over to FGU infrastructure KVM: arm64: Streamline save/restore of HFG[RW]TR_EL2 KVM: arm64: Make TLBI OS/Range UNDEF if not advertised to the guest KVM: arm64: Make PIR{,E0}_EL1 UNDEF if S1PIE is not advertised to the guest KVM: arm64: Make AMU sysreg UNDEF if FEAT_AMU is not advertised to the guest KVM: arm64: Make FEAT_MOPS UNDEF if not advertised to the guest KVM: arm64: Add debugfs file for guest's ID registers arch/arm64/include/asm/kvm_arm.h | 4 +- arch/arm64/include/asm/kvm_host.h | 107 ++++++++- arch/arm64/include/asm/kvm_nested.h | 1 - arch/arm64/kvm/Kconfig | 1 - arch/arm64/kvm/arm.c | 7 + arch/arm64/kvm/emulate-nested.c | 231 +++++++++++++----- arch/arm64/kvm/hyp/include/hyp/switch.h | 130 +++++----- arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 24 +- arch/arm64/kvm/nested.c | 265 ++++++++++++++++++++- arch/arm64/kvm/pmu-emul.c | 11 +- arch/arm64/kvm/sys_regs.c | 235 +++++++++++++++--- arch/arm64/kvm/sys_regs.h | 2 + arch/arm64/tools/sysreg | 8 +- include/kvm/arm_pmu.h | 11 - 14 files changed, 856 insertions(+), 181 deletions(-)