From patchwork Thu May 30 15:13:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Martin X-Patchwork-Id: 10969007 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B13DA15E6 for ; Thu, 30 May 2019 15:16:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A15E128BD5 for ; Thu, 30 May 2019 15:16:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 95AC428BD7; Thu, 30 May 2019 15:16:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F3DA828BDE for ; Thu, 30 May 2019 15:16:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=s6nvjs4Xn4Z3+SgqaIS+D7vRX5vdivjFNx3/BbKbtTc=; b=Lzn+3NFQ4N+Gg+svusXGUzImHM 8iyrwriOfA9UmK/uT9TJYzuivcfwA6DiazzRmmKHfdwcu+WwA9HqVPEZEzWzzFWY0slOd2LVhAJPm ks+J8yBJ7t2o4YvZF9XznG+b55zygrfxOtT0Z4q58Fk1ELxNgSlHhBHeaz8KTtrhXaz1sy6f4N3ZL Be9nVZaqsJDeDkbugGOA69Y7tj1wFIzDuNrS8E/QjnF2AcnfCCO83KdfncMOQhQd+zK3IkH1sw3Xd C84n6TEEPBEZBAtni2niMiEVdh4zNad46Wk4evJGkiV1iP0rOJU3sZiI2406IxQxiPW7D6mvgk1t9 iCTG+OJQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hWMmq-0004u5-6A; Thu, 30 May 2019 15:16:12 +0000 Received: from foss.arm.com ([217.140.101.70]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hWMl0-0002K0-PS for linux-arm-kernel@lists.infradead.org; Thu, 30 May 2019 15:14:20 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8CAB5165C; Thu, 30 May 2019 08:14:18 -0700 (PDT) Received: from e103592.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E2E493F59C; Thu, 30 May 2019 08:14:16 -0700 (PDT) From: Dave Martin To: kvmarm@lists.cs.columbia.edu Subject: [PATCH kvmtool v3 8/9] arm64: Add SVE support Date: Thu, 30 May 2019 16:13:13 +0100 Message-Id: <1559229194-3036-9-git-send-email-Dave.Martin@arm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1559229194-3036-1-git-send-email-Dave.Martin@arm.com> References: <1559229194-3036-1-git-send-email-Dave.Martin@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190530_081419_022380_BDBE180C X-CRM114-Status: GOOD ( 16.60 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Christoffer Dall , Marc Zyngier , Andre Przywara , Will Deacon , Kristina Martsenko , Zhang Lei , Amit Daniel Kachhap , =?utf-8?q?Alex_Benn=C3=A9e?= , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds --enable-sve/--disable-sve command line options to allow the user to control whether the Scalable Vector Extension is made available to the guest. This requires use of the new KVM_ARM_VCPU_FINALIZE ioctl before the vcpu is runnable, so a new hook kvm_cpu__configure_features() is added to provide an appropriate place to do this work. By default, SVE is enabled for the guest if the host supports it. Signed-off-by: Dave Martin --- arm/aarch32/include/kvm/kvm-cpu-arch.h | 4 +++ arm/aarch64/include/kvm/kvm-config-arch.h | 6 ++++- arm/aarch64/include/kvm/kvm-cpu-arch.h | 1 + arm/aarch64/kvm-cpu.c | 41 +++++++++++++++++++++++++++++++ arm/include/arm-common/kvm-config-arch.h | 2 ++ arm/kvm-cpu.c | 3 +++ 6 files changed, 56 insertions(+), 1 deletion(-) diff --git a/arm/aarch32/include/kvm/kvm-cpu-arch.h b/arm/aarch32/include/kvm/kvm-cpu-arch.h index 01983f0..780e0e2 100644 --- a/arm/aarch32/include/kvm/kvm-cpu-arch.h +++ b/arm/aarch32/include/kvm/kvm-cpu-arch.h @@ -15,5 +15,9 @@ static inline void kvm_cpu__select_features(struct kvm *kvm, struct kvm_vcpu_init *init) { } +static inline int kvm_cpu__configure_features(struct kvm_cpu *vcpu) +{ + return 0; +} #endif /* KVM__KVM_CPU_ARCH_H */ diff --git a/arm/aarch64/include/kvm/kvm-config-arch.h b/arm/aarch64/include/kvm/kvm-config-arch.h index fe1699d..41e9d05 100644 --- a/arm/aarch64/include/kvm/kvm-config-arch.h +++ b/arm/aarch64/include/kvm/kvm-config-arch.h @@ -12,7 +12,11 @@ OPT_BOOLEAN('\0', "enable-ptrauth", &(cfg)->enable_ptrauth, \ "Enable pointer authentication for the guest"), \ OPT_BOOLEAN('\0', "disable-ptrauth", &(cfg)->disable_ptrauth, \ - "Disable pointer authentication for the guest"), + "Disable pointer authentication for the guest"), \ + OPT_BOOLEAN('\0', "enable-sve", &(cfg)->enable_sve, \ + "Enable SVE for the guest"), \ + OPT_BOOLEAN('\0', "disable-sve", &(cfg)->disable_sve, \ + "Disable SVE for the guest"), #include "arm-common/kvm-config-arch.h" diff --git a/arm/aarch64/include/kvm/kvm-cpu-arch.h b/arm/aarch64/include/kvm/kvm-cpu-arch.h index e6875fc..8dfb82e 100644 --- a/arm/aarch64/include/kvm/kvm-cpu-arch.h +++ b/arm/aarch64/include/kvm/kvm-cpu-arch.h @@ -18,5 +18,6 @@ #define ARM_CPU_CTRL_SCTLR_EL1 0 void kvm_cpu__select_features(struct kvm *kvm, struct kvm_vcpu_init *init); +int kvm_cpu__configure_features(struct kvm_cpu *vcpu); #endif /* KVM__KVM_CPU_ARCH_H */ diff --git a/arm/aarch64/kvm-cpu.c b/arm/aarch64/kvm-cpu.c index 08e4fd5..cdfb22e 100644 --- a/arm/aarch64/kvm-cpu.c +++ b/arm/aarch64/kvm-cpu.c @@ -152,9 +152,50 @@ static void select_ptrauth_feature(struct kvm *kvm, struct kvm_vcpu_init *init) } } +static void select_sve_feature(struct kvm *kvm, struct kvm_vcpu_init *init) +{ + bool supported; + + if (kvm->cfg.arch.enable_sve && kvm->cfg.arch.disable_sve) + die("--enable-sve conflicts with --disable-sve"); + + supported = kvm__supports_extension(kvm, KVM_CAP_ARM_SVE); + + if (kvm->cfg.arch.enable_sve && !supported) + die("--enable-sve not supported on this host"); + + /* Default SVE to on if available and not explicitly disabled */ + if (supported && !kvm->cfg.arch.disable_sve) { + kvm->cfg.arch.enable_sve = true; + init->features[0] |= 1UL << KVM_ARM_VCPU_SVE; + } +} + void kvm_cpu__select_features(struct kvm *kvm, struct kvm_vcpu_init *init) { select_ptrauth_feature(kvm, init); + select_sve_feature(kvm, init); +} + +static int configure_sve(struct kvm_cpu *vcpu) +{ + int feature = KVM_ARM_VCPU_SVE; + + if (ioctl(vcpu->vcpu_fd, KVM_ARM_VCPU_FINALIZE, &feature)) { + pr_err("KVM_ARM_VCPU_FINALIZE: %s", strerror(errno)); + return -1; + } + + return 0; +} + +int kvm_cpu__configure_features(struct kvm_cpu *vcpu) +{ + if (vcpu->kvm->cfg.arch.enable_sve) + if (configure_sve(vcpu)) + return -1; + + return 0; } void kvm_cpu__reset_vcpu(struct kvm_cpu *vcpu) diff --git a/arm/include/arm-common/kvm-config-arch.h b/arm/include/arm-common/kvm-config-arch.h index 1b4287d..40e3d1f 100644 --- a/arm/include/arm-common/kvm-config-arch.h +++ b/arm/include/arm-common/kvm-config-arch.h @@ -10,6 +10,8 @@ struct kvm_config_arch { bool aarch32_guest; bool has_pmuv3; u64 kaslr_seed; + bool enable_sve; + bool disable_sve; bool enable_ptrauth; bool disable_ptrauth; enum irqchip_type irqchip; diff --git a/arm/kvm-cpu.c b/arm/kvm-cpu.c index 1652f6f..554414f 100644 --- a/arm/kvm-cpu.c +++ b/arm/kvm-cpu.c @@ -124,6 +124,9 @@ struct kvm_cpu *kvm_cpu__arch_init(struct kvm *kvm, unsigned long cpu_id) vcpu->cpu_compatible = target->compatible; vcpu->is_running = true; + if (kvm_cpu__configure_features(vcpu)) + die("Unable to configure requested vcpu features"); + return vcpu; }