From patchwork Fri Mar 6 18:52:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 447402 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E409A14010F for ; Sat, 7 Mar 2015 05:53:24 +1100 (AEDT) Received: from localhost ([::1]:59784 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTxND-0003Ig-45 for incoming@patchwork.ozlabs.org; Fri, 06 Mar 2015 13:53:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54379) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTxMf-00028x-4m for qemu-devel@nongnu.org; Fri, 06 Mar 2015 13:52:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YTxMc-00084R-I5 for qemu-devel@nongnu.org; Fri, 06 Mar 2015 13:52:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:20338) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTxMc-00084B-B0 for qemu-devel@nongnu.org; Fri, 06 Mar 2015 13:52:46 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t26IqbJV022972 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 6 Mar 2015 13:52:38 -0500 Received: from apm-mustang-ev3-05.ml3.eng.bos.redhat.com (apm-mustang-ev3-05.ml3.eng.bos.redhat.com [10.19.176.136]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t26IqYUU021022; Fri, 6 Mar 2015 13:52:36 -0500 From: Andrew Jones To: kvmarm@lists.cs.columbia.edu, qemu-devel@nongnu.org, ard.biesheuvel@linaro.org, christoffer.dall@linaro.org, marc.zyngier@arm.com, peter.maydell@linaro.org Date: Fri, 6 Mar 2015 13:52:29 -0500 Message-Id: <1425667953-3566-3-git-send-email-drjones@redhat.com> In-Reply-To: <1425667953-3566-1-git-send-email-drjones@redhat.com> References: <1425667780-3449-1-git-send-email-drjones@redhat.com> <1425667953-3566-1-git-send-email-drjones@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: pbonzini@redhat.com, lersek@redhat.com, agraf@suse.de, catalin.marinas@arm.com Subject: [Qemu-devel] [RFC PATCH 2/6] KVM: Introduce incoherent cache maintenance API X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add two new memslot functions to the API kvm_flush_incoherent_memory_regions flush all KVM_MEM_INCOHERENT memslot addresses kvm_invalidate_incoherent_memory_regions invalidate all KVM_MEM_INCOHERENT memslot addresses Signed-off-by: Andrew Jones --- include/linux/kvm_host.h | 14 ++++++++++++++ virt/kvm/kvm_main.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 9dfb519c51e5b..2bdbeeb1b2704 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -517,6 +517,8 @@ int kvm_set_memory_region(struct kvm *kvm, struct kvm_userspace_memory_region *mem); int __kvm_set_memory_region(struct kvm *kvm, struct kvm_userspace_memory_region *mem); +void kvm_flush_incoherent_memory_regions(struct kvm *kvm); +void kvm_invalidate_incoherent_memory_regions(struct kvm *kvm); void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free, struct kvm_memory_slot *dont); int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot, @@ -705,6 +707,18 @@ static inline bool kvm_arch_has_noncoherent_dma(struct kvm *kvm) } #endif +#ifdef __KVM_HAVE_INCOHERENT_MEM +void kvm_arch_flush_incoherent(struct kvm *kvm, struct kvm_memory_slot *slot); +void kvm_arch_invalidate_incoherent(struct kvm *kvm, struct kvm_memory_slot *slot); +#else +void kvm_arch_flush_incoherent(struct kvm *kvm, struct kvm_memory_slot *slot) +{ +} +void kvm_arch_invalidate_incoherent(struct kvm *kvm, struct kvm_memory_slot *slot) +{ +} +#endif + static inline wait_queue_head_t *kvm_arch_vcpu_wq(struct kvm_vcpu *vcpu) { #ifdef __KVM_HAVE_ARCH_WQP diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 449c1c9ee68b4..96f44c57b8808 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -716,7 +716,7 @@ static void update_memslots(struct kvm_memslots *slots, static int check_memory_region_flags(struct kvm_userspace_memory_region *mem) { - u32 valid_flags = KVM_MEM_LOG_DIRTY_PAGES; + u32 valid_flags = KVM_MEM_LOG_DIRTY_PAGES | KVM_MEM_INCOHERENT; #ifdef __KVM_HAVE_READONLY_MEM valid_flags |= KVM_MEM_READONLY; @@ -960,6 +960,49 @@ static int kvm_vm_ioctl_set_memory_region(struct kvm *kvm, return kvm_set_memory_region(kvm, mem); } +static inline bool memory_region_is_incoherent(struct kvm_memory_slot *slot) +{ + return slot && slot->id < KVM_USER_MEM_SLOTS + && !(slot->flags & KVM_MEMSLOT_INVALID) + && slot->flags & KVM_MEM_INCOHERENT; +} + +void kvm_flush_incoherent_memory_regions(struct kvm *kvm) +{ + struct kvm_memslots *slots = kvm_memslots(kvm); + struct kvm_memory_slot *slot; + int idx; + + idx = srcu_read_lock(&kvm->srcu); + + kvm_for_each_memslot(slot, slots) { + if (!memory_region_is_incoherent(slot)) + continue; + kvm_arch_flush_incoherent(kvm, slot); + } + srcu_read_unlock(&kvm->srcu, idx); +} +EXPORT_SYMBOL_GPL(kvm_flush_incoherent_memory_regions); + +void kvm_invalidate_incoherent_memory_regions(struct kvm *kvm) +{ + struct kvm_memslots *slots = kvm_memslots(kvm); + struct kvm_memory_slot *slot; + int idx; + + idx = srcu_read_lock(&kvm->srcu); + + kvm_for_each_memslot(slot, slots) { + if (slot->flags & KVM_MEM_READONLY) + continue; + if (!memory_region_is_incoherent(slot)) + continue; + kvm_arch_invalidate_incoherent(kvm, slot); + } + srcu_read_unlock(&kvm->srcu, idx); +} +EXPORT_SYMBOL_GPL(kvm_invalidate_incoherent_memory_regions); + int kvm_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log, int *is_dirty) {