From patchwork Tue Mar 16 10:13:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 12141685 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CFB31C433E6 for ; Tue, 16 Mar 2021 10:14:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9D1C664FAC for ; Tue, 16 Mar 2021 10:14:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236560AbhCPKNu (ORCPT ); Tue, 16 Mar 2021 06:13:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:56456 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236564AbhCPKNc (ORCPT ); Tue, 16 Mar 2021 06:13:32 -0400 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C740D64F91; Tue, 16 Mar 2021 10:13:31 +0000 (UTC) Received: from 78.163-31-62.static.virginmediabusiness.co.uk ([62.31.163.78] helo=why.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1lM6hd-001uep-Iw; Tue, 16 Mar 2021 10:13:29 +0000 From: Marc Zyngier To: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org Cc: dave.martin@arm.com, daniel.kiss@arm.com, Will Deacon , Catalin Marinas , James Morse , Julien Thierry , Suzuki K Poulose , broonie@kernel.org, kernel-team@android.com Subject: [PATCH 00/10] KVM: arm64: Enable SVE support on nVHE systems Date: Tue, 16 Mar 2021 10:13:02 +0000 Message-Id: <20210316101312.102925-1-maz@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 62.31.163.78 X-SA-Exim-Rcpt-To: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, dave.martin@arm.com, daniel.kiss@arm.com, will@kernel.org, catalin.marinas@arm.com, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com, broonie@kernel.org, kernel-team@android.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This series enables SVE support for KVM on nVHE hardware (or more likely, software models), and is an alternative to Daniel's patch[1] which has gone through 3 versions, but still has a number of issues. Instead of waiting for things to happen, I decided to try and see what I could come up with. The SVE save/restore is modelled after the SVE VHE flow, itself closely following the FPSIMD flow: - the guest traps to EL2 on first SVE access, and will not trap anymore until vcpu_put() - ZCR_EL2 stays constant as long as the guest has SVE enabled - on vcpu_put(), ZCR_EL2 is restored to the default value Most of this series only repaints things so that VHE and nVHE look as similar as possible, the ZCR_EL2 management being the most visible exception. This results in a bunch of preparatory patches that aim at making the code slightly more readable. This has been tested on a FVP model with both VHE.nVHE configurations using the string tests included with the "optimized-routines" library[2]. Patches against 5.12-rc2. [1] https://lore.kernel.org/r/20210302164850.3553701-1-daniel.kiss@arm.com [2] https://github.com/ARM-software/optimized-routines Daniel Kiss (1): KVM: arm64: Enable SVE support for nVHE Marc Zyngier (9): KVM: arm64: Provide KVM's own save/restore SVE primitives KVM: arm64: Use {read,write}_sysreg_el1 to access ZCR_EL1 KVM: arm64: Let vcpu_sve_pffr() handle HYP VAs KVM: arm64: Introduce vcpu_sve_vq() helper KVM: arm64: Rework SVE host-save/guest-restore KVM: arm64: Map SVE context at EL2 when available KVM: arm64: Save guest's ZCR_EL1 before saving the FPSIMD state KVM: arm64: Add a nVHE-specific SVE VQ reset hypercall KVM: arm64: Save/restore SVE state for nVHE arch/arm64/Kconfig | 7 --- arch/arm64/include/asm/fpsimdmacros.h | 10 +++- arch/arm64/include/asm/kvm_asm.h | 1 + arch/arm64/include/asm/kvm_host.h | 25 +++----- arch/arm64/include/asm/kvm_hyp.h | 2 + arch/arm64/kvm/arm.c | 5 -- arch/arm64/kvm/fpsimd.c | 31 ++++++++-- arch/arm64/kvm/guest.c | 6 +- arch/arm64/kvm/hyp/fpsimd.S | 10 ++++ arch/arm64/kvm/hyp/include/hyp/switch.h | 78 ++++++++++++------------- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 8 +++ arch/arm64/kvm/hyp/nvhe/switch.c | 4 +- arch/arm64/kvm/reset.c | 4 -- 13 files changed, 107 insertions(+), 84 deletions(-)