linux-kernel - [PATCH 3/3] KVM: MMU: consider host cache type in MMIO pfn check

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Fri, 27 Oct 2017 10:25:24 +0800
From:   Haozhong Zhang <haozhong.zhang@...el.com>
To:     kvm@...r.kernel.org, x86@...nel.org
Cc:     linux-kernel@...r.kernel.org, Paolo Bonzini <pbonzini@...hat.com>,
        rkrcmar@...hat.com, Xiao Guangrong <xiaoguangrong.eric@...il.com>,
        Dan Williams <dan.j.williams@...el.com>,
        ivan.d.cuevas.escareno@...el.com, karthik.kumar@...el.com,
        Haozhong Zhang <haozhong.zhang@...el.com>
Subject: [PATCH 3/3] KVM: MMU: consider host cache type in MMIO pfn check

By default, KVM treats a reserved page as for MMIO purpose, and maps
it to guest with UC memory type.  However, some reserved pages are not
for MMIO, such as pages of DAX device (e.g., /dev/daxX.Y). Mapping
them with UC memory type will harm the performance.  In order to
exclude those cases, we check the host cache mode in addition and only
treat UC/UC- pages as MMIO.

Signed-off-by: Haozhong Zhang <haozhong.zhang@...el.com>
Reported-by: Cuevas Escareno, Ivan D <ivan.d.cuevas.escareno@...el.com>
Reported-by: Kumar, Karthik <karthik.kumar@...el.com>
---
 arch/x86/kvm/mmu.c | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 0b481cc9c725..d4c821a6df3d 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -2707,10 +2707,36 @@ static bool mmu_need_write_protect(struct kvm_vcpu *vcpu, gfn_t gfn,
 
 static bool kvm_is_mmio_pfn(kvm_pfn_t pfn)
 {
-	if (pfn_valid(pfn))
-		return !is_zero_pfn(pfn) && PageReserved(pfn_to_page(pfn));
+	bool is_mmio = true;
 
-	return true;
+	if (pfn_valid(pfn)) {
+		is_mmio = !is_zero_pfn(pfn) && PageReserved(pfn_to_page(pfn));
+
+		/*
+		 * By default, KVM treats a reserved page as for MMIO
+		 * purpose, and maps it to guest with UC memory type.
+		 * However, some reserved pages are not for MMIO, such
+		 * as pages of DAX device (e.g., /dev/daxX.Y). Mapping
+		 * them with UC memory type will harm the performance.
+		 * In order to exclude those cases, we check the host
+		 * cache mode in addition and only treat UC/UC- pages
+		 * as MMIO.
+		 *
+		 * track_pfn_insert() works only when PAT is enabled,
+		 * so add pat_enabled() here.
+		 */
+		if (is_mmio && pat_enabled()) {
+			pgprot_t prot;
+			enum page_cache_mode cm;
+
+			track_pfn_insert(NULL, &prot, kvm_pfn_to_pfn(pfn));
+			cm = pgprot2cachemode(prot);
+			is_mmio = (cm == _PAGE_CACHE_MODE_UC ||
+				   cm == _PAGE_CACHE_MODE_UC_MINUS);
+		}
+	}
+
+	return is_mmio;
 }
 
 static int set_spte(struct kvm_vcpu *vcpu, u64 *sptep,
-- 
2.14.1