rpms/kernel/F-10 linux-2.6-kvm-skip-pit-check.patch, NONE, 1.1 linux-2.6-xen-check-for-nx-support.patch, NONE, 1.1 kernel.spec, 1.1334, 1.1335

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15362

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-kvm-skip-pit-check.patch 
	linux-2.6-xen-check-for-nx-support.patch 
Log Message:
Copy Xen and KVM fixes from Fedora 11:
    Fix xen boot on machines without NX support (F11#492523)
    Skip PIT-through-IOAPIC routing check on KVM guests.

linux-2.6-kvm-skip-pit-check.patch:

--- NEW FILE linux-2.6-kvm-skip-pit-check.patch ---
commit 5bffffc113f91918292283e3819dadd4ca964423
Author: Marcelo Tosatti <mtosatti at redhat.com>
Date:   Wed Feb 11 22:45:42 2009 -0200

    KVM: x86: paravirt skip pit-through-ioapic boot check
    
    Skip the test which checks if the PIT is properly routed when
    using the IOAPIC, aimed at buggy hardware.
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
    Signed-off-by: Avi Kivity <avi at redhat.com>

diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index 478bca9..eecfc92 100644
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -27,6 +27,7 @@
 #include <linux/mm.h>
 #include <linux/highmem.h>
 #include <linux/hardirq.h>
+#include <asm/timer.h>
 
 #define MMU_QUEUE_SIZE 1024
 
@@ -237,6 +238,9 @@ static void paravirt_ops_setup(void)
 		pv_mmu_ops.lazy_mode.enter = kvm_enter_lazy_mmu;
 		pv_mmu_ops.lazy_mode.leave = kvm_leave_lazy_mmu;
 	}
+#ifdef CONFIG_X86_IO_APIC
+	no_timer_check = 1;
+#endif
 }
 
 void __init kvm_guest_init(void)

linux-2.6-xen-check-for-nx-support.patch:

--- NEW FILE linux-2.6-xen-check-for-nx-support.patch ---
>From bc6081ff98eec627919e0c68415e46a78fe51dc4 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date: Fri, 27 Mar 2009 11:29:02 -0700
Subject: [PATCH] xen: set _PAGE_NX in __supported_pte_mask before pagetable construction

Some 64-bit machines don't support the NX flag in ptes.
Check for NX before constructing the kernel pagetables.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
---
 arch/x86/xen/enlighten.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 69de191..f7d0fd7 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -42,6 +42,7 @@
 #include <asm/xen/hypervisor.h>
 #include <asm/fixmap.h>
 #include <asm/processor.h>
+#include <asm/proto.h>
 #include <asm/msr-index.h>
 #include <asm/setup.h>
 #include <asm/desc.h>
@@ -982,6 +982,11 @@ asmlinkage void __init xen_start_kernel(void)
 	if (!xen_initial_domain())
 		__supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD);
 
+#ifdef CONFIG_X86_64
+	/* Work out if we support NX */
+	check_efer();
+#endif
+
 	/* Don't do the full vcpu_info placement stuff until we have a
 	   possible map and a non-dummy shared_info. */
 	per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0];
-- 
1.6.0.6



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1334
retrieving revision 1.1335
diff -u -r1.1334 -r1.1335
--- kernel.spec	18 Apr 2009 17:39:56 -0000	1.1334
+++ kernel.spec	20 Apr 2009 14:55:55 -0000	1.1335
@@ -723,6 +723,8 @@
 Patch9300: linux-2.6-kvm-kconfig-irqchip.patch
 Patch9301: linux-2.6-kvm-mask-notifiers.patch
 Patch9302: linux-2.6-kvm-reset-pit-irq-on-unmask.patch
+Patch9303: linux-2.6-kvm-skip-pit-check.patch
+Patch9304: linux-2.6-xen-check-for-nx-support.patch
 
 %endif
 
@@ -1334,6 +1336,8 @@
 ApplyPatch linux-2.6-kvm-kconfig-irqchip.patch
 ApplyPatch linux-2.6-kvm-mask-notifiers.patch
 ApplyPatch linux-2.6-kvm-reset-pit-irq-on-unmask.patch
+ApplyPatch linux-2.6-kvm-skip-pit-check.patch
+ApplyPatch linux-2.6-xen-check-for-nx-support.patch
 
 # ======= END OF PATCH APPLICATIONS =============================
 
@@ -1911,6 +1915,11 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Apr 20 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-35
+- Copy Xen and KVM fixes from Fedora 11:
+    Fix xen boot on machines without NX support (F11#492523)
+    Skip PIT-through-IOAPIC routing check on KVM guests.
+
 * Sat Apr 18 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-34
 - Build in the rfkill and rfkill-input modules (#485322)