From: David Hildenbrand <david@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: "Kate Stewart" <kstewart@linuxfoundation.org>,
"Sasha Levin" <sashal@kernel.org>,
linux-hyperv@vger.kernel.org, "Michal Hocko" <mhocko@suse.com>,
"Radim Krčmář" <rkrcmar@redhat.com>,
kvm@vger.kernel.org, "David Hildenbrand" <david@redhat.com>,
"KarimAllah Ahmed" <karahmed@amazon.de>,
"Dave Hansen" <dave.hansen@linux.intel.com>,
"Alexander Duyck" <alexander.duyck@gmail.com>,
"Michal Hocko" <mhocko@kernel.org>,
linux-mm@kvack.org,
"Pavel Tatashin" <pavel.tatashin@microsoft.com>,
"Paul Mackerras" <paulus@samba.org>,
"H. Peter Anvin" <hpa@zytor.com>,
"Wanpeng Li" <wanpengli@tencent.com>,
"Alexander Duyck" <alexander.h.duyck@linux.intel.com>,
"K. Y. Srinivasan" <kys@microsoft.com>,
"Fabio Estevam" <festevam@gmail.com>,
"Ben Chan" <benchan@chromium.org>,
"Kees Cook" <keescook@chromium.org>,
devel@driverdev.osuosl.org,
"Stefano Stabellini" <sstabellini@kernel.org>,
"Stephen Hemminger" <sthemmin@microsoft.com>,
"Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>,
"Joerg Roedel" <joro@8bytes.org>,
x86@kernel.org, YueHaibing <yuehaibing@huawei.com>,
"Mike Rapoport" <rppt@linux.ibm.com>,
"Madhumitha Prabakaran" <madhumithabiw@gmail.com>,
"Peter Zijlstra" <peterz@infradead.org>,
"Ingo Molnar" <mingo@redhat.com>,
"Vlastimil Babka" <vbabka@suse.cz>,
"Nishka Dasgupta" <nishkadg.linux@gmail.com>,
"Anthony Yznaga" <anthony.yznaga@oracle.com>,
"Oscar Salvador" <osalvador@suse.de>,
"Dan Carpenter" <dan.carpenter@oracle.com>,
"Isaac J. Manjarres" <isaacm@codeaurora.org>,
"Matt Sickler" <Matt.Sickler@daktronics.com>,
"Juergen Gross" <jgross@suse.com>,
"Anshuman Khandual" <anshuman.khandual@arm.com>,
"Haiyang Zhang" <haiyangz@microsoft.com>,
"Simon Sandström" <simon@nikanor.nu>,
"Dan Williams" <dan.j.williams@intel.com>,
kvm-ppc@vger.kernel.org, "Qian Cai" <cai@lca.pw>,
"Alex Williamson" <alex.williamson@redhat.com>,
"Mike Rapoport" <rppt@linux.vnet.ibm.com>,
"Borislav Petkov" <bp@alien8.de>,
"Nicholas Piggin" <npiggin@gmail.com>,
"Andy Lutomirski" <luto@kernel.org>,
xen-devel@lists.xenproject.org,
"Boris Ostrovsky" <boris.ostrovsky@oracle.com>,
"Todd Poynor" <toddpoynor@google.com>,
"Vitaly Kuznetsov" <vkuznets@redhat.com>,
"Allison Randal" <allison@lohutok.net>,
"Jim Mattson" <jmattson@google.com>,
"Vandana BN" <bnvandana@gmail.com>,
"Jeremy Sowden" <jeremy@azazel.net>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Cornelia Huck" <cohuck@redhat.com>,
"Pavel Tatashin" <pasha.tatashin@soleen.com>,
"Mel Gorman" <mgorman@techsingularity.net>,
"Sean Christopherson" <sean.j.christopherson@intel.com>,
"Rob Springer" <rspringer@google.com>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Johannes Weiner" <hannes@cmpxchg.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Andrew Morton" <akpm@linux-foundation.org>,
linuxppc-dev@lists.ozlabs.org
Subject: [PATCH RFC v1 03/12] KVM: x86/mmu: Prepare kvm_is_mmio_pfn() for PG_reserved changes
Date: Tue, 22 Oct 2019 19:12:30 +0200 [thread overview]
Message-ID: <20191022171239.21487-4-david@redhat.com> (raw)
In-Reply-To: <20191022171239.21487-1-david@redhat.com>
Right now, ZONE_DEVICE memory is always set PG_reserved. We want to
change that.
KVM has this weird use case that you can map anything from /dev/mem
into the guest. pfn_valid() is not a reliable check whether the memmap
was initialized and can be touched. pfn_to_online_page() makes sure
that we have an initialized memmap - however, there is no reliable and
fast check to detect memmaps that were initialized and are ZONE_DEVICE.
Let's rewrite kvm_is_mmio_pfn() so we really only touch initialized
memmaps that are guaranteed to not contain garbage. Make sure that
RAM without a memmap is still not detected as MMIO and that ZONE_DEVICE
that is not UC/UC-/WC is not detected as MMIO.
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Radim Krčmář" <rkrcmar@redhat.com>
Cc: Sean Christopherson <sean.j.christopherson@intel.com>
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Cc: Wanpeng Li <wanpengli@tencent.com>
Cc: Jim Mattson <jmattson@google.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: KarimAllah Ahmed <karahmed@amazon.de>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
arch/x86/kvm/mmu.c | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 24c23c66b226..795869ffd4bb 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -2962,20 +2962,26 @@ static bool mmu_need_write_protect(struct kvm_vcpu *vcpu, gfn_t gfn,
static bool kvm_is_mmio_pfn(kvm_pfn_t pfn)
{
+ struct page *page = pfn_to_online_page(pfn);
+
+ /*
+ * Online pages consist of pages managed by the buddy. Especially,
+ * ZONE_DEVICE pages are never online. Online pages that are reserved
+ * indicate the zero page and MMIO pages.
+ */
+ if (page)
+ return !is_zero_pfn(pfn) && PageReserved(pfn_to_page(pfn));
+
+ /*
+ * Anything with a valid memmap could be ZONE_DEVICE - or the
+ * memmap could be uninitialized. Treat only UC/UC-/WC pages as MMIO.
+ */
if (pfn_valid(pfn))
- return !is_zero_pfn(pfn) && PageReserved(pfn_to_page(pfn)) &&
- /*
- * Some reserved pages, such as those from NVDIMM
- * DAX devices, are not for MMIO, and can be mapped
- * with cached memory type for better performance.
- * However, the above check misconceives those pages
- * as MMIO, and results in KVM mapping them with UC
- * memory type, which would hurt the performance.
- * Therefore, we check the host memory type in addition
- * and only treat UC/UC-/WC pages as MMIO.
- */
- (!pat_enabled() || pat_pfn_immune_to_uc_mtrr(pfn));
+ return !pat_enabled() || pat_pfn_immune_to_uc_mtrr(pfn);
+ /*
+ * Any RAM that has no memmap (e.g., mapped via /dev/mem) is not MMIO.
+ */
return !e820__mapped_raw_any(pfn_to_hpa(pfn),
pfn_to_hpa(pfn + 1) - 1,
E820_TYPE_RAM);
--
2.21.0
next prev parent reply other threads:[~2019-10-22 18:30 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-22 17:12 [PATCH RFC v1 00/12] mm: Don't mark hotplugged pages PG_reserved (including ZONE_DEVICE) David Hildenbrand
2019-10-22 17:12 ` [PATCH RFC v1 01/12] mm/memory_hotplug: Don't allow to online/offline memory blocks with holes David Hildenbrand
2019-10-24 3:53 ` Anshuman Khandual
2019-10-24 7:55 ` David Hildenbrand
2019-10-22 17:12 ` [PATCH RFC v1 02/12] mm/usercopy.c: Prepare check_page_span() for PG_reserved changes David Hildenbrand
2019-10-23 8:20 ` David Hildenbrand
2019-10-23 16:25 ` Kees Cook
2019-10-23 16:32 ` David Hildenbrand
2019-10-22 17:12 ` David Hildenbrand [this message]
2019-10-22 17:12 ` [PATCH RFC v1 04/12] KVM: Prepare kvm_is_reserved_pfn() " David Hildenbrand
2019-10-22 17:12 ` [PATCH RFC v1 05/12] vfio/type1: Prepare is_invalid_reserved_pfn() " David Hildenbrand
2019-10-22 17:12 ` [PATCH RFC v1 06/12] staging/gasket: Prepare gasket_release_page() " David Hildenbrand
2019-10-23 8:17 ` David Hildenbrand
2019-10-22 17:12 ` [PATCH RFC v1 07/12] staging: kpc2000: Prepare transfer_complete_cb() " David Hildenbrand
2019-10-22 17:55 ` Matt Sickler
2019-10-22 21:01 ` David Hildenbrand
2019-10-22 17:12 ` [PATCH RFC v1 08/12] powerpc/book3s: Prepare kvmppc_book3s_instantiate_page() " David Hildenbrand
2019-10-22 17:12 ` [PATCH RFC v1 09/12] powerpc/64s: Prepare hash_page_do_lazy_icache() " David Hildenbrand
2019-10-22 17:12 ` [PATCH RFC v1 10/12] powerpc/mm: Prepare maybe_pte_to_page() " David Hildenbrand
2019-10-22 17:12 ` [PATCH RFC v1 11/12] x86/mm: Prepare __ioremap_check_ram() " David Hildenbrand
2019-10-22 17:12 ` [PATCH RFC v1 12/12] mm/memory_hotplug: Don't mark pages PG_reserved when initializing the memmap David Hildenbrand
2019-10-22 21:54 ` [PATCH RFC v1 00/12] mm: Don't mark hotplugged pages PG_reserved (including ZONE_DEVICE) Dan Williams
2019-10-23 7:26 ` David Hildenbrand
2019-10-23 17:09 ` Dan Williams
2019-10-23 17:27 ` David Hildenbrand
2019-10-23 19:39 ` Dan Williams
2019-10-23 21:22 ` David Hildenbrand
2019-10-24 12:50 ` David Hildenbrand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191022171239.21487-4-david@redhat.com \
--to=david@redhat.com \
--cc=Matt.Sickler@daktronics.com \
--cc=akpm@linux-foundation.org \
--cc=alex.williamson@redhat.com \
--cc=alexander.duyck@gmail.com \
--cc=alexander.h.duyck@linux.intel.com \
--cc=allison@lohutok.net \
--cc=aneesh.kumar@linux.ibm.com \
--cc=anshuman.khandual@arm.com \
--cc=anthony.yznaga@oracle.com \
--cc=benchan@chromium.org \
--cc=bnvandana@gmail.com \
--cc=boris.ostrovsky@oracle.com \
--cc=bp@alien8.de \
--cc=cai@lca.pw \
--cc=cohuck@redhat.com \
--cc=dan.carpenter@oracle.com \
--cc=dan.j.williams@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=devel@driverdev.osuosl.org \
--cc=festevam@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=haiyangz@microsoft.com \
--cc=hannes@cmpxchg.org \
--cc=hpa@zytor.com \
--cc=isaacm@codeaurora.org \
--cc=jeremy@azazel.net \
--cc=jgross@suse.com \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=karahmed@amazon.de \
--cc=keescook@chromium.org \
--cc=kstewart@linuxfoundation.org \
--cc=kvm-ppc@vger.kernel.org \
--cc=kvm@vger.kernel.org \
--cc=kys@microsoft.com \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=luto@kernel.org \
--cc=madhumithabiw@gmail.com \
--cc=mgorman@techsingularity.net \
--cc=mhocko@kernel.org \
--cc=mhocko@suse.com \
--cc=mingo@redhat.com \
--cc=nishkadg.linux@gmail.com \
--cc=npiggin@gmail.com \
--cc=osalvador@suse.de \
--cc=pasha.tatashin@soleen.com \
--cc=paulus@samba.org \
--cc=pavel.tatashin@microsoft.com \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=rkrcmar@redhat.com \
--cc=rppt@linux.ibm.com \
--cc=rppt@linux.vnet.ibm.com \
--cc=rspringer@google.com \
--cc=sashal@kernel.org \
--cc=sean.j.christopherson@intel.com \
--cc=simon@nikanor.nu \
--cc=sstabellini@kernel.org \
--cc=sthemmin@microsoft.com \
--cc=tglx@linutronix.de \
--cc=toddpoynor@google.com \
--cc=vbabka@suse.cz \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.org \
--cc=yuehaibing@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).