4.3-stable patches

added patches:
	xen-events-always-allocate-legacy-interrupts-on-pv-guests.patch

diff --git a/queue-4.3/series b/queue-4.3/series
index 16e2256304763195a5108bacf85f5e85b82dbb4a..7953f9cd3e728e537f94ed9324f8920e7508ac04 100644 (file)
--- a/queue-4.3/series
+++ b/queue-4.3/series
@@ -122,3 +122,4 @@ tty-audit-fix-audit-source.patch
 tty-fix-tty_send_xchar-lock-order-inversion.patch
 xhci-workaround-to-get-intel-xhci-reset-working-more-reliably.patch
 staging-lustre-use-jiffies-for-lp_last_query-times.patch
+xen-events-always-allocate-legacy-interrupts-on-pv-guests.patch

diff --git a/queue-4.3/xen-events-always-allocate-legacy-interrupts-on-pv-guests.patch b/queue-4.3/xen-events-always-allocate-legacy-interrupts-on-pv-guests.patch
new file mode 100644 (file)
index 0000000..9661db3
--- /dev/null
+++ b/queue-4.3/xen-events-always-allocate-legacy-interrupts-on-pv-guests.patch
@@ -0,0 +1,82 @@
+From b4ff8389ed14b849354b59ce9b360bdefcdbf99c Mon Sep 17 00:00:00 2001
+From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
+Date: Fri, 20 Nov 2015 11:25:04 -0500
+Subject: xen/events: Always allocate legacy interrupts on PV guests
+
+From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
+
+commit b4ff8389ed14b849354b59ce9b360bdefcdbf99c upstream.
+
+After commit 8c058b0b9c34 ("x86/irq: Probe for PIC presence before
+allocating descs for legacy IRQs") early_irq_init() will no longer
+preallocate descriptors for legacy interrupts if PIC does not
+exist, which is the case for Xen PV guests.
+
+Therefore we may need to allocate those descriptors ourselves.
+
+Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
+Suggested-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: David Vrabel <david.vrabel@citrix.com>
+Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/include/asm/irq.h       |    5 +++++
+ arch/arm64/include/asm/irq.h     |    5 +++++
+ drivers/xen/events/events_base.c |    5 +++--
+ 3 files changed, 13 insertions(+), 2 deletions(-)
+
+--- a/arch/arm/include/asm/irq.h
++++ b/arch/arm/include/asm/irq.h
+@@ -40,6 +40,11 @@ extern void arch_trigger_all_cpu_backtra
+ #define arch_trigger_all_cpu_backtrace(x) arch_trigger_all_cpu_backtrace(x)
+ #endif
+ 
++static inline int nr_legacy_irqs(void)
++{
++      return NR_IRQS_LEGACY;
++}
++
+ #endif
+ 
+ #endif
+--- a/arch/arm64/include/asm/irq.h
++++ b/arch/arm64/include/asm/irq.h
+@@ -21,4 +21,9 @@ static inline void acpi_irq_init(void)
+ }
+ #define acpi_irq_init acpi_irq_init
+ 
++static inline int nr_legacy_irqs(void)
++{
++      return 0;
++}
++
+ #endif
+--- a/drivers/xen/events/events_base.c
++++ b/drivers/xen/events/events_base.c
+@@ -39,6 +39,7 @@
+ #include <asm/irq.h>
+ #include <asm/idle.h>
+ #include <asm/io_apic.h>
++#include <asm/i8259.h>
+ #include <asm/xen/pci.h>
+ #include <xen/page.h>
+ #endif
+@@ -420,7 +421,7 @@ static int __must_check xen_allocate_irq
+               return xen_allocate_irq_dynamic();
+ 
+       /* Legacy IRQ descriptors are already allocated by the arch. */
+-      if (gsi < NR_IRQS_LEGACY)
++      if (gsi < nr_legacy_irqs())
+               irq = gsi;
+       else
+               irq = irq_alloc_desc_at(gsi, -1);
+@@ -446,7 +447,7 @@ static void xen_free_irq(unsigned irq)
+       kfree(info);
+ 
+       /* Legacy IRQ descriptors are managed by the arch. */
+-      if (irq < NR_IRQS_LEGACY)
++      if (irq < nr_legacy_irqs())
+               return;
+ 
+       irq_free_desc(irq);