From patchwork Tue Jun 3 23:19:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Smarduch X-Patchwork-Id: 4291651 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0BCB39F326 for ; Tue, 3 Jun 2014 23:19:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2C56520272 for ; Tue, 3 Jun 2014 23:19:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1626020260 for ; Tue, 3 Jun 2014 23:19:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934243AbaFCXTg (ORCPT ); Tue, 3 Jun 2014 19:19:36 -0400 Received: from mailout2.w2.samsung.com ([211.189.100.12]:54483 "EHLO usmailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932245AbaFCXTd (ORCPT ); Tue, 3 Jun 2014 19:19:33 -0400 Received: from uscpsbgex4.samsung.com (u125.gpu85.samsung.co.kr [203.254.195.125]) by mailout2.w2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N6M001JV8SKEW10@mailout2.w2.samsung.com> for kvm@vger.kernel.org; Tue, 03 Jun 2014 19:19:32 -0400 (EDT) X-AuditID: cbfec37d-b7fbf6d000005712-8b-538e58030960 Received: from usmmp2.samsung.com ( [203.254.195.78]) by uscpsbgex4.samsung.com (USCPEXMTA) with SMTP id E4.42.22290.3085E835; Tue, 03 Jun 2014 19:19:31 -0400 (EDT) Received: from sisasmtp.sisa.samsung.com ([105.144.21.116]) by usmmp2.samsung.com (Oracle Communications Messaging Server 7u4-27.01(7.0.4.27.0) 64bit (built Aug 30 2012)) with ESMTP id <0N6M009628SJA1D0@usmmp2.samsung.com>; Tue, 03 Jun 2014 19:19:31 -0400 (EDT) Received: from mjsmard-530U3C-530U4C-532U3C.sisa.samsung.com (105.144.129.76) by SISAEX02SJ.sisa.samsung.com (105.144.21.116) with Microsoft SMTP Server (TLS) id 14.1.421.2; Tue, 03 Jun 2014 16:19:30 -0700 From: Mario Smarduch To: kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org, marc.zyngier@arm.com Cc: steve.capper@arm.com, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, gavin.guo@canonical.com, peter.maydell@linaro.org, jays.lee@samsung.com, sungjinn.chung@samsung.com, Mario Smarduch Subject: [PATCH v7 1/4] arm: add ARMv7 HYP API to flush VM TLBs without address param Date: Tue, 03 Jun 2014 16:19:24 -0700 Message-id: <1401837567-5527-2-git-send-email-m.smarduch@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1401837567-5527-1-git-send-email-m.smarduch@samsung.com> References: <1401837567-5527-1-git-send-email-m.smarduch@samsung.com> MIME-version: 1.0 Content-type: text/plain X-Originating-IP: [105.144.129.76] X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrHLMWRmVeSWpSXmKPExsVy+t9hP13miL5gg+7v1hYvXv9jtOj9f5HV 4v7V74wWc6YWWnw8dZzdYtPja6wWf+/8Y7OYc+YBi8WkN9uYLD7MWMnowOWxZt4aRo9ZDb1s Hneu7WHzOL9pDbPH5iX1Hn1bVjF6fN4kF8AexWWTkpqTWZZapG+XwJXR9uI3Y8EVsYq+rWdY GxjfCXUxcnJICJhI9E58zwZhi0lcuLceyObiEBJYxihxZ88FdpCEkEAvk8S1DhWIxEWgxJLn zCAJNgFdif33NoIViQiESkxZ/poJpIhZ4DmjxK+3b5hAEsIC4RIL+p+zgNgsAqoSH5/sB2vm FXCV6GvsBWrmAFqtIDFnkg1ImFPATWLLuTnMIGEhoJK2ReIQ1YISPybfYwEJMwtISDz/rARx mqrEtpvPGSGGKEmsPmI+gVFoFpKGWQgNCxiZVjGKlRYnFxQnpadWmOgVJ+YWl+al6yXn525i hMRJ7Q7G+19tDjEKcDAq8fBOuNkbLMSaWFZcmXuIUYKDWUmE97NqX7AQb0piZVVqUX58UWlO avEhRiYOTqkGxpOrKrdtMOQr8J5k7nLT6TCHyH7LeQtqxMvfzhXb7tfmu/cl/+aUew/9EyQP px2y1W645ruJUdRSM/JTw8VI6foyyzXul1Z+7GnZolYfpJYW1ee2pIWD0/peWEuSUZLZeeGu uuvbH7EI/tV56ro6/oH28shPs2dvr5qQUWRWdubCkY6fPD+FlFiKMxINtZiLihMBlL7fH3EC AAA= Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Patch adds HYP interface for global VM TLB invalidation without address parameter. Added ARM version of kvm_flush_remote_tlbs(), made the generic implementation a weak symbol. Signed-off-by: Mario Smarduch --- arch/arm/include/asm/kvm_asm.h | 1 + arch/arm/kvm/interrupts.S | 11 +++++++++++ arch/arm/kvm/mmu.c | 14 ++++++++++++++ virt/kvm/kvm_main.c | 2 +- 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/kvm_asm.h b/arch/arm/include/asm/kvm_asm.h index 53b3c4a..21bc519 100644 --- a/arch/arm/include/asm/kvm_asm.h +++ b/arch/arm/include/asm/kvm_asm.h @@ -78,6 +78,7 @@ extern char __kvm_hyp_code_end[]; extern void __kvm_flush_vm_context(void); extern void __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa); +extern void __kvm_tlb_flush_vmid(struct kvm *kvm); extern int __kvm_vcpu_run(struct kvm_vcpu *vcpu); #endif diff --git a/arch/arm/kvm/interrupts.S b/arch/arm/kvm/interrupts.S index 0d68d40..bddc66b 100644 --- a/arch/arm/kvm/interrupts.S +++ b/arch/arm/kvm/interrupts.S @@ -66,6 +66,17 @@ ENTRY(__kvm_tlb_flush_vmid_ipa) bx lr ENDPROC(__kvm_tlb_flush_vmid_ipa) +/** + * void __kvm_tlb_flush_vmid(struct kvm *kvm) - Flush per-VMID TLBs + * + * Reuses __kvm_tlb_flush_vmid_ipa() for ARMv7, without passing address + * parameter + */ + +ENTRY(__kvm_tlb_flush_vmid) + b __kvm_tlb_flush_vmid_ipa +ENDPROC(__kvm_tlb_flush_vmid) + /******************************************************************** * Flush TLBs and instruction caches of all CPUs inside the inner-shareable * domain, for all VMIDs diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c index 2ac9588..ef29540 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c @@ -56,6 +56,20 @@ static void kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa) kvm_call_hyp(__kvm_tlb_flush_vmid_ipa, kvm, ipa); } +/** + * kvm_flush_remote_tlbs() - flush all VM TLB entries + * @kvm: pointer to kvm structure. + * + * Interface to HYP function to flush all VM TLB entries without address + * parameter. In HYP mode reuses __kvm_tlb_flush_vmid_ipa() function used by + * kvm_tlb_flush_vmid_ipa(). + */ +void kvm_flush_remote_tlbs(struct kvm *kvm) +{ + if (kvm) + kvm_call_hyp(__kvm_tlb_flush_vmid, kvm); +} + static int mmu_topup_memory_cache(struct kvm_mmu_memory_cache *cache, int min, int max) { diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index fa70c6e..ba25765 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -184,7 +184,7 @@ static bool make_all_cpus_request(struct kvm *kvm, unsigned int req) return called; } -void kvm_flush_remote_tlbs(struct kvm *kvm) +void __weak kvm_flush_remote_tlbs(struct kvm *kvm) { long dirty_count = kvm->tlbs_dirty;