From patchwork Thu Apr 17 00:25:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 882096 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 889C2322B; Thu, 17 Apr 2025 00:25:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744849545; cv=none; b=s/sDJ3QapMke18CsKPzJE2iVVwSWZ9ACE/yO6/BV18DzxlcXjfXYC58QLPooPqJbPlX16JX/G4Pr0yybqh9g5G7paR+iCEGJucgNlCpNcl3NG3Hau40l8yHqlhUNe0VKja1c6++uC2LnPL2RL3CiZmvm/go2w6F/Efg2PCKL48w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744849545; c=relaxed/simple; bh=GTwCDPN7IMzKSWiv9XW2UhCTpXRsMiXEa0YUZMB+/1M=; h=From:Subject:Date:Message-Id:MIME-Version:Content-Type:To:Cc; b=FNpkTil5qo34ePJKgdfCS/AE5ZvfKJyRBaePMPMlW3eUjdk4U3D2LZo7FfnFyxrUUvLBjw+CJu3S3os73+B67HJ6ZfAeMHoxEZyw67FuDGiKUQ/IGQBEMLABfkykamjvrLotfquWGjF/Jj4Gw9uIHpARGZ0ftHfaG4vChAdJQsY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Dp/KDjvT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Dp/KDjvT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E7E7DC4CEE2; Thu, 17 Apr 2025 00:25:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744849545; bh=GTwCDPN7IMzKSWiv9XW2UhCTpXRsMiXEa0YUZMB+/1M=; h=From:Subject:Date:To:Cc:From; b=Dp/KDjvTalL+Tg5ho5EHsbRBEyoxFi4ujluWKTHaYAKNAqAV1js8kXTOw1Dttqm/3 gvVRssX1XkUNqwSk0TuLCYl6o6PRH+gwg4amTum7uREl9JmY9rNzRfQfaMrB9s9Bwt 6bZ/JsSEtaq2bsTqJzoynJhUIzeDZLskl5CtT/6JIt5TM/DrMspwQsLuIUrwtLI37B QyVZS4qNBrk/pj6MyhyzMAT83juwZXas1xattKK8tlTIreLoMAhQZErXzLusLGiH7l okFWawRCATc4hu1tk7rVZRsYtFNjw4KWqgspfsi9wUcKXyrXHwxoo5EWt3o8D0plQD Vbn1vB50ONe8w== From: Mark Brown Subject: [PATCH v5 00/28] KVM: arm64: Implement support for SME Date: Thu, 17 Apr 2025 01:25:04 +0100 Message-Id: <20250417-kvm-arm64-sme-v5-0-f469a2d5f574@kernel.org> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAGJKAGgC/2XRTW7CMBAF4KtEXtfRzNgxgRX3qLrwX8ACJ2CHq BXi7nUSUamwnJG+edbznWWfgs9sV91Z8lPIYejL0HxUzB51f/A8uDIzAhIgAPlpilynqCTP0XN QGkkqJ5RQrBijs+cm6d4eZzXGy7y9JN+F7yXl86vMx5DHIf0soRPO2/X+lujl/oQceNdh6zbS0 Na7/cmn3p/rIR3YfGqiP470zqlwp4mUNdiCMW9cPLksHF65KBwaA9ha7Dr/zuWTN0AoX7mc05X UqkXtrKV//LEWk/z1Vlof13bWAu0QYxh31aRqbHiyOJcYfc56+Y9dtQRK2KKSgFAL2QJtkCOPO p3qdBvPunf78pK6nCpRj1+nBpCV6AEAAA== X-Change-ID: 20230301-kvm-arm64-sme-06a1246d3636 To: Marc Zyngier , Oliver Upton , Joey Gouly , Catalin Marinas , Suzuki K Poulose , Will Deacon , Paolo Bonzini , Jonathan Corbet , Shuah Khan Cc: Dave Martin , Fuad Tabba , Mark Rutland , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, Mark Brown X-Mailer: b4 0.15-dev-c25d1 X-Developer-Signature: v=1; a=openpgp-sha256; l=10594; i=broonie@kernel.org; h=from:subject:message-id; bh=GTwCDPN7IMzKSWiv9XW2UhCTpXRsMiXEa0YUZMB+/1M=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBoAEpvh+YoQ7SipdxXsad+QAIWwlve8/0vYCL1fY6c ieQx5Z2JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCaABKbwAKCRAk1otyXVSH0DvBCA CEpCRJenMneAtWSrxarWRqSC+/QXNzPBS9Yaktz8uecqp6kYLtPrs4ScCF04nc8zLuHD7CBBl2GQXR pnO2fp/poLbgaIhjZ8+vZFAokcx+prpd4nMTL5VINE9l06QCMy7+dgkbx6h8ZMU4mHcn3eXzATVxQt ecdLFWp3lzfp+xZt7yDFYg5C2rOZ5RjEfWNy0SPWWkhZkVp0OrSl/JCx+N+V4aI/VJL4lNo/N68gIX LPzdldgh7J+7RYWzZXak5H8SDQahSKJ1OhAFJwO14+PRFKavk4OSF3TRyQMvwUuPgo2pvCyFlSeoRi 4SOzAU2zp4Ieegrydp5vagjROD4V5l X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB I've removed the RFC tag from this version of the series, but the items that I'm looking for feedback on remains the same: - The userspace ABI, in particular: - The vector length used for the SVE registers, access to the SVE registers and access to ZA and (if available) ZT0 depending on the current state of PSTATE.{SM,ZA}. - The use of a single finalisation for both SVE and SME. - The addition of control for enabling fine grained traps in a similar manner to FGU but without the UNDEF, I'm not clear if this is desired at all and at present this requires symmetric read and write traps like FGU. That seemed like it might be desired from an implementation point of view but we already have one case where we enable an asymmetric trap (for ARM64_WORKAROUND_AMPERE_AC03_CPU_38) and it seems generally useful to enable asymmetrically. This series implements support for SME use in non-protected KVM guests. Much of this is very similar to SVE, the main additional challenge that SME presents is that it introduces a new vector length similar to the SVE vector length and two new controls which change the registers seen by guests: - PSTATE.ZA enables the ZA matrix register and, if SME2 is supported, the ZT0 LUT register. - PSTATE.SM enables streaming mode, a new floating point mode which uses the SVE register set with the separately configured SME vector length. In streaming mode implementation of the FFR register is optional. It is also permitted to build systems which support SME without SVE, in this case when not in streaming mode no SVE registers or instructions are available. Further, there is no requirement that there be any overlap in the set of vector lengths supported by SVE and SME in a system, this is expected to be a common situation in practical systems. Since there is a new vector length to configure we introduce a new feature parallel to the existing SVE one with a new pseudo register for the streaming mode vector length. Due to the overlap with SVE caused by streaming mode rather than finalising SME as a separate feature we use the existing SVE finalisation to also finalise SME, a new define KVM_ARM_VCPU_VEC is provided to help make user code clearer. Finalising SVE and SME separately would introduce complication with register access since finalising SVE makes the SVE registers writeable by userspace and doing multiple finalisations results in an error being reported. Dealing with a state where the SVE registers are writeable due to one of SVE or SME being finalised but may have their VL changed by the other being finalised seems like needless complexity with minimal practical utility, it seems clearer to just express directly that only one finalisation can be done in the ABI. Access to the floating point registers follows the architecture: - When both SVE and SME are present: - If PSTATE.SM == 0 the vector length used for the Z and P registers is the SVE vector length. - If PSTATE.SM == 1 the vector length used for the Z and P registers is the SME vector length. - If only SME is present: - If PSTATE.SM == 0 the Z and P registers are inaccessible and the floating point state accessed via the encodings for the V registers. - If PSTATE.SM == 1 the vector length used for the Z and P registers - The SME specific ZA and ZT0 registers are only accessible if SVCR.ZA is 1. The VMM must understand this, in particular when loading state SVCR should be configured before other state. It should be noted that while the architecture refers to PSTATE.SM and PSTATE.ZA these PSTATE bits are not preserved in SPSR_ELx, they are only accessible via SVCR. There are a large number of subfeatures for SME, most of which only offer additional instructions but some of which (SME2 and FA64) add architectural state. These are configured via the ID registers as per usual. Protected KVM supported, with the implementation maintaining the existing restriction that the hypervisor will refuse to run if streaming mode or ZA is enabled. This both simplfies the code and avoids the need to allocate storage for host ZA and ZT0 state, there seems to be little practical use case for supporting this and the memory usage would be non-trivial. The new KVM_ARM_VCPU_VEC feature and ZA and ZT0 registers have not been added to the get-reg-list selftest, the idea of supporting additional features there without restructuring the program to generate all possible feature combinations has been rejected. I will post a separate series which does that restructuring. This series is based on Mark Rutland's SME fixes: https://lore.kernel.org/r/20250409164010.3480271-1-mark.rutland@arm.com with a build dependency due to the first patch "arm64/fpsimd: Avoid RES0 bits in the SME trap handler" which changes the defines for ESR decode, but also due to the assistance in testing. Signed-off-by: Mark Brown --- Changes in v5: - Rebase onto v6.15-rc2. - Add pKVM guest support. - Always restore SVCR. - Link to v4: https://lore.kernel.org/r/20250214-kvm-arm64-sme-v4-0-d64a681adcc2@kernel.org Changes in v4: - Rebase onto v6.14-rc2 and Mark Rutland's fixes. - Expose SME to nested guests. - Additional cleanups and test fixes following on from the rebase. - Flush register state on VMM PSTATE.{SM,ZA}. - Link to v3: https://lore.kernel.org/r/20241220-kvm-arm64-sme-v3-0-05b018c1ffeb@kernel.org Changes in v3: - Rebase onto v6.12-rc2. - Link to v2: https://lore.kernel.org/r/20231222-kvm-arm64-sme-v2-0-da226cb180bb@kernel.org Changes in v2: - Rebase onto v6.7-rc3. - Configure subfeatures based on host system only. - Complete nVHE support. - There was some snafu with sending v1 out, it didn't make it to the lists but in case it hit people's inboxes I'm sending as v2. --- Mark Brown (28): arm64/fpsimd: Update FA64 and ZT0 enables when loading SME state arm64/fpsimd: Decide to save ZT0 and streaming mode FFR at bind time arm64/fpsimd: Check enable bit for FA64 when saving EFI state arm64/fpsimd: Determine maximum virtualisable SME vector length KVM: arm64: Introduce non-UNDEF FGT control KVM: arm64: Pay attention to FFR parameter in SVE save and load KVM: arm64: Pull ctxt_has_ helpers to start of sysreg-sr.h KVM: arm64: Move SVE state access macros after feature test macros KVM: arm64: Rename SVE finalization constants to be more general KVM: arm64: Document the KVM ABI for SME KVM: arm64: Define internal features for SME KVM: arm64: Rename sve_state_reg_region KVM: arm64: Store vector lengths in an array KVM: arm64: Implement SME vector length configuration KVM: arm64: Support SME control registers KVM: arm64: Support TPIDR2_EL0 KVM: arm64: Support SME identification registers for guests KVM: arm64: Support SME priority registers KVM: arm64: Provide assembly for SME register access KVM: arm64: Support userspace access to streaming mode Z and P registers KVM: arm64: Flush register state on writes to SVCR.SM and SVCR.ZA KVM: arm64: Expose SME specific state to userspace KVM: arm64: Context switch SME state for guests KVM: arm64: Handle SME exceptions KVM: arm64: Expose SME to nested guests KVM: arm64: Provide interface for configuring and enabling SME for guests KVM: arm64: selftests: Add SME system registers to get-reg-list KVM: arm64: selftests: Add SME to set_id_regs test Documentation/virt/kvm/api.rst | 117 +++++++---- arch/arm64/include/asm/fpsimd.h | 26 +++ arch/arm64/include/asm/kvm_emulate.h | 12 +- arch/arm64/include/asm/kvm_host.h | 151 +++++++++++--- arch/arm64/include/asm/kvm_hyp.h | 5 +- arch/arm64/include/asm/kvm_pkvm.h | 2 +- arch/arm64/include/asm/vncr_mapping.h | 2 + arch/arm64/include/uapi/asm/kvm.h | 33 +++ arch/arm64/kernel/cpufeature.c | 2 - arch/arm64/kernel/fpsimd.c | 89 ++++---- arch/arm64/kvm/arm.c | 10 + arch/arm64/kvm/fpsimd.c | 19 +- arch/arm64/kvm/guest.c | 252 ++++++++++++++++++++--- arch/arm64/kvm/handle_exit.c | 14 ++ arch/arm64/kvm/hyp/fpsimd.S | 28 ++- arch/arm64/kvm/hyp/include/hyp/switch.h | 155 ++++++++++++-- arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 97 +++++---- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 81 ++++++-- arch/arm64/kvm/hyp/nvhe/pkvm.c | 20 +- arch/arm64/kvm/hyp/nvhe/switch.c | 40 +++- arch/arm64/kvm/hyp/nvhe/sys_regs.c | 6 + arch/arm64/kvm/hyp/vhe/switch.c | 29 ++- arch/arm64/kvm/nested.c | 3 +- arch/arm64/kvm/reset.c | 156 ++++++++++---- arch/arm64/kvm/sys_regs.c | 147 +++++++++++-- include/uapi/linux/kvm.h | 1 + tools/testing/selftests/kvm/arm64/get-reg-list.c | 32 ++- tools/testing/selftests/kvm/arm64/set_id_regs.c | 30 ++- 28 files changed, 1260 insertions(+), 299 deletions(-) --- base-commit: 64e9fdfc89a76fed38d8ddeed72d42ec71957ed9 change-id: 20230301-kvm-arm64-sme-06a1246d3636 prerequisite-message-id: 20250409164010.3480271-1-mark.rutland@arm.com prerequisite-patch-id: dfad1ae4ce049d1d736ca20aca50e0fb685cbae6 prerequisite-patch-id: 21eadb700c14ee511b5bd1565ce30ce8c76f78ef prerequisite-patch-id: 6daeeb52bc56321d51b6a53fc865e3a7ee1a1bfa prerequisite-patch-id: d05d056d40b9058b75bf0ea16498992c678d20b8 prerequisite-patch-id: f15e7a2251d9d7ea1a55d25c414848001a012d0d prerequisite-patch-id: 76df87bbb5c827562ba81c0520819f311d68f033 prerequisite-patch-id: b9709a87d0be6b933481bfee8c07846d1425add3 prerequisite-patch-id: ce17c8279c2aaf3e3bb5ffc951907c76c43c07e8 prerequisite-patch-id: cdc6c6ab4fd899ba174cffc5b05ea5f0b76f80b5 prerequisite-patch-id: 4918ab2934b5e08faabb1ef1d540c76dc9aaa404 prerequisite-patch-id: f0455ba1dcd0dd0bb57413e68349a6547a0c8e47 prerequisite-patch-id: 14afd1fc6c49b33c5de1768ecc81138a97bd7198 prerequisite-patch-id: fbfa8e67d5ebaa2774daf8126bd8dfc7fce0fecc Best regards,