From patchwork Fri Apr 2 15:58:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 12181267 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6FDFDC43461 for ; Fri, 2 Apr 2021 15:58:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 44B606115A for ; Fri, 2 Apr 2021 15:58:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236250AbhDBP6O (ORCPT ); Fri, 2 Apr 2021 11:58:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235720AbhDBP6N (ORCPT ); Fri, 2 Apr 2021 11:58:13 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CFF1C0613E6; Fri, 2 Apr 2021 08:58:11 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id j20-20020a05600c1914b029010f31e15a7fso4517567wmq.1; Fri, 02 Apr 2021 08:58:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Kre3cIsJUUiu6GfRt+z3UNvRKui0T9xc/PeVTTZr7ig=; b=ryhHc1JzRHdWPicwK8viSU3MOD5f0eQmm47r5hbvS+5+INAyYGM5jeUruCl/zWWXFv jIdoxhhJ1sZ/ijWxfQcTzuqTpapouUmlJlZtolrY1OqwmAMqf6agR6e+/YWyQlXeVCt6 v3OtZXnYow7y0Mr9w4qsK0iTK8lSGIBMz7ZT9fW4mwxeIMwYcPTPmXRHDN3Kf/ST5XdK KWFpklbVNdKGx2q9Kd03pk/Z6mgiGmGexIvgr3VXf0lWDAaAgD+jFoLyCK7FygZxV3/s 6HD/8pzAlRWBIpC8N/fIE2Vwgq5ZgXofjpB5HV385leTv90TPkPnPXyzIX50PomWFitr vOKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Kre3cIsJUUiu6GfRt+z3UNvRKui0T9xc/PeVTTZr7ig=; b=WnywaZBVkOToXt1Fq2qPbHRyE/3sOeHnV1EQhs6hf6HkdiixIzHdmgb0lL3f81WLY8 mik+G1lfUjeeo+2lGe0stDHTAeYq0hfo9r0X3Va+z1NRN5gcwUtdNqfFZ8g9uxi9d5Cr 1yaY5kiFJtT8SaK0u1yuSiUg+jlXVpP1UwEEGU/6bkhlXz4MGEEPFdsNwiqzcvBE8HO6 tPODEjvBvL/IpYcOXkxLdazwKhN7eGRfvdR9nRcwFY7g0qyNTmykHk1AXaZdYc8mQWCx 4Uc9dul53K4nwbiidrBb1RxeW3JmbeHhv7ZAEuPgOYnHnABpJYd4Mhrj/HZUuneJAfYf fydA== X-Gm-Message-State: AOAM531izZb5vrf/+5aSUmDbM5BA39tbCdTlyPaU9l4J9Ko/EELku9V0 ulaAr64CXmflWW/k+f7jC45MSrKeMG0= X-Google-Smtp-Source: ABdhPJxkN/qm1HIJiGhdrsPZwOPx99MtS0WKuuR1c+cS3d4UmftRHekbQfkqHrzcI3HfVcNz5ZQ3bA== X-Received: by 2002:a05:600c:1457:: with SMTP id h23mr2284614wmi.118.1617379090365; Fri, 02 Apr 2021 08:58:10 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id w11sm2293625wmb.35.2021.04.02.08.58.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Apr 2021 08:58:10 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: chenhuacai@kernel.org, aleksandar.qemu.devel@gmail.com, seanjc@google.com, linux-mips@vger.kernel.org Subject: [PATCH 1/4] KVM: constify kvm_arch_flush_remote_tlbs_memslot Date: Fri, 2 Apr 2021 17:58:04 +0200 Message-Id: <20210402155807.49976-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210402155807.49976-1-pbonzini@redhat.com> References: <20210402155807.49976-1-pbonzini@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org memslots are stored in RCU and there should be no need to change them. Signed-off-by: Paolo Bonzini Reviewed-by: Huacai Chen --- arch/arm64/kvm/arm.c | 2 +- arch/mips/kvm/mips.c | 2 +- arch/x86/kvm/mmu/mmu.c | 2 +- include/linux/kvm_host.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 7f06ba76698d..9141730b7963 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -1268,7 +1268,7 @@ void kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot) } void kvm_arch_flush_remote_tlbs_memslot(struct kvm *kvm, - struct kvm_memory_slot *memslot) + const struct kvm_memory_slot *memslot) { kvm_flush_remote_tlbs(kvm); } diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c index 58a8812e2fa5..7db8234a4407 100644 --- a/arch/mips/kvm/mips.c +++ b/arch/mips/kvm/mips.c @@ -997,7 +997,7 @@ void kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot) } void kvm_arch_flush_remote_tlbs_memslot(struct kvm *kvm, - struct kvm_memory_slot *memslot) + const struct kvm_memory_slot *memslot) { /* Let implementation handle TLB/GVA invalidation */ kvm_mips_callbacks->flush_shadow_memslot(kvm, memslot); diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 0d92a269c5fa..f75c677910c9 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -5616,7 +5616,7 @@ void kvm_mmu_zap_collapsible_sptes(struct kvm *kvm, } void kvm_arch_flush_remote_tlbs_memslot(struct kvm *kvm, - struct kvm_memory_slot *memslot) + const struct kvm_memory_slot *memslot) { /* * All current use cases for flushing the TLBs for a specific memslot diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index e6d77353025c..34a974ffc882 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -894,7 +894,7 @@ void kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot); #ifdef CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT void kvm_arch_flush_remote_tlbs_memslot(struct kvm *kvm, - struct kvm_memory_slot *memslot); + const struct kvm_memory_slot *memslot); #else /* !CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT */ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log); int kvm_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log, From patchwork Fri Apr 2 15:58:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 12181269 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28507C433B4 for ; Fri, 2 Apr 2021 15:58:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 02C5C61152 for ; Fri, 2 Apr 2021 15:58:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235304AbhDBP6P (ORCPT ); Fri, 2 Apr 2021 11:58:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236199AbhDBP6O (ORCPT ); Fri, 2 Apr 2021 11:58:14 -0400 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B605C0613E6; Fri, 2 Apr 2021 08:58:12 -0700 (PDT) Received: by mail-wr1-x435.google.com with SMTP id j7so5129950wrd.1; Fri, 02 Apr 2021 08:58:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MaSyGg1oHuc+9Qj2LHQY6MYXXkqSQVsHMqnRNs608sw=; b=JnZ5tR2/hJNfkr1EPsGsgrtnOHVEqbNzR/9jbCXsYxR0L5WLmDvUB/eEkhVOq7dowH tDQZ2zRlj4gxlUSoNBiR95mV+GVQw8ymeTWn1/vjykX9QaxebIhh9i0ok1UzlWCSCgUy xst8STbt7QAidNhaSuxyUzt6gNXM/ClRxR37TEMLVygXNGyt0szbt8uj7m19FHVCT6LE 314a0xyCNZ8BM9CDNCgM58koGDZWdFkF+gj6UQ4Crkla1SfncUHl0MOaPVDGoaMeBMX8 2vuVPgCklXFaGlwR0TXSb+En5uDRJ5BhtXPUqjBHpBZ0Esdc38cN7e594YXqUOz1GJyt 6bNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=MaSyGg1oHuc+9Qj2LHQY6MYXXkqSQVsHMqnRNs608sw=; b=KbBSBMyReM1PpDd2NPhkPKijza/kja81fZFGieMfZlT1RkHn0dCxZwKIy2vfDJ1/6F gQMM4g7yirQYu5xyYDrcxsh27ouNFdDeFmGsVGwNx8zSemvlO0NfYKhaHbRx99righiA bGX5B3u94VVlHi33HMm3Fgu4k8dPpbH7cxDyWc4r1Lyafz/GtMoUkDAbVrMPBD/17rM2 48M1ABxAWjguh1uvBoACh5ndQ8DurGC2p566jMS4SeYQX3pUdnWbkV5H2uR/SC708YpX qRSL0r6N0bPRKAR5XCKHR3DUf0nj+YST3mgA4rQWBpfvn2WZTR6nTIGVDY3gNMtyzCys 1bAQ== X-Gm-Message-State: AOAM5307W95epwESh+ul54m6aqneN0+942/c0JCv9PrUCvO2mgfOzAqO MpZ0c8TslPitIp7V5Zb6HSaD9esGoJY= X-Google-Smtp-Source: ABdhPJwW6nGRjcX3n9h4Gsg4U0I/2WUvRcQYa+fuWfP47rwqpAzQb/V+Sb6u8Hu1Evkj5gDq0IttHA== X-Received: by 2002:a5d:49ca:: with SMTP id t10mr15911027wrs.76.1617379091218; Fri, 02 Apr 2021 08:58:11 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id w11sm2293625wmb.35.2021.04.02.08.58.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Apr 2021 08:58:10 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: chenhuacai@kernel.org, aleksandar.qemu.devel@gmail.com, seanjc@google.com, linux-mips@vger.kernel.org Subject: [PATCH 2/4] KVM: MIPS: rework flush_shadow_* callbacks into one that prepares the flush Date: Fri, 2 Apr 2021 17:58:05 +0200 Message-Id: <20210402155807.49976-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210402155807.49976-1-pbonzini@redhat.com> References: <20210402155807.49976-1-pbonzini@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Both trap-and-emulate and VZ have a single implementation that covers both .flush_shadow_all and .flush_shadow_memslot, and both of them end with a call to kvm_flush_remote_tlbs. Unify the callbacks into one and extract the call to kvm_flush_remote_tlbs. The next patches will pull it further out of the the architecture-specific MMU notifier functions kvm_unmap_hva_range and kvm_set_spte_hva. Signed-off-by: Paolo Bonzini --- arch/mips/include/asm/kvm_host.h | 9 +-------- arch/mips/kvm/mips.c | 12 ++++++------ arch/mips/kvm/mmu.c | 9 ++++++--- arch/mips/kvm/trap_emul.c | 13 ++----------- arch/mips/kvm/vz.c | 19 ++++--------------- 5 files changed, 19 insertions(+), 43 deletions(-) diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h index feaa77036b67..6c8c0ab53be2 100644 --- a/arch/mips/include/asm/kvm_host.h +++ b/arch/mips/include/asm/kvm_host.h @@ -815,14 +815,7 @@ struct kvm_mips_callbacks { int (*vcpu_init)(struct kvm_vcpu *vcpu); void (*vcpu_uninit)(struct kvm_vcpu *vcpu); int (*vcpu_setup)(struct kvm_vcpu *vcpu); - void (*flush_shadow_all)(struct kvm *kvm); - /* - * Must take care of flushing any cached GPA PTEs (e.g. guest entries in - * VZ root TLB, or T&E GVA page tables and corresponding root TLB - * mappings). - */ - void (*flush_shadow_memslot)(struct kvm *kvm, - const struct kvm_memory_slot *slot); + void (*prepare_flush_shadow)(struct kvm *kvm); gpa_t (*gva_to_gpa)(gva_t gva); void (*queue_timer_int)(struct kvm_vcpu *vcpu); void (*dequeue_timer_int)(struct kvm_vcpu *vcpu); diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c index 7db8234a4407..867b8de0fc07 100644 --- a/arch/mips/kvm/mips.c +++ b/arch/mips/kvm/mips.c @@ -206,7 +206,8 @@ void kvm_arch_flush_shadow_all(struct kvm *kvm) kvm_mips_flush_gpa_pt(kvm, 0, ~0); /* Let implementation do the rest */ - kvm_mips_callbacks->flush_shadow_all(kvm); + kvm_mips_callbacks->prepare_flush_shadow(kvm); + kvm_flush_remote_tlbs(kvm); } void kvm_arch_flush_shadow_memslot(struct kvm *kvm, @@ -221,8 +222,7 @@ void kvm_arch_flush_shadow_memslot(struct kvm *kvm, /* Flush slot from GPA */ kvm_mips_flush_gpa_pt(kvm, slot->base_gfn, slot->base_gfn + slot->npages - 1); - /* Let implementation do the rest */ - kvm_mips_callbacks->flush_shadow_memslot(kvm, slot); + kvm_arch_flush_remote_tlbs_memslot(kvm, slot); spin_unlock(&kvm->mmu_lock); } @@ -262,9 +262,8 @@ void kvm_arch_commit_memory_region(struct kvm *kvm, /* Write protect GPA page table entries */ needs_flush = kvm_mips_mkclean_gpa_pt(kvm, new->base_gfn, new->base_gfn + new->npages - 1); - /* Let implementation do the rest */ if (needs_flush) - kvm_mips_callbacks->flush_shadow_memslot(kvm, new); + kvm_arch_flush_remote_tlbs_memslot(kvm, new); spin_unlock(&kvm->mmu_lock); } } @@ -1000,7 +999,8 @@ void kvm_arch_flush_remote_tlbs_memslot(struct kvm *kvm, const struct kvm_memory_slot *memslot) { /* Let implementation handle TLB/GVA invalidation */ - kvm_mips_callbacks->flush_shadow_memslot(kvm, memslot); + kvm_mips_callbacks->prepare_flush_shadow(kvm); + kvm_flush_remote_tlbs(kvm); } long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg) diff --git a/arch/mips/kvm/mmu.c b/arch/mips/kvm/mmu.c index 3dabeda82458..7e055e5dfd3c 100644 --- a/arch/mips/kvm/mmu.c +++ b/arch/mips/kvm/mmu.c @@ -491,7 +491,8 @@ int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end, { handle_hva_to_gpa(kvm, start, end, &kvm_unmap_hva_handler, NULL); - kvm_mips_callbacks->flush_shadow_all(kvm); + kvm_mips_callbacks->prepare_flush_shadow(kvm); + kvm_flush_remote_tlbs(kvm); return 0; } @@ -532,8 +533,10 @@ int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte) int ret; ret = handle_hva_to_gpa(kvm, hva, end, &kvm_set_spte_handler, &pte); - if (ret) - kvm_mips_callbacks->flush_shadow_all(kvm); + if (ret) { + kvm_mips_callbacks->prepare_flush_shadow(kvm); + kvm_flush_remote_tlbs(kvm); + } return 0; } diff --git a/arch/mips/kvm/trap_emul.c b/arch/mips/kvm/trap_emul.c index 0788c00d7e94..5f2df497599c 100644 --- a/arch/mips/kvm/trap_emul.c +++ b/arch/mips/kvm/trap_emul.c @@ -687,16 +687,8 @@ static int kvm_trap_emul_vcpu_setup(struct kvm_vcpu *vcpu) return 0; } -static void kvm_trap_emul_flush_shadow_all(struct kvm *kvm) +static void kvm_trap_emul_prepare_flush_shadow(struct kvm *kvm) { - /* Flush GVA page tables and invalidate GVA ASIDs on all VCPUs */ - kvm_flush_remote_tlbs(kvm); -} - -static void kvm_trap_emul_flush_shadow_memslot(struct kvm *kvm, - const struct kvm_memory_slot *slot) -{ - kvm_trap_emul_flush_shadow_all(kvm); } static u64 kvm_trap_emul_get_one_regs[] = { @@ -1280,8 +1272,7 @@ static struct kvm_mips_callbacks kvm_trap_emul_callbacks = { .vcpu_init = kvm_trap_emul_vcpu_init, .vcpu_uninit = kvm_trap_emul_vcpu_uninit, .vcpu_setup = kvm_trap_emul_vcpu_setup, - .flush_shadow_all = kvm_trap_emul_flush_shadow_all, - .flush_shadow_memslot = kvm_trap_emul_flush_shadow_memslot, + .prepare_flush_shadow = kvm_trap_emul_prepare_flush_shadow, .gva_to_gpa = kvm_trap_emul_gva_to_gpa_cb, .queue_timer_int = kvm_mips_queue_timer_int_cb, .dequeue_timer_int = kvm_mips_dequeue_timer_int_cb, diff --git a/arch/mips/kvm/vz.c b/arch/mips/kvm/vz.c index 2ffbe9264a31..2c75571dc4a2 100644 --- a/arch/mips/kvm/vz.c +++ b/arch/mips/kvm/vz.c @@ -3211,32 +3211,22 @@ static int kvm_vz_vcpu_setup(struct kvm_vcpu *vcpu) return 0; } -static void kvm_vz_flush_shadow_all(struct kvm *kvm) +static void kvm_vz_prepare_flush_shadow(struct kvm *kvm) { - if (cpu_has_guestid) { - /* Flush GuestID for each VCPU individually */ - kvm_flush_remote_tlbs(kvm); - } else { + if (!cpu_has_guestid) { /* * For each CPU there is a single GPA ASID used by all VCPUs in * the VM, so it doesn't make sense for the VCPUs to handle * invalidation of these ASIDs individually. * * Instead mark all CPUs as needing ASID invalidation in - * asid_flush_mask, and just use kvm_flush_remote_tlbs(kvm) to + * asid_flush_mask, and kvm_flush_remote_tlbs(kvm) will * kick any running VCPUs so they check asid_flush_mask. */ cpumask_setall(&kvm->arch.asid_flush_mask); - kvm_flush_remote_tlbs(kvm); } } -static void kvm_vz_flush_shadow_memslot(struct kvm *kvm, - const struct kvm_memory_slot *slot) -{ - kvm_vz_flush_shadow_all(kvm); -} - static void kvm_vz_vcpu_reenter(struct kvm_vcpu *vcpu) { int cpu = smp_processor_id(); @@ -3292,8 +3282,7 @@ static struct kvm_mips_callbacks kvm_vz_callbacks = { .vcpu_init = kvm_vz_vcpu_init, .vcpu_uninit = kvm_vz_vcpu_uninit, .vcpu_setup = kvm_vz_vcpu_setup, - .flush_shadow_all = kvm_vz_flush_shadow_all, - .flush_shadow_memslot = kvm_vz_flush_shadow_memslot, + .prepare_flush_shadow = kvm_vz_prepare_flush_shadow, .gva_to_gpa = kvm_vz_gva_to_gpa_cb, .queue_timer_int = kvm_vz_queue_timer_int_cb, .dequeue_timer_int = kvm_vz_dequeue_timer_int_cb, From patchwork Fri Apr 2 15:58:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 12181271 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12541C433ED for ; Fri, 2 Apr 2021 15:58:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DF6896115A for ; Fri, 2 Apr 2021 15:58:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236343AbhDBP6P (ORCPT ); Fri, 2 Apr 2021 11:58:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236096AbhDBP6O (ORCPT ); Fri, 2 Apr 2021 11:58:14 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A75AC061788; Fri, 2 Apr 2021 08:58:13 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id d191so2698327wmd.2; Fri, 02 Apr 2021 08:58:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f5JxPWupbPkuZVCyDI6dt9FqT0pLLbnkcUSWIjCJmbc=; b=UwOkF0r38HQeXZIsZzBOqrUp/zcpHP11ci1dybIoYOJUhAY72Bw6xAlSz5ZK1QYGBN SidrGJurGoCbsHHmReweAXhaAsbAZBSzeX52nA4XcVZeQnXx8VNcr8y/vTxpaqFjwC7E 1dugLFI9OEL6qTK+8+4o25AsTmH21oZnyevVRWTi4FL/oXZVPgrjzVokuekuzziXrc/9 1+pKOjSl1mVU+yf9uPZOEuCzMsP8UP5tj/yP28RB7ay751D3Q3j1pRb36WBkeb5wzvQ2 LZcSccpTZCL7txQDpsZrtYvDeotWy8oBs/q1JjrDQsBdJDxaZuDdgIXyMOHDsVszPYiW vk5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=f5JxPWupbPkuZVCyDI6dt9FqT0pLLbnkcUSWIjCJmbc=; b=eVV1WrwPYJrtv89Ay35f0QLA0aPMMLr1g1XO2vhXwjNliWuUvrJRCL+joo6UI+ztHg FU0gOJmemZrB+jgwfB6LVq8Vvka8+0VQbLkk3oeXjfXYX5SulATgVkGL3p9540W6pjEC xM+lciCkcZKQwryuFgO8YOl9P8Ja4JPi75WHjNApJfb5zGVBCYcLhT2MudDb3ceIV4Iy Yfr8+TkyqOy4gTqjQZQCah4vb+smOsrSQsKO/C3Fd1yvF2hbWBrltFGvjzL4J9bsVngc HAxPGTFN3tZHNKotgxyZPJISKlZmf5XcuNXADKoWQLXz1wvl4QaCggTrpX/fc31G4wrz ZxZA== X-Gm-Message-State: AOAM5307TKKkR9oz13IjWqLcMtFimQb9fnpL0fweDRd4ceh75wOGlwWR jf4RUh3+QMjRUZDmTyMomfG13DcqmU4= X-Google-Smtp-Source: ABdhPJyS4AApX5w2jvyCJh/h/rDaFrY9VniIbGxQh7xDYuU67D0fVx2jG39QDnlzJSvFx3BJUUADuA== X-Received: by 2002:a7b:c396:: with SMTP id s22mr13235458wmj.38.1617379092091; Fri, 02 Apr 2021 08:58:12 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id w11sm2293625wmb.35.2021.04.02.08.58.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Apr 2021 08:58:11 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: chenhuacai@kernel.org, aleksandar.qemu.devel@gmail.com, seanjc@google.com, linux-mips@vger.kernel.org Subject: [PATCH 3/4] KVM: MIPS: let generic code call prepare_flush_shadow Date: Fri, 2 Apr 2021 17:58:06 +0200 Message-Id: <20210402155807.49976-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210402155807.49976-1-pbonzini@redhat.com> References: <20210402155807.49976-1-pbonzini@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Since all calls to kvm_flush_remote_tlbs must be preceded by kvm_mips_callbacks->prepare_flush_shadow, repurpose kvm_arch_flush_remote_tlb to invoke it. This makes it possible to use the TLB flushing mechanism provided by the generic MMU notifier code. Signed-off-by: Paolo Bonzini --- arch/mips/include/asm/kvm_host.h | 3 +++ arch/mips/kvm/mips.c | 11 ++++++----- arch/mips/kvm/mmu.c | 6 +----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h index 6c8c0ab53be2..d0944a75fc8d 100644 --- a/arch/mips/include/asm/kvm_host.h +++ b/arch/mips/include/asm/kvm_host.h @@ -1142,4 +1142,7 @@ static inline void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu) {} static inline void kvm_arch_vcpu_unblocking(struct kvm_vcpu *vcpu) {} static inline void kvm_arch_vcpu_block_finish(struct kvm_vcpu *vcpu) {} +#define __KVM_HAVE_ARCH_FLUSH_REMOTE_TLB +int kvm_arch_flush_remote_tlb(struct kvm *kvm); + #endif /* __MIPS_KVM_HOST_H__ */ diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c index 867b8de0fc07..4a22ba70c943 100644 --- a/arch/mips/kvm/mips.c +++ b/arch/mips/kvm/mips.c @@ -204,9 +204,6 @@ void kvm_arch_flush_shadow_all(struct kvm *kvm) { /* Flush whole GPA */ kvm_mips_flush_gpa_pt(kvm, 0, ~0); - - /* Let implementation do the rest */ - kvm_mips_callbacks->prepare_flush_shadow(kvm); kvm_flush_remote_tlbs(kvm); } @@ -995,11 +992,15 @@ void kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot) } +int kvm_arch_flush_remote_tlb(struct kvm *kvm) +{ + kvm_mips_callbacks->prepare_flush_shadow(kvm); + return 1; +} + void kvm_arch_flush_remote_tlbs_memslot(struct kvm *kvm, const struct kvm_memory_slot *memslot) { - /* Let implementation handle TLB/GVA invalidation */ - kvm_mips_callbacks->prepare_flush_shadow(kvm); kvm_flush_remote_tlbs(kvm); } diff --git a/arch/mips/kvm/mmu.c b/arch/mips/kvm/mmu.c index 7e055e5dfd3c..2cedf908d744 100644 --- a/arch/mips/kvm/mmu.c +++ b/arch/mips/kvm/mmu.c @@ -490,8 +490,6 @@ int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end, unsigned flags) { handle_hva_to_gpa(kvm, start, end, &kvm_unmap_hva_handler, NULL); - - kvm_mips_callbacks->prepare_flush_shadow(kvm); kvm_flush_remote_tlbs(kvm); return 0; } @@ -533,10 +531,8 @@ int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte) int ret; ret = handle_hva_to_gpa(kvm, hva, end, &kvm_set_spte_handler, &pte); - if (ret) { - kvm_mips_callbacks->prepare_flush_shadow(kvm); + if (ret) kvm_flush_remote_tlbs(kvm); - } return 0; } From patchwork Fri Apr 2 15:58:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 12181273 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F93BC43461 for ; Fri, 2 Apr 2021 15:58:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F0D8C6115A for ; Fri, 2 Apr 2021 15:58:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236452AbhDBP6Z (ORCPT ); Fri, 2 Apr 2021 11:58:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236339AbhDBP6P (ORCPT ); Fri, 2 Apr 2021 11:58:15 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A91AC0613E6; Fri, 2 Apr 2021 08:58:14 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id b9so5098510wrt.8; Fri, 02 Apr 2021 08:58:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=43FpCxX0SVzfOugEOQk73VHo0lcUDXRR1mTG2VJrV24=; b=O71U8IkgAOkcDTf0HexDGvvYgfmnzBNBLucYyXbL6gsSmc0cC6b+ibn0v+g83j0Sq+ 0o2Ds99FytvE/8nT4kZrDGQkHOwd7HfvVbi+vy77EBZvVwFDEIQq7gDhzdSMQmtI8WEJ WsTlunnqyNvUZ2dE8XIH4sbIC/jLB98ohUvPVfLztONbgMvOsWDfLKmhPkIR4Ag32vU8 wPYBJHgaQkHo/TNTxN1jaggCnHiOOAvS0PryD2YaMCTZ9yGQ3DPjF+swLv2QAbxXXylt 7TqqVYg9hTyT5/scedmBrdYTdAZEW/UHXIkLvlMpWQpnwu/geL47ZHFxsOnrBtXWuKkF cErw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=43FpCxX0SVzfOugEOQk73VHo0lcUDXRR1mTG2VJrV24=; b=qnTL/pps5rwin9Gmkfw5vdnvUAClymtOh1crxFZJ+nxMKqQBflfKj879thI2/SVDtu /hEvBFTjSx7aNYA6ZOTEJeTOxy5OoNLLBTiCOmaX2ocPVFjz40IIsqKK1CglKhcLQGwz Bx0yi4vH85b7lEKIvuVEpfAmEbi9ijn0ov/FYtA1+/nWBtIMTyzPxe//2UsSo8naZmZM l/lR62Wom8d4dD7XVmnHn2kYTbekdFhBZEzpjijs0mCyn1eZm5SbUplHsf896Io09Zt0 SGaafyfAJhRGEec8HpUHL6ApzI77LG9eWGV+edKvV+GcV5pdZ9ZkGjGyaenQIjRrnMAP 5p/g== X-Gm-Message-State: AOAM531gVLfjdsGh1g7kJxEffQ6IQl5Dn0ojLcX9ccreWVTdA0rsr7BE 4N/OFkP79vd5jLmjAyiysyZHwt1Ppn4= X-Google-Smtp-Source: ABdhPJy40VzvN06rqq1Rze1hJe0FWvMeBslGqDWCgLdpW2+frdxEDgqtczCiJqYQQTlwLtqPwppNpQ== X-Received: by 2002:a5d:42ca:: with SMTP id t10mr15796822wrr.274.1617379092877; Fri, 02 Apr 2021 08:58:12 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id w11sm2293625wmb.35.2021.04.02.08.58.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Apr 2021 08:58:12 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: chenhuacai@kernel.org, aleksandar.qemu.devel@gmail.com, seanjc@google.com, linux-mips@vger.kernel.org Subject: [PATCH 4/4] KVM: MIPS: defer flush to generic MMU notifier code Date: Fri, 2 Apr 2021 17:58:07 +0200 Message-Id: <20210402155807.49976-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210402155807.49976-1-pbonzini@redhat.com> References: <20210402155807.49976-1-pbonzini@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Return 1 from kvm_unmap_hva_range and kvm_set_spte_hva if a flush is needed, so that the generic code can coalesce the flushes. Signed-off-by: Paolo Bonzini --- arch/mips/kvm/mmu.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/arch/mips/kvm/mmu.c b/arch/mips/kvm/mmu.c index 2cedf908d744..a3a49b009dc4 100644 --- a/arch/mips/kvm/mmu.c +++ b/arch/mips/kvm/mmu.c @@ -489,9 +489,7 @@ static int kvm_unmap_hva_handler(struct kvm *kvm, gfn_t gfn, gfn_t gfn_end, int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end, unsigned flags) { - handle_hva_to_gpa(kvm, start, end, &kvm_unmap_hva_handler, NULL); - kvm_flush_remote_tlbs(kvm); - return 0; + return handle_hva_to_gpa(kvm, start, end, &kvm_unmap_hva_handler, NULL); } static int kvm_set_spte_handler(struct kvm *kvm, gfn_t gfn, gfn_t gfn_end, @@ -528,12 +526,7 @@ static int kvm_set_spte_handler(struct kvm *kvm, gfn_t gfn, gfn_t gfn_end, int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte) { unsigned long end = hva + PAGE_SIZE; - int ret; - - ret = handle_hva_to_gpa(kvm, hva, end, &kvm_set_spte_handler, &pte); - if (ret) - kvm_flush_remote_tlbs(kvm); - return 0; + return handle_hva_to_gpa(kvm, hva, end, &kvm_set_spte_handler, &pte); } static int kvm_age_hva_handler(struct kvm *kvm, gfn_t gfn, gfn_t gfn_end,