[kernel] r16675 - in dists/sid/linux-2.6/debian: . patches/features/all/xen patches/series

[Ian Campbell]

Author: ijc-guest
Date: Mon Dec  6 12:03:24 2010
New Revision: 16675

Log:
xen: disable ACPI NUMA for PV guests and allow IRQ desc allocation on any node
(Closes: #603632)

Added:
   dists/sid/linux-2.6/debian/patches/features/all/xen/xen-allocate-irq-descs-on-any-NUMA-node.patch
   dists/sid/linux-2.6/debian/patches/features/all/xen/xen-disable-ACPI-NUMA-for-PV-guests.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/29-extra

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Dec  6 12:02:29 2010	(r16674)
+++ dists/sid/linux-2.6/debian/changelog	Mon Dec  6 12:03:24 2010	(r16675)
@@ -23,6 +23,10 @@
   [ dann frazier ]
   * net: clear heap allocation for ETHTOOL_GRXCLSRLALL (CVE-2010-3861)
 
+  [ Ian Campbell ]
+  * xen: disable ACPI NUMA for PV guests and allow IRQ desc allocation on any
+    node (Closes: #603632)
+
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 27 Nov 2010 21:06:54 +0000
 
 linux-2.6 (2.6.32-28) unstable; urgency=high

Added: dists/sid/linux-2.6/debian/patches/features/all/xen/xen-allocate-irq-descs-on-any-NUMA-node.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/xen-allocate-irq-descs-on-any-NUMA-node.patch	Mon Dec  6 12:03:24 2010	(r16675)
@@ -0,0 +1,39 @@
+From 29dcbc5c25d6d8140337e96bf503c8475092c586 Mon Sep 17 00:00:00 2001
+From: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
+Date: Thu, 2 Dec 2010 16:14:27 -0800
+Subject: [PATCH 1/2] xen: allocate irq descs on any NUMA node
+
+Allocate irq descs on any NUMA node (we don't care) rather than
+specifically node 0, which may not exist.
+
+(At the moment NUMA is meaningless within a domain, so any info
+the kernel has is just from an SRAT table we haven't suppressed/disabled.)
+
+Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
+[ijc: backported to 2.6.32, effectively s/irq_alloc_desc_at/irq_to_desc_alloc_node/g]
+---
+ drivers/xen/events.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/xen/events.c b/drivers/xen/events.c
+index 2811bb9..0009e48 100644
+--- a/drivers/xen/events.c
++++ b/drivers/xen/events.c
+@@ -399,7 +399,7 @@
+ 	if (irq == start)
+ 		goto no_irqs;
+ 
+-	desc = irq_to_desc_alloc_node(irq, 0);
++	desc = irq_to_desc_alloc_node(irq, -1);
+ 	if (WARN_ON(desc == NULL))
+ 		return -1;
+ 
+@@ -592,7 +592,7 @@
+ 	 * we are using the !xen_initial_domain() to drop in the function.*/
+ 	if (identity_mapped_irq(gsi) || !xen_initial_domain()) {
+ 		irq = gsi;
+-		irq_to_desc_alloc_node(irq, 0);
++		irq_to_desc_alloc_node(irq, -1);
+ 		dynamic_irq_init(irq);
+ 	} else
+ 		irq = find_unbound_irq();

Added: dists/sid/linux-2.6/debian/patches/features/all/xen/xen-disable-ACPI-NUMA-for-PV-guests.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/xen-disable-ACPI-NUMA-for-PV-guests.patch	Mon Dec  6 12:03:24 2010	(r16675)
@@ -0,0 +1,41 @@
+From fefbfcc5c7f9c24ec98545254d8972f0faad0c44 Mon Sep 17 00:00:00 2001
+From: Ian Campbell <ian.campbell at citrix.com>
+Date: Fri, 3 Dec 2010 09:54:03 +0000
+Subject: [PATCH 2/2] xen: disable ACPI NUMA for PV guests
+
+Xen does not currently expose PV-NUMA information to PV
+guests. Therefore disable NUMA for the time being to prevent the
+kernel picking up on an host-level NUMA information which it might
+come across in the firmware.
+
+[ Added comment - Jeremy ]
+
+Signed-off-by: Ian Campbell <ian.campbell at citrix.com>
+Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
+---
+ arch/x86/xen/enlighten.c |    9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
+index 7250bef..33a7a83 100644
+--- a/arch/x86/xen/enlighten.c
++++ b/arch/x86/xen/enlighten.c
+@@ -1178,6 +1178,15 @@ asmlinkage void __init xen_start_kernel(void)
+ 
+ 	xen_smp_init();
+ 
++#ifdef CONFIG_ACPI_NUMA
++	/*
++	 * The pages we from Xen are not related to machine pages, so
++	 * any NUMA information the kernel tries to get from ACPI will
++	 * be meaningless.  Prevent it from trying.
++	 */
++	acpi_numa = -1;
++#endif
++
+ 	pgd = (pgd_t *)xen_start_info->pt_base;
+ 
+ 	if (!xen_initial_domain())
+-- 
+1.7.2.3
+

Modified: dists/sid/linux-2.6/debian/patches/series/29-extra
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/29-extra	Mon Dec  6 12:02:29 2010	(r16674)
+++ dists/sid/linux-2.6/debian/patches/series/29-extra	Mon Dec  6 12:03:24 2010	(r16675)
@@ -9,3 +9,5 @@
 + features/all/xen/Fix-one-race-condition-for-netfront-smartpoll-logic.patch featureset=xen
 + features/all/xen/xen-netfront-Fix-another-potential-race-condition.patch featureset=xen
 + features/all/xen/xen-netfront-unconditionally-initialize-smartpoll-hr.patch featureset=xen
++ features/all/xen/xen-allocate-irq-descs-on-any-NUMA-node.patch featureset=xen
++ features/all/xen/xen-disable-ACPI-NUMA-for-PV-guests.patch featureset=xen