From patchwork Thu Dec 7 17:06:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 10100347 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 10BA460325 for ; Thu, 7 Dec 2017 17:18:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E9F7A28468 for ; Thu, 7 Dec 2017 17:18:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DE5EA284DE; Thu, 7 Dec 2017 17:18:19 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 5265128468 for ; Thu, 7 Dec 2017 17:18:19 +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=UHmZLks5Nlk+Lr58EXdsioho6Pa9Jrp6SHlx4/H5OV4=; b=YjAgmbn2loSTWXe+guoZOds6cN MFwtTcZVo3V+hhsNYyUDwuk6q9VWRrsPnsNMrOLSZR85qXH4Wh4WZclpnbStjSGFl+xkbFSGZIgLQ RMO45narjVjfHGM4XswAIFmoGzBJS5UC5U2icG59eOsHuAc8tR20FsZ6a/97kiLQTSyuCHB2RvYm2 K6lxs3D5haCxm0on4yi3B0/K7a20fuZSDEAYsxPGz9m0vI7O5U1og5UHL7UzNrWGVdQ0js0f/HA7q UHDV46Pr6D46wM0kB7q2S4JJ4IKpuM2Bw5NQdPxwcILcYBsHJBR31BQLdmzugppdzQRVq5XM2wDfF tpeRHnHg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eMzoP-00070S-Fq; Thu, 07 Dec 2017 17:18:17 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eMzfT-0004wq-6j for linux-arm-kernel@bombadil.infradead.org; Thu, 07 Dec 2017 17:09:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=8jR1fM5bYLCgbXJOxca8wJMGvLo8r6+2l3q609EPMOw=; b=n0Z9uTZb7XW6yhVo2D8paQxlg YjA0g9jw7cserEz9IwwnN8iU0vGs1wYtfzgcrHuymOtw6OfGc22jNPaiQNASzSBCwdbOmZkHSQnTt PuHIREwafdSzi6dGsaLryCinMt9VfvEHoOSrXUv0uLDfG++qbIM4PKH70q5Ryebzk65EZIxwzJzLj YzMNzVc6uzv44XWGYZnOBJIkN4Bm/n8q3gYJqVOwzkGI/nIfFVASr3PsWznbrG7nq1NdFlrW4g6M3 LCyljqX9o4tASoNBgjsH/a6nzs1iJQxQiBwX4YveUK8qSOoze4Q7fRiU6PwT/MqW+nJIhvTylewWO CPYPmQaHg==; Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eMzdl-0001vz-VI for linux-arm-kernel@lists.infradead.org; Thu, 07 Dec 2017 17:07:20 +0000 Received: by mail-wm0-x241.google.com with SMTP id 64so14097306wme.3 for ; Thu, 07 Dec 2017 09:06:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8jR1fM5bYLCgbXJOxca8wJMGvLo8r6+2l3q609EPMOw=; b=HBxDRDBnMbOdaENwa6d6z5Ox+XDo68vlifSU6eGhuKxGd75Z/Dc9JHhxRbqXjCPrnN WqAPPDZHhH9fSk6fqQTGSGL+ZeT8bBEoyIwWCXUibDesu1oO34EPkQQksSA8anCQZbet PY7DeZe/0bd6ipUJafr2WVJhocaRJWAXcYuDw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8jR1fM5bYLCgbXJOxca8wJMGvLo8r6+2l3q609EPMOw=; b=LWdZK1/N0L1bUs+NJHdha2QhdoX7J4Rikvg1frEsKh5/eRwEXQvvbI8khQQ+Bc8dkN +Gmcdz0d0WC3s1wu9nPrdhsJT9G5m7hej/m8bj9bvbnxEXAr3H0j2w8Tc2C8s6BwZ6b2 NA8fpPsx2pdDdEzPkVeSmEwssub4N8/dy7eVYFFHxHCkijW8CUZ6mEHXeGWHk7HQeQTr UKoKaiNEP3HtdRzP/5tCBsQjXtbTU9en5tSsVwO57yzgjNzRG5WD6Xs/zC91C5d+GYvc 6emfsTf82oFzKzwvrbtGr4+tyJk6lhd9McHjWVyOBgRuP5GUs/uSF+naiXdU/hdkd/Z/ Iw9g== X-Gm-Message-State: AJaThX7Ubtpf9njsMonJFA4h2WDcpTpxKnxylXwuZ6FMM2ACZzZLCb2h r5D3AMB8cL6J8cgXFL8FAK+yhkgYi/I= X-Google-Smtp-Source: AGs4zMYdv4dZmnR780u6CSUXGd3Rh20l3F1+utJ0Cd9Sv+NGZuX04BJHZGrmg3s/+way+105w3BiDQ== X-Received: by 10.80.134.18 with SMTP id o18mr45703762edo.306.1512666418214; Thu, 07 Dec 2017 09:06:58 -0800 (PST) Received: from localhost.localdomain (x50d2404e.cust.hiper.dk. [80.210.64.78]) by smtp.gmail.com with ESMTPSA id a16sm2868270edd.19.2017.12.07.09.06.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Dec 2017 09:06:56 -0800 (PST) From: Christoffer Dall To: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 11/36] KVM: arm64: Introduce VHE-specific kvm_vcpu_run Date: Thu, 7 Dec 2017 18:06:05 +0100 Message-Id: <20171207170630.592-12-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171207170630.592-1-christoffer.dall@linaro.org> References: <20171207170630.592-1-christoffer.dall@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171207_170718_031273_7400CCEF X-CRM114-Status: GOOD ( 17.17 ) 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: Marc Zyngier , Andrew Jones , Christoffer Dall , Shih-Wei Li , kvm@vger.kernel.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 So far this is just a copy of the legacy non-VHE switch function, where we only change the existing calls to has_vhe() in both the original and new functions. Signed-off-by: Christoffer Dall Reviewed-by: Marc Zyngier --- Notes: Changes since v1: - Rename kvm_vcpu_run to kvm_vcpu_run_vhe and rename __kvm_vcpu_run to __kvm_vcpu_run_nvhe - Removed stray whitespace line arch/arm/include/asm/kvm_asm.h | 5 +++- arch/arm/kvm/hyp/switch.c | 2 +- arch/arm64/include/asm/kvm_asm.h | 4 ++- arch/arm64/kvm/hyp/switch.c | 58 +++++++++++++++++++++++++++++++++++++++- virt/kvm/arm/arm.c | 5 +++- 5 files changed, 69 insertions(+), 5 deletions(-) diff --git a/arch/arm/include/asm/kvm_asm.h b/arch/arm/include/asm/kvm_asm.h index 36dd2962a42d..4ac717276543 100644 --- a/arch/arm/include/asm/kvm_asm.h +++ b/arch/arm/include/asm/kvm_asm.h @@ -70,7 +70,10 @@ extern void __kvm_tlb_flush_local_vmid(struct kvm_vcpu *vcpu); extern void __kvm_timer_set_cntvoff(u32 cntvoff_low, u32 cntvoff_high); -extern int __kvm_vcpu_run(struct kvm_vcpu *vcpu); +/* no VHE on 32-bit :( */ +static inline int kvm_vcpu_run_vhe(struct kvm_vcpu *vcpu) { return 0; } + +extern int __kvm_vcpu_run_nvhe(struct kvm_vcpu *vcpu); extern void __init_stage2_translation(void); diff --git a/arch/arm/kvm/hyp/switch.c b/arch/arm/kvm/hyp/switch.c index c3b9799e2e13..7b2bd25e3b10 100644 --- a/arch/arm/kvm/hyp/switch.c +++ b/arch/arm/kvm/hyp/switch.c @@ -153,7 +153,7 @@ static bool __hyp_text __populate_fault_info(struct kvm_vcpu *vcpu) return true; } -int __hyp_text __kvm_vcpu_run(struct kvm_vcpu *vcpu) +int __hyp_text __kvm_vcpu_run_nvhe(struct kvm_vcpu *vcpu) { struct kvm_cpu_context *host_ctxt; struct kvm_cpu_context *guest_ctxt; diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h index 33e0edc6f8be..adaf1db12271 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -58,7 +58,9 @@ extern void __kvm_tlb_flush_local_vmid(struct kvm_vcpu *vcpu); extern void __kvm_timer_set_cntvoff(u32 cntvoff_low, u32 cntvoff_high); -extern int __kvm_vcpu_run(struct kvm_vcpu *vcpu); +extern int kvm_vcpu_run_vhe(struct kvm_vcpu *vcpu); + +extern int __kvm_vcpu_run_nvhe(struct kvm_vcpu *vcpu); extern u64 __vgic_v3_get_ich_vtr_el2(void); extern u64 __vgic_v3_read_vmcr(void); diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c index 845e3bece399..8f32f8dcab65 100644 --- a/arch/arm64/kvm/hyp/switch.c +++ b/arch/arm64/kvm/hyp/switch.c @@ -342,7 +342,63 @@ static bool __hyp_text fixup_guest_exit(struct kvm_vcpu *vcpu, u64 *exit_code) return false; } -int __hyp_text __kvm_vcpu_run(struct kvm_vcpu *vcpu) +/* Switch to the guest for VHE systems running in EL2 */ +int kvm_vcpu_run_vhe(struct kvm_vcpu *vcpu) +{ + struct kvm_cpu_context *host_ctxt; + struct kvm_cpu_context *guest_ctxt; + u64 exit_code; + + vcpu = kern_hyp_va(vcpu); + + host_ctxt = kern_hyp_va(vcpu->arch.host_cpu_context); + host_ctxt->__hyp_running_vcpu = vcpu; + guest_ctxt = &vcpu->arch.ctxt; + + __sysreg_save_host_state(host_ctxt); + + __activate_traps(vcpu); + __activate_vm(vcpu); + + __vgic_restore_state(vcpu); + __timer_enable_traps(vcpu); + + /* + * We must restore the 32-bit state before the sysregs, thanks + * to erratum #852523 (Cortex-A57) or #853709 (Cortex-A72). + */ + __sysreg32_restore_state(vcpu); + __sysreg_restore_guest_state(guest_ctxt); + __debug_switch_to_guest(vcpu); + + do { + /* Jump in the fire! */ + exit_code = __guest_enter(vcpu, host_ctxt); + + /* And we're baaack! */ + } while (fixup_guest_exit(vcpu, &exit_code)); + + __sysreg_save_guest_state(guest_ctxt); + __sysreg32_save_state(vcpu); + __timer_disable_traps(vcpu); + __vgic_save_state(vcpu); + + __deactivate_traps(vcpu); + __deactivate_vm(vcpu); + + __sysreg_restore_host_state(host_ctxt); + + /* + * This must come after restoring the host sysregs, since a non-VHE + * system may enable SPE here and make use of the TTBRs. + */ + __debug_switch_to_host(vcpu); + + return exit_code; +} + +/* Switch to the guest for legacy non-VHE systems */ +int __hyp_text __kvm_vcpu_run_nvhe(struct kvm_vcpu *vcpu) { struct kvm_cpu_context *host_ctxt; struct kvm_cpu_context *guest_ctxt; diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c index 3e10343374a1..104ee524c75a 100644 --- a/virt/kvm/arm/arm.c +++ b/virt/kvm/arm/arm.c @@ -712,7 +712,10 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) trace_kvm_entry(*vcpu_pc(vcpu)); guest_enter_irqoff(); - ret = kvm_call_hyp(__kvm_vcpu_run, vcpu); + if (has_vhe()) + ret = kvm_vcpu_run_vhe(vcpu); + else + ret = kvm_call_hyp(__kvm_vcpu_run_nvhe, vcpu); vcpu->mode = OUTSIDE_GUEST_MODE; vcpu->stat.exits++;