From 4d982f9b016015cdc8317337ae8e4bdef04d9e4f Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Wed, 21 Nov 2007 13:54:47 +0200
Subject: [PATCH] --- yaml --- r: 80772 b: refs/heads/master c:
 da928521b7a095e85f6ac92a6c106bca7e17625f h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/kvm/mmu.c         | 7 +++++++
 trunk/drivers/kvm/paging_tmpl.h | 5 ++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 92cde466ef05..0e784c8cb635 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fb07ddb183eb4728f240e09c3305d271ce61d48
+refs/heads/master: da928521b7a095e85f6ac92a6c106bca7e17625f
diff --git a/trunk/drivers/kvm/mmu.c b/trunk/drivers/kvm/mmu.c
index 346aa65a08d5..a9fed594ac58 100644
--- a/trunk/drivers/kvm/mmu.c
+++ b/trunk/drivers/kvm/mmu.c
@@ -218,6 +218,13 @@ static int is_rmap_pte(u64 pte)
 		&& pte != shadow_notrap_nonpresent_pte;
 }
 
+static gfn_t pse36_gfn_delta(u32 gpte)
+{
+	int shift = 32 - PT32_DIR_PSE36_SHIFT - PAGE_SHIFT;
+
+	return (gpte & PT32_DIR_PSE36_MASK) << shift;
+}
+
 static void set_shadow_pte(u64 *sptep, u64 spte)
 {
 #ifdef CONFIG_X86_64
diff --git a/trunk/drivers/kvm/paging_tmpl.h b/trunk/drivers/kvm/paging_tmpl.h
index 6f79ae87d0cf..dceb4b9137a4 100644
--- a/trunk/drivers/kvm/paging_tmpl.h
+++ b/trunk/drivers/kvm/paging_tmpl.h
@@ -149,6 +149,8 @@ static int FNAME(walk_addr)(struct guest_walker *walker,
 		    && (PTTYPE == 64 || is_pse(vcpu))) {
 			walker->gfn = gpte_to_gfn_pde(pte);
 			walker->gfn += PT_INDEX(addr, PT_PAGE_TABLE_LEVEL);
+			if (PTTYPE == 32 && is_cpuid_PSE36())
+				walker->gfn += pse36_gfn_delta(pte);
 			break;
 		}
 
@@ -320,9 +322,6 @@ static void FNAME(set_pde)(struct kvm_vcpu *vcpu, pt_element_t gpde,
 
 	access_bits &= gpde;
 	gaddr = (gpa_t)gfn << PAGE_SHIFT;
-	if (PTTYPE == 32 && is_cpuid_PSE36())
-		gaddr |= (gpde & PT32_DIR_PSE36_MASK) <<
-			(32 - PT32_DIR_PSE36_SHIFT);
 	FNAME(set_pte_common)(vcpu, shadow_pte, gaddr,
 			      gpde, access_bits, user_fault, write_fault,
 			      ptwrite, walker, gfn);