FAILED: patch "[PATCH] x86/apic/vector: Fix off by one in error path" failed to apply to 4.14-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
45d55e7bac4028af93f5fa324e69958a0b868e96Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <[email protected]>
Date: Tue, 16 Jan 2018 12:20:18 +0100
Subject: [PATCH] x86/apic/vector: Fix off by one in error path
Keith reported the following warning:
WARNING: CPU: 28 PID: 1420 at kernel/irq/matrix.c:222 irq_matrix_remove_managed+0x10f/0x120 x86_vector_free_irqs+0xa1/0x180 x86_vector_alloc_irqs+0x1e4/0x3a0 msi_domain_alloc+0x62/0x130
The reason for this is that if the vector allocation fails the error handling code tries to free the failed vector as well, which causes the above imbalance warning to trigger.
Adjust the error path to handle this correctly.
arch/x86/kernel/apic/vector.c +5 -2
@@ -542,14 +542,17 @@ static int x86_vector_alloc_irqs(struct irq_domain *domain, unsigned int virq, err =assign_irq_vector_policy (irqd, info);trace_vector_setup (virq + i, false, err); -if (err) +if (err) { + irqd->chip_data =NULL ; +free_apic_chip_data (apicd); goto error; + } }return 0 ; error: -x86_vector_free_irqs (domain, virq, i +1 ); +x86_vector_free_irqs (domain, virq, i);return err; }
Quoted 5 lines · On Fri, Jan 19, 2018 at 10:25:10AM +0100, [email protected] wrote:
The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
Darn, the trace_vector_setup is new to 4.15, otherwise this would have been a clean stable pick. It is a very use trace point though.
PATCH 1/1 x86/apic/vector: Fix off by one in error path
In reply to [email protected]Upstream commit 45d55e7bac4028af93f5fa324e69958a0b868e96
Keith reported the following warning:
WARNING: CPU: 28 PID: 1420 at kernel/irq/matrix.c:222 irq_matrix_remove_managed+0x10f/0x120 x86_vector_free_irqs+0xa1/0x180 x86_vector_alloc_irqs+0x1e4/0x3a0 msi_domain_alloc+0x62/0x130
The reason for this is that if the vector allocation fails the error handling code tries to free the failed vector as well, which causes the above imbalance warning to trigger.
Adjust the error path to handle this correctly.
arch/x86/kernel/apic/vector.c +5 -2
@@ -359,14 +359,17 @@ static int x86_vector_alloc_irqs(struct irq_data->chip_data = data; irq_data->hwirq = virq + i; err =assign_irq_vector_policy (virq + i, node, data, info); -if (err) +if (err) { + irq_data->chip_data =NULL ; +free_apic_chip_data (data); goto error; + } }return 0 ; error: -x86_vector_free_irqs (domain, virq, i +1 ); +x86_vector_free_irqs (domain, virq, i);return err; }
PATCH 1/1 x86/apic/vector: Fix off by one in error path
Upstream commit 45d55e7bac4028af93f5fa324e69958a0b868e96
Keith reported the following warning:
WARNING: CPU: 28 PID: 1420 at kernel/irq/matrix.c:222 irq_matrix_remove_managed+0x10f/0x120 x86_vector_free_irqs+0xa1/0x180 x86_vector_alloc_irqs+0x1e4/0x3a0 msi_domain_alloc+0x62/0x130
The reason for this is that if the vector allocation fails the error handling code tries to free the failed vector as well, which causes the above imbalance warning to trigger.
Adjust the error path to handle this correctly.
arch/x86/kernel/apic/vector.c +5 -2
@@ -369,8 +369,11 @@ static int x86_vector_alloc_irqs(struct irq_data->hwirq = virq + i; err =assign_irq_vector_policy (virq + i, node, data, info, irq_data); -if (err) +if (err) { + irq_data->chip_data =NULL ; +free_apic_chip_data (data); goto error; + }/* * If the apic destination mode is physical, then the * effective affinity is restricted to a single target
@@ -383,7 +386,7 @@ static int x86_vector_alloc_irqs(structreturn 0 ; error: -x86_vector_free_irqs (domain, virq, i +1 ); +x86_vector_free_irqs (domain, virq, i);return err; }
Greg KH
maintainerRe: [PATCH stable backport 4.4/4.9] x86/apic/vector: Fix off by one in error path
In reply to Thomas GleixnerQuoted 13 lines · Thomas Gleixner
Upstream commit
45d55e7bac4028af93f5fa324e69958a0b868e96Keith reported the following warning:
WARNING: CPU: 28 PID: 1420 at kernel/irq/matrix.c:222 irq_matrix_remove_managed+0x10f/0x120 x86_vector_free_irqs+0xa1/0x180 x86_vector_alloc_irqs+0x1e4/0x3a0 msi_domain_alloc+0x62/0x130The reason for this is that if the vector allocation fails the error handling code tries to free the failed vector as well, which causes the above imbalance warning to trigger.
Quoted 8 lines
Adjust the error path to handle this correctly.
Fixes b5dc8e6c21e7 ("x86/irq: Use hierarchical irqdomain to manage CPU interrupt vectors")Reported-by Keith Busch <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>Tested-by Keith Busch <[email protected]>
Thanks for the backports, now queued up.
greg k-h