rpms/kernel/devel linux-2.6-ksm-kvm.patch,1.1,1.2

[jforbes]

Author: jforbes

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19821

Modified Files:
	linux-2.6-ksm-kvm.patch 
Log Message:
KSM update for missed merge

linux-2.6-ksm-kvm.patch:
 arch/x86/include/asm/kvm_host.h |    1 
 arch/x86/kvm/mmu.c              |   89 ++++++++++++++++++++++++++++++++--------
 arch/x86/kvm/paging_tmpl.h      |   15 +++++-
 virt/kvm/kvm_main.c             |   14 ++++++
 4 files changed, 100 insertions(+), 19 deletions(-)

Index: linux-2.6-ksm-kvm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-ksm-kvm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-ksm-kvm.patch	23 Jul 2009 18:25:23 -0000	1.1
+++ linux-2.6-ksm-kvm.patch	23 Jul 2009 20:42:08 -0000	1.2
@@ -22,8 +22,8 @@ directly map pages into its shadow page 
 Signed-off-by: Izik Eidus <ieidus at redhat.com>
 Signed-off-by: Justin M. Forbes <jforbes at redhat.com>
 ---
---- linux-2.6.30.x86_64/arch/x86/include/asm/kvm_host.h	2009-07-23 11:24:43.000000000 -0500
-+++ linux-2.6.30.x86_64-ksm/arch/x86/include/asm/kvm_host.h	2009-07-23 12:43:57.000000000 -0500
+--- linux-2.6.30.x86_64/arch/x86/include/asm/kvm_host.h	2009-07-23 14:58:56.000000000 -0500
++++ linux-2.6.30.x86_64-ksm/arch/x86/include/asm/kvm_host.h	2009-07-23 15:00:04.000000000 -0500
 @@ -796,5 +796,6 @@ asmlinkage void kvm_handle_fault_on_rebo
  int kvm_unmap_hva(struct kvm *kvm, unsigned long hva);
  int kvm_age_hva(struct kvm *kvm, unsigned long hva);
@@ -31,8 +31,8 @@ Signed-off-by: Justin M. Forbes <jforbes
 +void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);
  
  #endif /* _ASM_X86_KVM_HOST_H */
---- linux-2.6.30.x86_64/arch/x86/kvm/mmu.c	2009-07-23 11:24:43.000000000 -0500
-+++ linux-2.6.30.x86_64-ksm/arch/x86/kvm/mmu.c	2009-07-23 12:42:36.000000000 -0500
+--- linux-2.6.30.x86_64/arch/x86/kvm/mmu.c	2009-07-23 14:58:56.000000000 -0500
++++ linux-2.6.30.x86_64-ksm/arch/x86/kvm/mmu.c	2009-07-23 15:00:04.000000000 -0500
 @@ -139,6 +139,8 @@ module_param(oos_shadow, bool, 0644);
  #define ACC_USER_MASK    PT_USER_MASK
  #define ACC_ALL          (ACC_EXEC_MASK | ACC_WRITE_MASK | ACC_USER_MASK)
@@ -226,8 +226,8 @@ Signed-off-by: Justin M. Forbes <jforbes
  			++vcpu->stat.pf_fixed;
  			break;
  		}
---- linux-2.6.30.x86_64/arch/x86/kvm/paging_tmpl.h	2009-07-23 11:24:43.000000000 -0500
-+++ linux-2.6.30.x86_64-ksm/arch/x86/kvm/paging_tmpl.h	2009-07-23 12:41:27.000000000 -0500
+--- linux-2.6.30.x86_64/arch/x86/kvm/paging_tmpl.h	2009-07-23 14:58:56.000000000 -0500
++++ linux-2.6.30.x86_64-ksm/arch/x86/kvm/paging_tmpl.h	2009-07-23 15:01:49.000000000 -0500
 @@ -266,9 +266,13 @@ static void FNAME(update_pte)(struct kvm
  	if (mmu_notifier_retry(vcpu, vcpu->arch.update_pte.mmu_seq))
  		return;
@@ -260,8 +260,14 @@ Signed-off-by: Justin M. Forbes <jforbes
  
  	offset = nr_present = 0;
  
-@@ -591,7 +596,7 @@ static int FNAME(sync_page)(struct kvm_v
+@@ -589,9 +594,13 @@ static int FNAME(sync_page)(struct kvm_v
+ 
+ 		nr_present++;
  		pte_access = sp->role.access & FNAME(gpte_access)(vcpu, gpte);
++        if (!(sp->spt[i] & SPTE_HOST_WRITEABLE)) {
++            pte_access &= ~PT_WRITABLE_MASK;
++                         reset_host_protection = 0;
++                } else { reset_host_protection = 1; }
  		set_spte(vcpu, &sp->spt[i], pte_access, 0, 0,
  			 is_dirty_pte(gpte), 0, gfn,
 -			 spte_to_pfn(sp->spt[i]), true, false);
@@ -269,8 +275,8 @@ Signed-off-by: Justin M. Forbes <jforbes
  	}
  
  	return !nr_present;
---- linux-2.6.30.x86_64/virt/kvm/kvm_main.c	2009-07-23 11:24:45.000000000 -0500
-+++ linux-2.6.30.x86_64-ksm/virt/kvm/kvm_main.c	2009-07-23 12:42:36.000000000 -0500
+--- linux-2.6.30.x86_64/virt/kvm/kvm_main.c	2009-07-23 14:58:58.000000000 -0500
++++ linux-2.6.30.x86_64-ksm/virt/kvm/kvm_main.c	2009-07-23 15:00:04.000000000 -0500
 @@ -859,6 +859,19 @@ static void kvm_mmu_notifier_invalidate_
  
  }