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 F0539C27C76 for ; Sat, 28 Jan 2023 14:02:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2E9A86B0072; Sat, 28 Jan 2023 09:02:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 29A2A6B0073; Sat, 28 Jan 2023 09:02:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 161EE6B0074; Sat, 28 Jan 2023 09:02:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 07EFC6B0072 for ; Sat, 28 Jan 2023 09:02:58 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id BB0504046E for ; Sat, 28 Jan 2023 14:02:57 +0000 (UTC) X-FDA: 80404373994.19.609123C Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by imf24.hostedemail.com (Postfix) with ESMTP id E4A65180018 for ; Sat, 28 Jan 2023 14:02:53 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="ns4I7/Em"; spf=none (imf24.hostedemail.com: domain of chao.p.peng@linux.intel.com has no SPF policy when checking 134.134.136.100) smtp.mailfrom=chao.p.peng@linux.intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1674914574; h=from:from:sender:reply-to: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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Ras75PRLAQ0xRUo5ccjrfggePYF9kswGmqvqw+nt10I=; b=avxVVz3C8Bu6Al6aqysjLrd1fuhCuvH/rredF0tNyLOWBpJJUu6WekUOixVKkW1bvUKvIg j/bwBlh832DEjPsPtdxGNJJcOOLdHfPfuMvBXSiRsLaAzFJmbjZ9JfphtUrwUqNbWe2lWZ YQ0K/W2URvJLBeXbchboXInXFPo7TKc= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="ns4I7/Em"; spf=none (imf24.hostedemail.com: domain of chao.p.peng@linux.intel.com has no SPF policy when checking 134.134.136.100) smtp.mailfrom=chao.p.peng@linux.intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1674914574; a=rsa-sha256; cv=none; b=SX3CZpAilin3XTILV8OSyrD9pd72JRDzMWJNiLyCywSk4aNS31tJaP0Vj/Gow1WKDzCDCp qI3qtrLIwj/bsNPJyJ4zoHX9PaLp5dJmkT5wRxr24plDMliYIJUq0JnWUmduoo2M9zinFk w0hz86UjL5rTPbDnovb7nSvHzipG32M= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674914574; x=1706450574; h=date:from:to:cc:subject:message-id:reply-to:references: mime-version:in-reply-to; bh=Kc8vJ3FvU/EJ0EkuHD1xOBQzKplcG7pKfCLj/xSsBkU=; b=ns4I7/Em+Rqn6L8qTfgdStAijhQQ6Imz0Jw7EfCzxSjhJjFH5bvy3799 c1QhzCavAOAJ7t/8eE5mQqvX1hxD7SjUf9kNBvjMacneGsV9yGh77ethn s7Go9ReNeCrNFMnMR2S7Lpdo6IhE+C3lPhnB9k98ObiR1k0+jsGa9+Q3e uFlOsPp56Jqtn/PCX1aroZS70G0bBeTzNkJs+NY+IukR3CdfjjCMmskfO /Rd4VxmJWH/YiwFjIj00HNoLXf1aCcl31u59KXHl3kNIeD/KUMGI9BwFP KnSKkgbRP1pu35rPz9+6isudEPLw7V5CQ+MEUhadxd7apSdapySH9iRxD A==; X-IronPort-AV: E=McAfee;i="6500,9779,10604"; a="391846273" X-IronPort-AV: E=Sophos;i="5.97,254,1669104000"; d="scan'208";a="391846273" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jan 2023 06:02:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10604"; a="908979126" X-IronPort-AV: E=Sophos;i="5.97,254,1669104000"; d="scan'208";a="908979126" Received: from chaop.bj.intel.com (HELO localhost) ([10.240.192.105]) by fmsmga006.fm.intel.com with ESMTP; 28 Jan 2023 06:02:39 -0800 Date: Sat, 28 Jan 2023 21:54:54 +0800 From: Chao Peng To: Sean Christopherson 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 , 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 , tabba@google.com, Michael Roth , mhocko@suse.com, wei.w.wang@intel.com Subject: Re: [PATCH v10 7/9] KVM: Update lpage info when private/shared memory are mixed Message-ID: <20230128135454.GA700688@chaop.bj.intel.com> Reply-To: Chao Peng References: <20221202061347.1070246-1-chao.p.peng@linux.intel.com> <20221202061347.1070246-8-chao.p.peng@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Stat-Signature: n9nhh8hatshzyztxspc9csmosdwewben X-Rspam-User: X-Rspamd-Queue-Id: E4A65180018 X-Rspamd-Server: rspam06 X-HE-Tag: 1674914573-518357 X-HE-Meta: U2FsdGVkX18BdYrHMvdpr8WP302G/Jx+Y9qqsZKXs3nnj0u6xvi8uARZmhopAGKx9Wf38FQp7UHN1RvznBmMnXki5K0D961MzOHeydFK++1+SWaOjMtnA/5SBQ53fbyf7Scu8KVzubiroA2YkfD5m5iIlgMEY1JwxAQa7j7Y3+CaOqKTxhxCYTG8he0R++QcAMfXPMAkC44b6LsxWuvNXmxm3yq+hLp9FYgJsymaVvmTG5vQDKybirjKewW+tT8tyDVtNqBSdQe5JyIfR2xu4vELkWVEq75TWEF9BgQH3jWbGTaovgSLtgPQ8iTEmYeIYrZGrXUMO1DYNzK5aXDxLXdXGpThdLQ1au35vlgq0hiqRco0xfz4EuCTwI3UHlGZZ+OTVxjpK31jQR2Dk3Gf+YIfKimV0R8Iy1nU7UgDzpiTwyAmocnr+fL+MKwNws+onOilClGBygjsgMBnEpsZlsmBzaORcdiGSWsHuax+7Qo1mn1SEbPvr84b7IaOjG4eunWDUA29MnCcoJ9xBqgfo/GuiWsp9brfuAaVV5n29E5NAVZPHUoLIj9sYbq+HBbXTiD//3fUwXRHLg/VG2YZpfa1b1dHnc9bMNJkQ0k7SjUs3vpqo1TG7c9f9u1MEqQ6Kzr5VxlHCZRtjtE2HuUIKjq20UA1FPWHfjEP7F+nMqPHNZWh0EioJh3ZPfcoY13e+u4yZdaYg7rYFIHRwlXWsrIWOQc8vzfl06ihmY1QAgbdCe4vvso43R9Dnilowq0ajWBbmP0KQR8+zTlOiaAgSjcHvK8GV/wwIYW+OjhsHpKUlDX6Dq+V82Z0sy0BvAuNJf4tX75e13TO0RenaPwGVqd3fh9Qi8uPvarqOKeywfGR1FIAsEuVVrJ0KJV+RwxvL0etuOnhKDeFQRPG5Q0y4aVQcXyejM2/qN75cCrF56CJhyCcjAQZzKbG4LiaEdQstFVzfCirk0Ttrm4STeD NeMXexzJ QjCvdAARYyLrs8KfnhXoXASbGp9VvXW98XtKPS0Oe/KdgwrK9zDE2XdjjAi9pgTDL/n2brtv0fVv5oiJrzGumCt4gXpg+zVGYop43oT3SLKVaTYBP4bTwCf/4tr1FNHi+o+27TqLgVMX6NWhshJYUCb13n+CzxE4wQo9gybEuiRM2oOfU/PlTQ3uYzTXVo34VFH1HGl9giJ5+2jq4ke9bNLIHS5z79nlx+KuzFscieb1HkK5rnyfxtlgcG1DyclLci4yc 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 Fri, Jan 13, 2023 at 11:16:27PM +0000, Sean Christopherson wrote: > On Fri, Dec 02, 2022, Chao Peng wrote: > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > > index 9a07380f8d3c..5aefcff614d2 100644 > > --- a/arch/x86/kvm/x86.c > > +++ b/arch/x86/kvm/x86.c > > @@ -12362,6 +12362,8 @@ static int kvm_alloc_memslot_metadata(struct kvm *kvm, > > if ((slot->base_gfn + npages) & (KVM_PAGES_PER_HPAGE(level) - 1)) > > linfo[lpages - 1].disallow_lpage = 1; > > ugfn = slot->userspace_addr >> PAGE_SHIFT; > > + if (kvm_slot_can_be_private(slot)) > > + ugfn |= slot->restricted_offset >> PAGE_SHIFT; > > /* > > * If the gfn and userspace address are not aligned wrt each > > * other, disable large page support for this slot. > > Forgot to talk about the bug. This code needs to handle the scenario where a > memslot is created with existing, non-uniform attributes. It might be a bit ugly > (I didn't even try to write the code), but it's definitely possible, and since > memslot updates are already slow I think it's best to handle things here. > > In the meantime, I added this so we don't forget to fix it before merging. > > #ifdef CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES > pr_crit_once("FIXME: Walk the memory attributes of the slot and set the mixed status appropriately"); > #endif Here is the code to fix (based on your latest github repo). diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index e552374f2357..609ff1cba9c5 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2195,4 +2195,9 @@ int memslot_rmap_alloc(struct kvm_memory_slot *slot, unsigned long npages); KVM_X86_QUIRK_FIX_HYPERCALL_INSN | \ KVM_X86_QUIRK_MWAIT_NEVER_UD_FAULTS) +#ifdef CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES +void kvm_memory_attributes_create_memslot(struct kvm *kvm, + struct kvm_memory_slot *slot); +#endif + #endif /* _ASM_X86_KVM_HOST_H */ diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index eda615f3951c..8833d7201e41 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -7201,10 +7201,11 @@ static bool has_mixed_attrs(struct kvm *kvm, struct kvm_memory_slot *slot, return false; } -void kvm_arch_set_memory_attributes(struct kvm *kvm, - struct kvm_memory_slot *slot, - unsigned long attrs, - gfn_t start, gfn_t end) +static void kvm_update_lpage_mixed_flag(struct kvm *kvm, + struct kvm_memory_slot *slot, + bool set_attrs, + unsigned long attrs, + gfn_t start, gfn_t end) { unsigned long pages, mask; gfn_t gfn, gfn_end, first, last; @@ -7231,25 +7232,53 @@ void kvm_arch_set_memory_attributes(struct kvm *kvm, first = start & mask; last = (end - 1) & mask; - /* - * We only need to scan the head and tail page, for middle pages - * we know they will not be mixed. - */ + /* head page */ gfn = max(first, slot->base_gfn); gfn_end = min(first + pages, slot->base_gfn + slot->npages); + if(!set_attrs) + attrs = kvm_get_memory_attributes(kvm, gfn); mixed = has_mixed_attrs(kvm, slot, level, attrs, gfn, gfn_end); linfo_update_mixed(gfn, slot, level, mixed); if (first == last) return; - for (gfn = first + pages; gfn < last; gfn += pages) - linfo_update_mixed(gfn, slot, level, false); + /* middle pages */ + for (gfn = first + pages; gfn < last; gfn += pages) { + if (set_attrs) { + mixed = false; + } else { + gfn_end = gfn + pages; + attrs = kvm_get_memory_attributes(kvm, gfn); + mixed = has_mixed_attrs(kvm, slot, level, attrs, + gfn, gfn_end); + } + linfo_update_mixed(gfn, slot, level, mixed); + } + /* tail page */ gfn = last; gfn_end = min(last + pages, slot->base_gfn + slot->npages); + if(!set_attrs) + attrs = kvm_get_memory_attributes(kvm, gfn); mixed = has_mixed_attrs(kvm, slot, level, attrs, gfn, gfn_end); linfo_update_mixed(gfn, slot, level, mixed); } } + +void kvm_arch_set_memory_attributes(struct kvm *kvm, + struct kvm_memory_slot *slot, + unsigned long attrs, + gfn_t start, gfn_t end) +{ + kvm_update_lpage_mixed_flag(kvm, slot, true, attrs, start, end); +} + +void kvm_memory_attributes_create_memslot(struct kvm *kvm, + struct kvm_memory_slot *slot) +{ + + kvm_update_lpage_mixed_flag(kvm, slot, false, 0, slot->base_gfn, + slot->base_gfn + slot->npages); +} #endif diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 268c3d16894d..c1074aecf2d0 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -12443,7 +12443,7 @@ static int kvm_alloc_memslot_metadata(struct kvm *kvm, } #ifdef CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES - pr_crit_once("FIXME: Walk the memory attributes of the slot and set the mixed status appropriately"); + kvm_memory_attributes_create_memslot(kvm, slot); #endif if (kvm_page_track_create_memslot(kvm, slot, npages))