Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp7630824rwb; Tue, 6 Dec 2022 08:04:07 -0800 (PST) X-Google-Smtp-Source: AA0mqf6S/dqdpd6vSmAx3y1q/E6ABxo5Oz7CeobeIt3UUyCPMPWYiewDPEZJ1tPlN+ykGX7Tq3De X-Received: by 2002:a17:906:2a9a:b0:7bb:e82a:83d with SMTP id l26-20020a1709062a9a00b007bbe82a083dmr46292274eje.612.1670342647651; Tue, 06 Dec 2022 08:04:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670342647; cv=none; d=google.com; s=arc-20160816; b=p7ZP6hgvZacOJ/brclSnlh+OGqS76wUByQdNT+Eh7p7x74trdkvrGr8h5Zig7RhuQ0 yKHmuTmYta5zd/W7YbtszTG28L1pmv5W2GSoRuw0a8WClLYbY/E7zM4bi775SNSYPbhM +0aakDvWVGoIetvx5C6VQN7evTAlj/sN055J4u+ED7lZ1W3iLgz33XEHAY9aA8GPLVFS jKt6tUAm9YF0eCxJVyycq6VJ+c71fGOS4o0NO1bM0Yf3vxRqjiP8Y0DJWftWB4Y6VoF/ uM44CqEu3/rOl3UEiiwgLyJarwkFa+b1G8oRCG8JP3PLuy7aZw8JqyRPtQMVcUqR0Hqu cPKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=ZgXzVCO1OCRwjAZ65xIfYxlpH5JEmDjmLd1r8UgB90I=; b=Jl9QH4vVu8GlxcI/XVpHgZLGmn3A6gs+Vg9msgTs7lyirxx3hELpatkkTlyMql7c8m upvNui0nlafLw7BuHTxBkJDQcwqOHHGmgynnElk5TISZGbbVR0ch7qPlerPFl4Xdb5me 8PYxDyBcadZ5s1O/0P95921yOvpE9CEZa26igFLHaStQYK2aWZnwIfkFFv4isDsHMGlQ Y0zzyA9L+c0i+nl5EmOURq9wpo6brHHYatjxWYHY0EeulUDs0xe617lY4JxNV3mGbUzr 2xyXkKhisAOJo21k9f/9xKrhonKpWfhccFsF1NIsuic9yn+QKTYVNrG9+dR6UZpC9W55 Aj1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=YDlQIMLZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e8-20020a056402088800b0045dc9b4c034si2137204edy.582.2022.12.06.08.03.47; Tue, 06 Dec 2022 08:04:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=YDlQIMLZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233864AbiLFPt4 (ORCPT + 79 others); Tue, 6 Dec 2022 10:49:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233661AbiLFPta (ORCPT ); Tue, 6 Dec 2022 10:49:30 -0500 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B20A827FFB for ; Tue, 6 Dec 2022 07:49:28 -0800 (PST) Received: by mail-lj1-x234.google.com with SMTP id z4so17696494ljq.6 for ; Tue, 06 Dec 2022 07:49:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=ZgXzVCO1OCRwjAZ65xIfYxlpH5JEmDjmLd1r8UgB90I=; b=YDlQIMLZ1TrD8HLPFmpAy1nUjSqrC6DimAKnD5PX/9U/Hkfbl+PAuaqn6eyudePAL/ XdAO4Y2LJu8jK/u/vHUKJ4Yrg4Bu6CcI9Cp13NQSd4EEALaMTAF43oGOBbkSHLMWJZew VBVjPJhisKdIegVeU2j+I1gfsP+HHDHSdHqItbK0ObvCJ3vGHDcvYAVHdqiK+hpVDt6A aGqh+YFoCDDnlu6vbz0TU8iT9GjKwmc4omVbFWDhRxxhtyC86vojtae5sUA2v56QZaQS XofeqJgFBJ7sIBVYgxziNf/pL9NIeN66U/SJva0SZj6ungKTfSgVexSSbj4DvlFx82mM v0tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ZgXzVCO1OCRwjAZ65xIfYxlpH5JEmDjmLd1r8UgB90I=; b=6TayVA3K8fTsScaiUh9GPqc1jEi0lIliSVz+M4hqi4AkFDMN/rFu0ny5gRg6+Yx8Qk 5Rfi0PYL3ndxFhjrBwCrTW4arf9uEU42drZuCCQeh7f2CPlxaPQzJh6/3yybvLvUaGvd v46QV5gQIE9ibeaFzQT+LzTb7T45G/gxmimi7KiQOsO/DP2lIWaWuxms9IFEsNB30xkA m5jmNKXEIqMk6XefSJH6vQ/LkIpI4lAPtVJJFMoyb6geC0dkjhy4LpEYVlWFLywkq/BT XZ4k8vWQt4ooTA8w9CPWDVw21vbg3kVAvoWoodsjM9tlTFEonUm/HZ6N/Xzw1Wva0CAq +RvQ== X-Gm-Message-State: ANoB5pkkHUGLTYFgnDJjEejTqXqsO4qizTsFXEvpUVG4PCySAbvcY8L4 AqR/y3CId5lxr0Upq0IYmkjGflUqW1/6nc7I91EQFQ== X-Received: by 2002:a2e:964c:0:b0:279:f197:440d with SMTP id z12-20020a2e964c000000b00279f197440dmr4247034ljh.517.1670341766820; Tue, 06 Dec 2022 07:49:26 -0800 (PST) MIME-Version: 1.0 References: <20221202061347.1070246-1-chao.p.peng@linux.intel.com> <20221202061347.1070246-6-chao.p.peng@linux.intel.com> <20221206115623.GB1216605@chaop.bj.intel.com> In-Reply-To: <20221206115623.GB1216605@chaop.bj.intel.com> From: Fuad Tabba Date: Tue, 6 Dec 2022 15:48:50 +0000 Message-ID: Subject: Re: [PATCH v10 5/9] KVM: Use gfn instead of hva for mmu_notifier_retry To: Chao Peng Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-arch@vger.kernel.org, linux-api@vger.kernel.org, linux-doc@vger.kernel.org, qemu-devel@nongnu.org, Paolo Bonzini , Jonathan Corbet , Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Arnd Bergmann , Naoya Horiguchi , Miaohe Lin , x86@kernel.org, "H . Peter Anvin" , Hugh Dickins , Jeff Layton , "J . Bruce Fields" , Andrew Morton , Shuah Khan , Mike Rapoport , Steven Price , "Maciej S . Szmigiero" , Vlastimil Babka , Vishal Annapurve , Yu Zhang , "Kirill A . Shutemov" , luto@kernel.org, jun.nakajima@intel.com, dave.hansen@intel.com, ak@linux.intel.com, david@redhat.com, aarcange@redhat.com, ddutile@redhat.com, dhildenb@redhat.com, Quentin Perret , Michael Roth , mhocko@suse.com, wei.w.wang@intel.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-17.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL,USER_IN_DEF_SPF_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On Tue, Dec 6, 2022 at 12:01 PM Chao Peng wrote: > > On Mon, Dec 05, 2022 at 09:23:49AM +0000, Fuad Tabba wrote: > > Hi Chao, > > > > On Fri, Dec 2, 2022 at 6:19 AM Chao Peng wrote: > > > > > > 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. > > > > > > Suggested-by: Sean Christopherson > > > Signed-off-by: Chao Peng > > > --- > > > arch/x86/kvm/mmu/mmu.c | 8 +++++--- > > > include/linux/kvm_host.h | 33 +++++++++++++++++++++------------ > > > virt/kvm/kvm_main.c | 32 +++++++++++++++++++++++--------- > > > 3 files changed, 49 insertions(+), 24 deletions(-) > > > > > > diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c > > > index 4736d7849c60..e2c70b5afa3e 100644 > > > --- a/arch/x86/kvm/mmu/mmu.c > > > +++ b/arch/x86/kvm/mmu/mmu.c > > > @@ -4259,7 +4259,7 @@ static bool is_page_fault_stale(struct kvm_vcpu *vcpu, > > > return true; > > > > > > return fault->slot && > > > - mmu_invalidate_retry_hva(vcpu->kvm, mmu_seq, fault->hva); > > > + mmu_invalidate_retry_gfn(vcpu->kvm, mmu_seq, fault->gfn); > > > } > > > > > > static int direct_page_fault(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault) > > > @@ -6098,7 +6098,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, gfn_start, gfn_end); > > > + 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); > > > > > > @@ -6112,7 +6114,7 @@ void kvm_zap_gfn_range(struct kvm *kvm, gfn_t gfn_start, gfn_t gfn_end) > > > kvm_flush_remote_tlbs_with_address(kvm, gfn_start, > > > gfn_end - gfn_start); > > > > > > - kvm_mmu_invalidate_end(kvm, gfn_start, gfn_end); > > > + kvm_mmu_invalidate_end(kvm); > > > > > > write_unlock(&kvm->mmu_lock); > > > } > > > diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h > > > index 02347e386ea2..3d69484d2704 100644 > > > --- a/include/linux/kvm_host.h > > > +++ b/include/linux/kvm_host.h > > > @@ -787,8 +787,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; > > > @@ -1389,10 +1389,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); > > > @@ -1963,9 +1962,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); > > > /* > > > @@ -1974,10 +1973,20 @@ static inline int mmu_invalidate_retry_hva(struct kvm *kvm, > > > * that might be being invalidated. Note that it may include some false > > > > nit: "might be" (or) "is being" > > > > > * positives, due to shortcuts when handing concurrent invalidations. > > > > nit: handling > > Both are existing code, but I can fix it either. That was just a nit, please feel free to ignore it, especially if it might cause headaches in the future with merges. > > > > > > */ > > > - 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)) > > > > INVALID_GPA is an x86-specific define in > > arch/x86/include/asm/kvm_host.h, so this doesn't build on other > > architectures. The obvious fix is to move it to > > include/linux/kvm_host.h. > > Hmm, INVALID_GPA is defined as ZERO for x86, not 100% confident this is > correct choice for other architectures, but after search it has not been > used for other architectures, so should be safe to make it common. With this fixed, Reviewed-by: Fuad Tabba And the necessary work to port to arm64 (on qemu/arm64): Tested-by: Fuad Tabba Cheers, /fuad > > Thanks, > Chao > > > > Cheers, > > /fuad > > > > > + 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 b882eb2c76a2..ad55dfbc75d7 100644 > > > --- a/virt/kvm/kvm_main.c > > > +++ b/virt/kvm/kvm_main.c > > > @@ -540,9 +540,7 @@ static void kvm_mmu_notifier_invalidate_range(struct mmu_notifier *mn, > > > > > > typedef bool (*hva_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_hva_range { > > > @@ -628,7 +626,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; > > > } > > > @@ -715,8 +714,7 @@ static void kvm_mmu_notifier_change_pte(struct mmu_notifier *mn, > > > kvm_handle_hva_range(mn, address, address + 1, pte, kvm_set_spte_gfn); > > > } > > > > > > -void kvm_mmu_invalidate_begin(struct kvm *kvm, unsigned long start, > > > - unsigned long end) > > > +void kvm_mmu_invalidate_begin(struct kvm *kvm) > > > { > > > /* > > > * The count increase must become visible at unlock time as no > > > @@ -724,6 +722,17 @@ void kvm_mmu_invalidate_begin(struct kvm *kvm, unsigned long start, > > > * 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; > > > + kvm->mmu_invalidate_range_end = INVALID_GPA; > > > + } > > > +} > > > + > > > +void kvm_mmu_invalidate_range_add(struct kvm *kvm, gfn_t start, gfn_t end) > > > +{ > > > + 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; > > > @@ -744,6 +753,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); > > > +} > > > + > > > static int kvm_mmu_notifier_invalidate_range_start(struct mmu_notifier *mn, > > > const struct mmu_notifier_range *range) > > > { > > > @@ -752,7 +767,7 @@ static int kvm_mmu_notifier_invalidate_range_start(struct mmu_notifier *mn, > > > .start = range->start, > > > .end = range->end, > > > .pte = __pte(0), > > > - .handler = kvm_unmap_gfn_range, > > > + .handler = kvm_mmu_unmap_gfn_range, > > > .on_lock = kvm_mmu_invalidate_begin, > > > .on_unlock = kvm_arch_guest_memory_reclaimed, > > > .flush_on_ret = true, > > > @@ -791,8 +806,7 @@ static int kvm_mmu_notifier_invalidate_range_start(struct mmu_notifier *mn, > > > return 0; > > > } > > > > > > -void kvm_mmu_invalidate_end(struct kvm *kvm, unsigned long start, > > > - unsigned long end) > > > +void kvm_mmu_invalidate_end(struct kvm *kvm) > > > { > > > /* > > > * This sequence increase will notify the kvm page fault that > > > -- > > > 2.25.1 > > >