From patchwork Mon Mar 23 11:53:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 46181 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 99472214B0 for ; Mon, 23 Mar 2015 11:55:17 +0000 (UTC) Received: by wghb13 with SMTP id b13sf18014948wgh.3 for ; Mon, 23 Mar 2015 04:55:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=9Z/m6bll9uTPn5IlLC6NNnDYEpi6ZCAezt2amQnREXE=; b=aA4GV5fgRQaXX7bo5qqiSYaHvat8DA89NYqDlgYjh+GkomGCKjIxIE8BhIuFzb2Hi1 1cD+83fj7z8AnZPZRntqHJ2MI52DMNwizy2XE4o1Eh2ZUDwXGMoobgyZbT8arphsF9qw Yg/L7XeFSWagrMbHt0YzFur3o7YwfdnZ7MetrJPrzFCp/Pg9dWpWd9S4p7eZ+/wDEXCC yd2WXO8NjISsJAtqbHo9G9h110ctrv2LF4cAhWhLgzxlJ0u9aVnDv1fCWXzvPQRJ2EFq FK+q56wLP5nBnj1LMbYY00VgbGND3wkYsybN55UreJrYt0H97MYo0/pCwlt15lQfvxXU TzMQ== X-Gm-Message-State: ALoCoQkIHBKb6nBnDZSjFry+HQaj+1ExPOcC4uE86QoNKiJ9R6VKitd7SBZ0mctT+sqKIZM+qi5J X-Received: by 10.112.148.10 with SMTP id to10mr10628244lbb.18.1427111716881; Mon, 23 Mar 2015 04:55:16 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.20.67 with SMTP id l3ls667874lae.93.gmail; Mon, 23 Mar 2015 04:55:16 -0700 (PDT) X-Received: by 10.112.181.231 with SMTP id dz7mr80837323lbc.47.1427111716703; Mon, 23 Mar 2015 04:55:16 -0700 (PDT) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com. [209.85.217.169]) by mx.google.com with ESMTPS id b6si374266lbd.173.2015.03.23.04.55.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Mar 2015 04:55:16 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) client-ip=209.85.217.169; Received: by lbbsy1 with SMTP id sy1so116428436lbb.1 for ; Mon, 23 Mar 2015 04:55:16 -0700 (PDT) X-Received: by 10.112.162.232 with SMTP id yd8mr16897719lbb.41.1427111716573; Mon, 23 Mar 2015 04:55:16 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.57.201 with SMTP id k9csp776079lbq; Mon, 23 Mar 2015 04:55:15 -0700 (PDT) X-Received: by 10.68.201.227 with SMTP id kd3mr20415948pbc.95.1427111714680; Mon, 23 Mar 2015 04:55:14 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wh6si600005pac.221.2015.03.23.04.55.13; Mon, 23 Mar 2015 04:55:14 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752625AbbCWLzF (ORCPT + 27 others); Mon, 23 Mar 2015 07:55:05 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:36807 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752592AbbCWLy5 (ORCPT ); Mon, 23 Mar 2015 07:54:57 -0400 Received: by padcy3 with SMTP id cy3so189505150pad.3 for ; Mon, 23 Mar 2015 04:54:57 -0700 (PDT) X-Received: by 10.68.219.136 with SMTP id po8mr20464111pbc.66.1427111697296; Mon, 23 Mar 2015 04:54:57 -0700 (PDT) Received: from localhost.localdomain (61-205-5-195m5.grp1.mineo.jp. [61.205.5.195]) by mx.google.com with ESMTPSA id ok8sm799377pdb.66.2015.03.23.04.54.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Mar 2015 04:54:56 -0700 (PDT) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, marc.zyngier@arm.com, mark.rutland@arm.com Cc: christoffer.dall@linaro.org, geoff@infradead.org, broonie@kernel.org, david.griego@linaro.org, freddy77@gmail.com, kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, AKASHI Takahiro Subject: [RFC 1/4] arm64: kvm: add a cpu tear-down function Date: Mon, 23 Mar 2015 20:53:56 +0900 Message-Id: <1427111639-4575-2-git-send-email-takahiro.akashi@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427111639-4575-1-git-send-email-takahiro.akashi@linaro.org> References: <1427111639-4575-1-git-send-email-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: takahiro.akashi@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Cpu must be put back into its initial state, at least, in the following cases in order to shutdown the system and/or re-initialize cpus later on: 1) kexec/kdump 2) cpu hotplug (offline) 3) removing kvm as a module To address those issues in later patches, this patch adds a tear-down function, kvm_cpu_reset(), that disables D-cache & MMU and restore a vector table to the initial stub at EL2. Signed-off-by: AKASHI Takahiro --- arch/arm/kvm/arm.c | 18 ++++++++++++++++ arch/arm/kvm/mmu.c | 16 +++++++++++++++ arch/arm64/include/asm/kvm_asm.h | 3 +++ arch/arm64/include/asm/kvm_host.h | 10 +++++++++ arch/arm64/include/asm/kvm_mmu.h | 3 +++ arch/arm64/include/asm/virt.h | 11 ++++++++++ arch/arm64/kvm/hyp-init.S | 41 +++++++++++++++++++++++++++++++++++++ arch/arm64/kvm/hyp.S | 29 ++++++++++++++++++++++---- 8 files changed, 127 insertions(+), 4 deletions(-) diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index 5560f74..35c8bc0 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -897,6 +897,24 @@ static void cpu_init_hyp_mode(void *dummy) __cpu_init_hyp_mode(boot_pgd_ptr, pgd_ptr, hyp_stack_ptr, vector_ptr); } +void kvm_cpu_reset(void *dummy) +{ + phys_addr_t boot_pgd_ptr; + phys_addr_t phys_idmap_start; + unsigned long reset_func; + unsigned long vector_ptr; + + if (__hyp_get_vectors() == hyp_default_vectors) + return; + + reset_func = kvm_reset_func_entry(); + boot_pgd_ptr = kvm_mmu_get_boot_httbr(); + phys_idmap_start = kvm_get_idmap_start(); + vector_ptr = kvm_get_stub_vectors(); + __cpu_reset_hyp_mode(reset_func, + boot_pgd_ptr, phys_idmap_start, vector_ptr); +} + static int hyp_init_cpu_notify(struct notifier_block *self, unsigned long action, void *cpu) { diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c index 3e6859b..428f41c 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c @@ -1490,6 +1490,22 @@ phys_addr_t kvm_get_idmap_vector(void) return hyp_idmap_vector; } +phys_addr_t kvm_get_idmap_start(void) +{ + return hyp_idmap_start; +} + +phys_addr_t kvm_get_stub_vectors(void) +{ + return virt_to_phys(__hyp_stub_vectors); +} + +unsigned long kvm_reset_func_entry(void) +{ + /* VA of __kvm_hyp_reset in trampline code */ + return TRAMPOLINE_VA + (__kvm_hyp_reset - __hyp_idmap_text_start); +} + int kvm_mmu_init(void) { int err; diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h index 4f7310f..97ee2fc 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -116,8 +116,11 @@ struct kvm; struct kvm_vcpu; +extern char __hyp_stub_vectors[]; + extern char __kvm_hyp_init[]; extern char __kvm_hyp_init_end[]; +extern char __kvm_hyp_reset[]; extern char __kvm_hyp_vector[]; diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 8ac3c70..97f88fe 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -199,6 +199,7 @@ struct kvm_vcpu *kvm_arm_get_running_vcpu(void); struct kvm_vcpu * __percpu *kvm_get_running_vcpus(void); u64 kvm_call_hyp(void *hypfn, ...); +void kvm_call_reset(unsigned long reset_func, ...); void force_vm_exit(const cpumask_t *mask); void kvm_mmu_wp_memory_region(struct kvm *kvm, int slot); @@ -223,6 +224,15 @@ static inline void __cpu_init_hyp_mode(phys_addr_t boot_pgd_ptr, hyp_stack_ptr, vector_ptr); } +static inline void __cpu_reset_hyp_mode(unsigned long reset_func, + phys_addr_t boot_pgd_ptr, + phys_addr_t phys_idmap_start, + unsigned long stub_vector_ptr) +{ + kvm_call_reset(reset_func, boot_pgd_ptr, + phys_idmap_start, stub_vector_ptr); +} + struct vgic_sr_vectors { void *save_vgic; void *restore_vgic; diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h index 6458b53..36be582 100644 --- a/arch/arm64/include/asm/kvm_mmu.h +++ b/arch/arm64/include/asm/kvm_mmu.h @@ -96,6 +96,9 @@ void kvm_mmu_free_memory_caches(struct kvm_vcpu *vcpu); phys_addr_t kvm_mmu_get_httbr(void); phys_addr_t kvm_mmu_get_boot_httbr(void); phys_addr_t kvm_get_idmap_vector(void); +phys_addr_t kvm_get_idmap_start(void); +phys_addr_t kvm_get_stub_vectors(void); +unsigned long kvm_reset_func_entry(void); int kvm_mmu_init(void); void kvm_clear_hyp_idmap(void); diff --git a/arch/arm64/include/asm/virt.h b/arch/arm64/include/asm/virt.h index 3070096..7fcd087 100644 --- a/arch/arm64/include/asm/virt.h +++ b/arch/arm64/include/asm/virt.h @@ -61,6 +61,17 @@ #define BOOT_CPU_MODE_EL1 (0xe11) #define BOOT_CPU_MODE_EL2 (0xe12) +/* + * HVC_RESET - Reset cpu in EL2 to initial state. + * + * @x0: entry address in trampoline code in va + * @x1: identical mapping page table in pa + * @x2: start address of identical mapping in pa + * @x3: initial stub vector in pa + */ + +#define HVC_RESET 5 + #ifndef __ASSEMBLY__ /* diff --git a/arch/arm64/kvm/hyp-init.S b/arch/arm64/kvm/hyp-init.S index c319116..ca7e6bf 100644 --- a/arch/arm64/kvm/hyp-init.S +++ b/arch/arm64/kvm/hyp-init.S @@ -115,6 +115,47 @@ target: /* We're now in the trampoline code, switch page tables */ eret ENDPROC(__kvm_hyp_init) + /* + * x0: HYP boot pgd + * x1: HYP phys_idmap_start + * x2: HYP stub vectors + */ +ENTRY(__kvm_hyp_reset) + /* We're in trampoline code in VA */ + /* Invalidate the old TLBs */ + tlbi alle2 + dsb sy + + /* Switch back to boot page tables */ + msr ttbr0_el2, x0 + isb + + /* Branch into PA space */ + adr x0, 1f + bfi x1, x0, #0, #PAGE_SHIFT + br x1 + + /* We're now in idmap */ +1: /* Invalidate the old TLBs again */ + tlbi alle2 + dsb sy + + /* Disable MMU */ + mrs x0, sctlr_el2 + and x1, x0, #SCTLR_EL2_EE + orr x0, x0, x1 // preserve endianness of EL2 + ldr x1, =SCTLR_EL2_FLAGS + eor x1, x1, xzr + bic x0, x0, x1 // Clear SCTL_M and etc + msr sctlr_el2, x0 + isb + + /* Switch back to stub vectors */ + msr vbar_el2, x2 + + eret +ENDPROC(__kvm_hyp_reset) + .ltorg .popsection diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S index fd085ec..aee75f9 100644 --- a/arch/arm64/kvm/hyp.S +++ b/arch/arm64/kvm/hyp.S @@ -1136,6 +1136,11 @@ ENTRY(kvm_call_hyp) ret ENDPROC(kvm_call_hyp) +ENTRY(kvm_call_reset) + hvc #HVC_RESET + ret +ENDPROC(kvm_call_reset) + .macro invalid_vector label, target .align 2 \label: @@ -1179,10 +1184,10 @@ el1_sync: // Guest trapped into EL2 cmp x18, #HVC_GET_VECTORS b.ne 1f mrs x0, vbar_el2 - b 2f - -1: /* Default to HVC_CALL_HYP. */ + b 3f +1: cmp x18, #HVC_CALL_HYP + b.ne 2f push lr, xzr /* @@ -1196,7 +1201,23 @@ el1_sync: // Guest trapped into EL2 blr lr pop lr, xzr -2: eret + b 3f + + /* + * shuffle the parameters and jump into trampline code. + */ +2: cmp x18, #HVC_RESET + b.ne 3f + + mov x18, x0 + mov x0, x1 + mov x1, x2 + mov x2, x3 + mov x3, x4 + br x18 + /* not reach here */ + +3: eret el1_trap: /*