On 05.02.2015 21:07, Sander Eikelenboom wrote: > > Tuesday, January 20, 2015, 3:21:04 AM, you wrote: > >> Hi Thomas, >> This patch set includes three hotfixes related Xen IRQ for v3.19. >> Sorry for the long delay to get these two regressions fixed, it really >> cost me some time to read and understand Xen IRQ code. > >> Patch 1 fixes the failure to register ACPI SCI interrupt on Xen >> domain0 by reworking acpi_gsi_to_irq(). I will backport it to v3.18 >> too once it reaches the mainstream kernel. > >> Patch 2 fixes the regression in Xen PCI device passthrough(pciback). >> It's a temporary solution, I will send the formal fix for v3.20 and >> it has passed tests too. > >> Patch 3 fixes an issue found when reading code. There's no real bug >> reports related to this issue yet. > >> Great thanks to Konrad and Sander for testing fixes for these regressions. > >> Regards, >> Gerry > > Hi Gerry, > > Since these patches now are: tested, reviewed and have landed into mainline, > could you also provide the backports for 3.17 and 3.18 where required ?
This would be my attempt of backporting those to 3.18 (I have not tried whether they would apply to 3.17 as well). Those seem to work when test-booting and Sander said he will give them a try as well. But better check yourself I did not mess anything up while backporting. One of the three patches seemed not to be required at all. -Stefan > > The number of people running into these (subtle) issues with these stable > kernels seems to be steadily increasing. > > -- > Sander > >> Jiang Liu (3): >> xen/pci: Kill function xen_setup_acpi_sci() >> xen/irq, ACPI: Fix regression in xen PCI passthrough caused by >> cffe0a2b5a34 >> xen/irq: Override ACPI IRQ management callback __acpi_unregister_gsi > >> arch/x86/include/asm/acpi.h | 1 + >> arch/x86/kernel/acpi/boot.c | 26 +++++++++++------------ >> arch/x86/pci/xen.c | 49 >> ++----------------------------------------- >> drivers/acpi/pci_irq.c | 1 - >> 4 files changed, 16 insertions(+), 61 deletions(-) > >
From 8b5b328b62248d95743ca9af7aa71c06dd808dfe Mon Sep 17 00:00:00 2001 From: Jiang Liu <jiang....@linux.intel.com> Date: Tue, 20 Jan 2015 10:21:05 +0800 Subject: [PATCH 1/2] x86/xen: Treat SCI interrupt as normal GSI interrupt Currently Xen Domain0 has special treatment for ACPI SCI interrupt, that is initialize irq for ACPI SCI at early stage in a special way as: xen_init_IRQ() ->pci_xen_initial_domain() ->xen_setup_acpi_sci() Allocate and initialize irq for ACPI SCI Function xen_setup_acpi_sci() calls acpi_gsi_to_irq() to get an irq number for ACPI SCI. But unfortunately acpi_gsi_to_irq() depends on IOAPIC irqdomains through following path acpi_gsi_to_irq() ->mp_map_gsi_to_irq() ->mp_map_pin_to_irq() ->check IOAPIC irqdomain For PV domains, it uses Xen event based interrupt manangement and doesn't make uses of native IOAPIC, so no irqdomains created for IOAPIC. This causes Xen domain0 fail to install interrupt handler for ACPI SCI and all ACPI events will be lost. Please refer to: https://lkml.org/lkml/2014/12/19/178 So the fix is to get rid of special treatment for ACPI SCI, just treat ACPI SCI as normal GSI interrupt as: acpi_gsi_to_irq() ->acpi_register_gsi() ->acpi_register_gsi_xen() ->xen_register_gsi() With above change, there's no need for xen_setup_acpi_sci() anymore. The above change also works with bare metal kernel too. Signed-off-by: Jiang Liu <jiang....@linux.intel.com> Tested-by: Sander Eikelenboom <li...@eikelenboom.it> Cc: Tony Luck <tony.l...@intel.com> Cc: xen-de...@lists.xenproject.org Cc: Konrad Rzeszutek Wilk <konrad.w...@oracle.com> Cc: David Vrabel <david.vra...@citrix.com> Cc: Rafael J. Wysocki <r...@rjwysocki.net> Cc: Len Brown <len.br...@intel.com> Cc: Pavel Machek <pa...@ucw.cz> Cc: Bjorn Helgaas <bhelg...@google.com> Link: http://lkml.kernel.org/r/1421720467-7709-2-git-send-email-jiang....@linux.intel.com Signed-off-by: Thomas Gleixner <t...@linutronix.de> Signed-off-by: Stefan Bader <stefan.ba...@canonical.com> --- arch/x86/kernel/acpi/boot.c | 23 +++++++++++----------- arch/x86/pci/xen.c | 47 --------------------------------------------- 2 files changed, 12 insertions(+), 58 deletions(-) diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index a142e77..460f498 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -604,18 +604,19 @@ void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger) int acpi_gsi_to_irq(u32 gsi, unsigned int *irqp) { - int irq; - - if (acpi_irq_model == ACPI_IRQ_MODEL_PIC) { - *irqp = gsi; - } else { - irq = mp_map_gsi_to_irq(gsi, - IOAPIC_MAP_ALLOC | IOAPIC_MAP_CHECK); - if (irq < 0) - return -1; - *irqp = irq; + int rc, irq, trigger, polarity; + + rc = acpi_get_override_irq(gsi, &trigger, &polarity); + if (rc == 0) { + trigger = trigger ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE; + polarity = polarity ? ACPI_ACTIVE_LOW : ACPI_ACTIVE_HIGH; + irq = acpi_register_gsi(NULL, gsi, trigger, polarity); + if (irq >= 0) { + *irqp = irq; + return 0; + } } - return 0; + return -1; } EXPORT_SYMBOL_GPL(acpi_gsi_to_irq); diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c index 093f5f4..6b3cf7c 100644 --- a/arch/x86/pci/xen.c +++ b/arch/x86/pci/xen.c @@ -452,52 +452,6 @@ int __init pci_xen_hvm_init(void) } #ifdef CONFIG_XEN_DOM0 -static __init void xen_setup_acpi_sci(void) -{ - int rc; - int trigger, polarity; - int gsi = acpi_sci_override_gsi; - int irq = -1; - int gsi_override = -1; - - if (!gsi) - return; - - rc = acpi_get_override_irq(gsi, &trigger, &polarity); - if (rc) { - printk(KERN_WARNING "xen: acpi_get_override_irq failed for acpi" - " sci, rc=%d\n", rc); - return; - } - trigger = trigger ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE; - polarity = polarity ? ACPI_ACTIVE_LOW : ACPI_ACTIVE_HIGH; - - printk(KERN_INFO "xen: sci override: global_irq=%d trigger=%d " - "polarity=%d\n", gsi, trigger, polarity); - - /* Before we bind the GSI to a Linux IRQ, check whether - * we need to override it with bus_irq (IRQ) value. Usually for - * IRQs below IRQ_LEGACY_IRQ this holds IRQ == GSI, as so: - * ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 9 low level) - * but there are oddballs where the IRQ != GSI: - * ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 20 low level) - * which ends up being: gsi_to_irq[9] == 20 - * (which is what acpi_gsi_to_irq ends up calling when starting the - * the ACPI interpreter and keels over since IRQ 9 has not been - * setup as we had setup IRQ 20 for it). - */ - if (acpi_gsi_to_irq(gsi, &irq) == 0) { - /* Use the provided value if it's valid. */ - if (irq >= 0) - gsi_override = irq; - } - - gsi = xen_register_gsi(gsi, gsi_override, trigger, polarity); - printk(KERN_INFO "xen: acpi sci %d\n", gsi); - - return; -} - int __init pci_xen_initial_domain(void) { int irq; @@ -509,7 +463,6 @@ int __init pci_xen_initial_domain(void) x86_msi.msi_mask_irq = xen_nop_msi_mask_irq; x86_msi.msix_mask_irq = xen_nop_msix_mask_irq; #endif - xen_setup_acpi_sci(); __acpi_register_gsi = acpi_register_gsi_xen; /* Pre-allocate legacy irqs */ for (irq = 0; irq < nr_legacy_irqs(); irq++) { -- 1.9.1
From 96f1d05b484334ff01ea2ee2b66798e294e34d96 Mon Sep 17 00:00:00 2001 From: Jiang Liu <jiang....@linux.intel.com> Date: Tue, 20 Jan 2015 10:21:07 +0800 Subject: [PATCH 2/2] x86/xen: Override ACPI IRQ management callback __acpi_unregister_gsi Xen overrides __acpi_register_gsi and leaves __acpi_unregister_gsi as is. That means, an IRQ allocated by acpi_register_gsi_xen_hvm() or acpi_register_gsi_xen() will be freed by acpi_unregister_gsi_ioapic(), which may cause undesired effects. So override __acpi_unregister_gsi to NULL for safety. Signed-off-by: Jiang Liu <jiang....@linux.intel.com> Tested-by: Sander Eikelenboom <li...@eikelenboom.it> Cc: Tony Luck <tony.l...@intel.com> Cc: xen-de...@lists.xenproject.org Cc: Konrad Rzeszutek Wilk <konrad.w...@oracle.com> Cc: David Vrabel <david.vra...@citrix.com> Cc: Bjorn Helgaas <bhelg...@google.com> Cc: Graeme Gregory <graeme.greg...@linaro.org> Cc: Lv Zheng <lv.zh...@intel.com> Link: http://lkml.kernel.org/r/1421720467-7709-4-git-send-email-jiang....@linux.intel.com Signed-off-by: Thomas Gleixner <t...@linutronix.de> Signed-off-by: Stefan Bader <stefan.ba...@canonical.com> --- arch/x86/include/asm/acpi.h | 1 + arch/x86/pci/xen.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index 0ab4f9f..3a45668 100644 --- a/arch/x86/include/asm/acpi.h +++ b/arch/x86/include/asm/acpi.h @@ -50,6 +50,7 @@ void acpi_pic_sci_set_trigger(unsigned int, u16); extern int (*__acpi_register_gsi)(struct device *dev, u32 gsi, int trigger, int polarity); +extern void (*__acpi_unregister_gsi)(u32 gsi); static inline void disable_acpi(void) { diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c index 6b3cf7c..3c41716 100644 --- a/arch/x86/pci/xen.c +++ b/arch/x86/pci/xen.c @@ -442,6 +442,7 @@ int __init pci_xen_hvm_init(void) * just how GSIs get registered. */ __acpi_register_gsi = acpi_register_gsi_xen_hvm; + __acpi_unregister_gsi = NULL; #endif #ifdef CONFIG_PCI_MSI @@ -464,6 +465,7 @@ int __init pci_xen_initial_domain(void) x86_msi.msix_mask_irq = xen_nop_msix_mask_irq; #endif __acpi_register_gsi = acpi_register_gsi_xen; + __acpi_unregister_gsi = NULL; /* Pre-allocate legacy irqs */ for (irq = 0; irq < nr_legacy_irqs(); irq++) { int trigger, polarity; -- 1.9.1
signature.asc
Description: OpenPGP digital signature
