From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09C85C001B0 for ; Wed, 19 Jul 2023 17:12:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 60A86280076; Wed, 19 Jul 2023 13:12:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5939D28004C; Wed, 19 Jul 2023 13:12:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3E528280076; Wed, 19 Jul 2023 13:12:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 2832C28004C for ; Wed, 19 Jul 2023 13:12:22 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id DF7441A03C6 for ; Wed, 19 Jul 2023 17:12:21 +0000 (UTC) X-FDA: 81029004882.11.308BF35 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf19.hostedemail.com (Postfix) with ESMTP id 802291A001A for ; Wed, 19 Jul 2023 17:12:19 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CVvb6Q2x; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf19.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=pbonzini@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689786739; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=S9AsII7CY5MJTEaTaOHNT9YNASCGL4WKC7qHJSnopZQ=; b=SMWhBL5TXr8D3wZsvm+Gj/2HhYff9jHSPksqOg37QXncqagtWN7T+SrBqU6x8Otrgkhyig lIkG/mCw1ZgAFRBrVDDqOeLuRwOmGI00uUHCeU9jcjLSVbDcf00iRuuNqxMfvYWdKMuI1v tOTJUWmobq94PjvmzgPCYmUxd25koDs= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CVvb6Q2x; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf19.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=pbonzini@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689786739; a=rsa-sha256; cv=none; b=HUuJuqNgY+R4IUSkJGszT+SXRskLeF7kUCmOe9Umui6dtx1rkJSUvF8NGToQWedO3+eMuu 8LwLMBB5fj6UmNrzj/TyjN061UrWPOeNX2VREd0Kb1/IZiuK9a83pdGrlPdyaKYlMuINv/ uew5wzxfHLvj+vmjUCU4R06RWJ0ZbDo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689786738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=S9AsII7CY5MJTEaTaOHNT9YNASCGL4WKC7qHJSnopZQ=; b=CVvb6Q2xzzE0WQ8S6S3CxLhWgiMaVpw/K6F8OCQY1HbNUxJQXoNMRhSiyHfD+Q6ND9ypd3 pNJ2sm9dFrFn85+/nK9cOpEyVKSRLgAKugeBH5uL5EeOJqI/GlN0X9ljnlv5SH6C4dZth5 w5F0o4A0DYO3R9E8loL+LtsdKes73dA= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-393-mmqTgianPH27bBM1FC82uA-1; Wed, 19 Jul 2023 13:12:17 -0400 X-MC-Unique: mmqTgianPH27bBM1FC82uA-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-993c2d9e496so369539366b.0 for ; Wed, 19 Jul 2023 10:12:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689786736; x=1692378736; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=S9AsII7CY5MJTEaTaOHNT9YNASCGL4WKC7qHJSnopZQ=; b=kzkg1SdQJC5zPjBKFN/9yu9c7ry28Iu+Q/2P8DgtCg/9l8H7+gTQdRMgLDSCk0U09j Dasal4NPhokBUGx4pjDnGVnKwjW2G7LFsx+Azeu95RdEPcmF4NbwLAghRRscYljIPrFP M1kbp5sgV/++S+1uNyHTm1+oNpuDro5vbLUWCQpxYKwKN+nygM45Qttj0hF5/x4Ji/8F tEgjHnbd1QRGv9xVmXHK9vZgU9+b7PxNlBEPIS+OFY3cD1CfjD6GgfVFnFNVDj9+8Tf2 jFRMiYxQzmcqH48UDBMuWUG9AzvJQ0NOVTDf+ibJc6cVf8b30HcZYqmL3UfUza6k/tOn OAIw== X-Gm-Message-State: ABy/qLaYyVbzbPbui9lvsbk/lJ7OXMrwLarxDjFmWXtH4imvgCGmiySw 9QWVLqFrwLw4He4RR89sbW0nHIXPvm+lV41RFIO7Lj+bfwgu51ufHa4zO5/VZlLha5lrGtXKueg fk2UzqVUTYBg= X-Received: by 2002:a17:907:78c7:b0:993:336d:bc0c with SMTP id kv7-20020a17090778c700b00993336dbc0cmr3348311ejc.34.1689786736183; Wed, 19 Jul 2023 10:12:16 -0700 (PDT) X-Google-Smtp-Source: APBJJlEWH5lpXrWw3fibEqRX+XISeWU/0ydBla5bYBnTwaBnN76X92VTCl72XthCydwwSYBUr3ZDqg== X-Received: by 2002:a17:907:78c7:b0:993:336d:bc0c with SMTP id kv7-20020a17090778c700b00993336dbc0cmr3348255ejc.34.1689786735792; Wed, 19 Jul 2023 10:12:15 -0700 (PDT) Received: from ?IPV6:2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e? ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.googlemail.com with ESMTPSA id i16-20020a17090685d000b0099251942e1esm2561055ejy.119.2023.07.19.10.12.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 19 Jul 2023 10:12:15 -0700 (PDT) Message-ID: Date: Wed, 19 Jul 2023 19:12:12 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [RFC PATCH v11 03/29] KVM: Use gfn instead of hva for mmu_notifier_retry To: Sean Christopherson , Marc Zyngier , Oliver Upton , Huacai Chen , Michael Ellerman , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , "Matthew Wilcox (Oracle)" , Andrew Morton , Paul Moore , James Morris , "Serge E. Hallyn" Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Chao Peng , Fuad Tabba , Jarkko Sakkinen , Yu Zhang , Vishal Annapurve , Ackerley Tng , Maciej Szmigiero , Vlastimil Babka , David Hildenbrand , Quentin Perret , Michael Roth , Wang , Liam Merwick , Isaku Yamahata , "Kirill A . Shutemov" References: <20230718234512.1690985-1-seanjc@google.com> <20230718234512.1690985-4-seanjc@google.com> From: Paolo Bonzini In-Reply-To: <20230718234512.1690985-4-seanjc@google.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 802291A001A X-Stat-Signature: xh75xnz7c6ctihfuqx4sse73crw9ctox X-HE-Tag: 1689786739-931721 X-HE-Meta: U2FsdGVkX1+sAc/awprKvu5nmz80mrL82PwWysoFZsJ8oueme7eoknXmyebUp36XsSyQ849gDWp/odMVbMDUSI58VcEp0tq+RZyniatueflpgWgbpe1im4hBgejlA/IoAj0nSyrjR8+CIY4fERqtlns5VKPWi7ISNEF72UpuVjAjlIbYw/10/qklUb8QPpjPLc8pgM5zBxMxrf/MP13JXaubCDbxkOWud8TzK/sp1RUg5GfByefrH4j2G2R8FG5NRBVEC13LIVWgM7ISHxfwz6ZSiivZ8EbWJMEZeJ6f1VfRGxVMpx4Wjp1z3iitL4ABJzHqPFfwn9atH/JOI/5V8rM4zam/26W2+89Vz9CxRqfMtndJxn8dKwyAEdsf1/TtxjPsbobSGlRYVoEktbWJjPVFHfkqM9wL6Azpp2Evz9so82ow7a5UI0MNzV0ZrAv77uWYI0TntCVAC8MwIpVa4zNmCbaB4ar8fx5GxXDadLLRQoQ8ryicuug0UaEmtHvhFKnDB79BhuZX3t66z+V5alTVnJm9odiw7v5NvftirULQffPaDwkVWipQJQbw21e5Nh/Yemrm4F0YkXv+DvYbt7G/EjXE9268C7oXUYbPsYbOXu5QJJDbLsMi+aGYDyP5aDyXoFb8/UyOjDyS/t9+7i8KczpSZpjL68M3PfK5fWLfrhcA/U+3l9Vq289R0pMbdzb0B3eesmUh19dBDtZPKrUHSxFLdeAvk4kzTjgfKUVgMkgWxYVEwlTnmOzHP7zfhx0QbRO2Ug3nLejLxLcg2R8cowFvnO8XpzPvUXFqdlvuCnB5wwNMdeLDrqMl966ceDuu+YieN3qQZNac9Tl0d1hHIMrSKSjsuJtEGqZgyICYXhBC/QezVciZ9t6siXf1sXzv1RCC7qnP4t2kDdqdLkbwynEkWBnrYYrXJvnuEB2psO4tjA2/T5n13uDNtzmtAvf6E84WIZ/dgXu5jc2 q9qdOYTg 4Uhp1HrxJ+1PoIjLgZ9yirKqf+BiT5z7dq2EcqRuCPrXmfKSrklIl+dTDlzh+ZXjAbS98pcl5KKS/DKNizYVgWzT61ptOTQLEXJ7w48ZaxhomRQ6xQoWS+B+jpinVO1hl9TuV2mw7Fg4Yz5ZxBFaAEo8x2eW9I9X+vP6BSlYZmkijmQSXGV+d/fw9wvwyYqKha9RskWEJWx7yna0pHGT423oXZQ5/ewo56Ce3Oxp61KAxO/kBgvkSaJ97kbaW6qNo4s0W4RySVjo93dWcZI5a23H4gfbbqAYTxrxWJvmaLENKZ5JaquDH4H1xZTeB/9/Nc8M4dXdy5sELKVK/sEylOsMwevcJmc+AiNNjPaE0aJYceCDLH+nJyrlPUJ+ubkP6NH0PinAkifNp1bXTmnbjdzI6o4/mRrIWPk6afpfF4RD93WyHTEbMToyNfuCcK7ewu+3AeETvg+wooStWXdtgrnhCNzsPOkAljU7G7lur7BeEH5Fd8Zk3/Hlt5BzZxsRO2i///Cutuc0VriNWRweJQxZh3CHFlgutEflL X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 7/19/23 01:44, Sean Christopherson wrote: > From: Chao Peng > > Currently in mmu_notifier invalidate path, hva range is recorded and > then checked against by mmu_notifier_retry_hva() in the page fault > handling path. However, for the to be introduced private memory, a page > fault may not have a hva associated, checking gfn(gpa) makes more sense. > > For existing hva based shared memory, gfn is expected to also work. The > only downside is when aliasing multiple gfns to a single hva, the > current algorithm of checking multiple ranges could result in a much > larger range being rejected. Such aliasing should be uncommon, so the > impact is expected small. Reviewed-by: Paolo Bonzini > Suggested-by: Sean Christopherson > Signed-off-by: Chao Peng > Reviewed-by: Fuad Tabba > Tested-by: Fuad Tabba > [sean: convert vmx_set_apic_access_page_addr() to gfn-based API] > Signed-off-by: Sean Christopherson > --- > arch/x86/kvm/mmu/mmu.c | 10 ++++++---- > arch/x86/kvm/vmx/vmx.c | 11 +++++------ > include/linux/kvm_host.h | 33 +++++++++++++++++++++------------ > virt/kvm/kvm_main.c | 40 +++++++++++++++++++++++++++++++--------- > 4 files changed, 63 insertions(+), 31 deletions(-) > > diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c > index d72f2b20f430..b034727c4cf9 100644 > --- a/arch/x86/kvm/mmu/mmu.c > +++ b/arch/x86/kvm/mmu/mmu.c > @@ -3087,7 +3087,7 @@ static void direct_pte_prefetch(struct kvm_vcpu *vcpu, u64 *sptep) > * > * There are several ways to safely use this helper: > * > - * - Check mmu_invalidate_retry_hva() after grabbing the mapping level, before > + * - Check mmu_invalidate_retry_gfn() after grabbing the mapping level, before > * consuming it. In this case, mmu_lock doesn't need to be held during the > * lookup, but it does need to be held while checking the MMU notifier. > * > @@ -4400,7 +4400,7 @@ static bool is_page_fault_stale(struct kvm_vcpu *vcpu, > return true; > > return fault->slot && > - mmu_invalidate_retry_hva(vcpu->kvm, fault->mmu_seq, fault->hva); > + mmu_invalidate_retry_gfn(vcpu->kvm, fault->mmu_seq, fault->gfn); > } > > static int direct_page_fault(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault) > @@ -6301,7 +6301,9 @@ void kvm_zap_gfn_range(struct kvm *kvm, gfn_t gfn_start, gfn_t gfn_end) > > write_lock(&kvm->mmu_lock); > > - kvm_mmu_invalidate_begin(kvm, 0, -1ul); > + kvm_mmu_invalidate_begin(kvm); > + > + kvm_mmu_invalidate_range_add(kvm, gfn_start, gfn_end); > > flush = kvm_rmap_zap_gfn_range(kvm, gfn_start, gfn_end); > > @@ -6314,7 +6316,7 @@ void kvm_zap_gfn_range(struct kvm *kvm, gfn_t gfn_start, gfn_t gfn_end) > if (flush) > kvm_flush_remote_tlbs_range(kvm, gfn_start, gfn_end - gfn_start); > > - kvm_mmu_invalidate_end(kvm, 0, -1ul); > + kvm_mmu_invalidate_end(kvm); > > write_unlock(&kvm->mmu_lock); > } > diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c > index 0ecf4be2c6af..946380b53cf5 100644 > --- a/arch/x86/kvm/vmx/vmx.c > +++ b/arch/x86/kvm/vmx/vmx.c > @@ -6729,10 +6729,10 @@ static void vmx_set_apic_access_page_addr(struct kvm_vcpu *vcpu) > return; > > /* > - * Grab the memslot so that the hva lookup for the mmu_notifier retry > - * is guaranteed to use the same memslot as the pfn lookup, i.e. rely > - * on the pfn lookup's validation of the memslot to ensure a valid hva > - * is used for the retry check. > + * Explicitly grab the memslot using KVM's internal slot ID to ensure > + * KVM doesn't unintentionally grab a userspace memslot. It_should_ > + * be impossible for userspace to create a memslot for the APIC when > + * APICv is enabled, but paranoia won't hurt in this case. > */ > slot = id_to_memslot(slots, APIC_ACCESS_PAGE_PRIVATE_MEMSLOT); > if (!slot || slot->flags & KVM_MEMSLOT_INVALID) > @@ -6757,8 +6757,7 @@ static void vmx_set_apic_access_page_addr(struct kvm_vcpu *vcpu) > return; > > read_lock(&vcpu->kvm->mmu_lock); > - if (mmu_invalidate_retry_hva(kvm, mmu_seq, > - gfn_to_hva_memslot(slot, gfn))) { > + if (mmu_invalidate_retry_gfn(kvm, mmu_seq, gfn)) { > kvm_make_request(KVM_REQ_APIC_PAGE_RELOAD, vcpu); > read_unlock(&vcpu->kvm->mmu_lock); > goto out; > diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h > index b901571ab61e..90a0be261a5c 100644 > --- a/include/linux/kvm_host.h > +++ b/include/linux/kvm_host.h > @@ -788,8 +788,8 @@ struct kvm { > struct mmu_notifier mmu_notifier; > unsigned long mmu_invalidate_seq; > long mmu_invalidate_in_progress; > - unsigned long mmu_invalidate_range_start; > - unsigned long mmu_invalidate_range_end; > + gfn_t mmu_invalidate_range_start; > + gfn_t mmu_invalidate_range_end; > #endif > struct list_head devices; > u64 manual_dirty_log_protect; > @@ -1371,10 +1371,9 @@ void kvm_mmu_free_memory_cache(struct kvm_mmu_memory_cache *mc); > void *kvm_mmu_memory_cache_alloc(struct kvm_mmu_memory_cache *mc); > #endif > > -void kvm_mmu_invalidate_begin(struct kvm *kvm, unsigned long start, > - unsigned long end); > -void kvm_mmu_invalidate_end(struct kvm *kvm, unsigned long start, > - unsigned long end); > +void kvm_mmu_invalidate_begin(struct kvm *kvm); > +void kvm_mmu_invalidate_range_add(struct kvm *kvm, gfn_t start, gfn_t end); > +void kvm_mmu_invalidate_end(struct kvm *kvm); > > long kvm_arch_dev_ioctl(struct file *filp, > unsigned int ioctl, unsigned long arg); > @@ -1940,9 +1939,9 @@ static inline int mmu_invalidate_retry(struct kvm *kvm, unsigned long mmu_seq) > return 0; > } > > -static inline int mmu_invalidate_retry_hva(struct kvm *kvm, > +static inline int mmu_invalidate_retry_gfn(struct kvm *kvm, > unsigned long mmu_seq, > - unsigned long hva) > + gfn_t gfn) > { > lockdep_assert_held(&kvm->mmu_lock); > /* > @@ -1951,10 +1950,20 @@ static inline int mmu_invalidate_retry_hva(struct kvm *kvm, > * that might be being invalidated. Note that it may include some false > * positives, due to shortcuts when handing concurrent invalidations. > */ > - if (unlikely(kvm->mmu_invalidate_in_progress) && > - hva >= kvm->mmu_invalidate_range_start && > - hva < kvm->mmu_invalidate_range_end) > - return 1; > + if (unlikely(kvm->mmu_invalidate_in_progress)) { > + /* > + * Dropping mmu_lock after bumping mmu_invalidate_in_progress > + * but before updating the range is a KVM bug. > + */ > + if (WARN_ON_ONCE(kvm->mmu_invalidate_range_start == INVALID_GPA || > + kvm->mmu_invalidate_range_end == INVALID_GPA)) > + return 1; > + > + if (gfn >= kvm->mmu_invalidate_range_start && > + gfn < kvm->mmu_invalidate_range_end) > + return 1; > + } > + > if (kvm->mmu_invalidate_seq != mmu_seq) > return 1; > return 0; > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index 50aea855eeae..8101b11a13ba 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -518,9 +518,7 @@ static inline struct kvm *mmu_notifier_to_kvm(struct mmu_notifier *mn) > > typedef bool (*gfn_handler_t)(struct kvm *kvm, struct kvm_gfn_range *range); > > -typedef void (*on_lock_fn_t)(struct kvm *kvm, unsigned long start, > - unsigned long end); > - > +typedef void (*on_lock_fn_t)(struct kvm *kvm); > typedef void (*on_unlock_fn_t)(struct kvm *kvm); > > struct kvm_mmu_notifier_range { > @@ -617,7 +615,8 @@ static __always_inline int __kvm_handle_hva_range(struct kvm *kvm, > locked = true; > KVM_MMU_LOCK(kvm); > if (!IS_KVM_NULL_FN(range->on_lock)) > - range->on_lock(kvm, range->start, range->end); > + range->on_lock(kvm); > + > if (IS_KVM_NULL_FN(range->handler)) > break; > } > @@ -721,15 +720,26 @@ static void kvm_mmu_notifier_change_pte(struct mmu_notifier *mn, > kvm_handle_hva_range(mn, address, address + 1, pte, kvm_change_spte_gfn); > } > > -void kvm_mmu_invalidate_begin(struct kvm *kvm, unsigned long start, > - unsigned long end) > +void kvm_mmu_invalidate_begin(struct kvm *kvm) > { > + lockdep_assert_held_write(&kvm->mmu_lock); > /* > * The count increase must become visible at unlock time as no > * spte can be established without taking the mmu_lock and > * count is also read inside the mmu_lock critical section. > */ > kvm->mmu_invalidate_in_progress++; > + > + if (likely(kvm->mmu_invalidate_in_progress == 1)) > + kvm->mmu_invalidate_range_start = INVALID_GPA; > +} > + > +void kvm_mmu_invalidate_range_add(struct kvm *kvm, gfn_t start, gfn_t end) > +{ > + lockdep_assert_held_write(&kvm->mmu_lock); > + > + WARN_ON_ONCE(!kvm->mmu_invalidate_in_progress); > + > if (likely(kvm->mmu_invalidate_in_progress == 1)) { > kvm->mmu_invalidate_range_start = start; > kvm->mmu_invalidate_range_end = end; > @@ -750,6 +760,12 @@ void kvm_mmu_invalidate_begin(struct kvm *kvm, unsigned long start, > } > } > > +static bool kvm_mmu_unmap_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range) > +{ > + kvm_mmu_invalidate_range_add(kvm, range->start, range->end); > + return kvm_unmap_gfn_range(kvm, range); > +} > +