* FAILED: patch "[PATCH] x86/apic/vector: Fix off by one in error path" failed to apply to 4.14-stable tree
@ 2018-01-19 9:25 gregkh
2018-01-19 12:02 ` Keith Busch
2018-01-19 15:10 ` [PATCH stable backport 4.4/4.9] x86/apic/vector: Fix off by one in error path Thomas Gleixner
0 siblings, 2 replies; 5+ messages in thread
From: gregkh @ 2018-01-19 9:25 UTC (permalink / raw)
To: tglx, keith.busch; +Cc: stable
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 <stable@vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
>From 45d55e7bac4028af93f5fa324e69958a0b868e96 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
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.
Fixes: b5dc8e6c21e7 ("x86/irq: Use hierarchical irqdomain to manage CPU interrupt vectors")
Reported-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Keith Busch <keith.busch@intel.com>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/alpine.DEB.2.20.1801161217300.1823@nanos
diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
index f8b03bb8e725..3cc471beb50b 100644
--- a/arch/x86/kernel/apic/vector.c
+++ b/arch/x86/kernel/apic/vector.c
@@ -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;
}
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: FAILED: patch "[PATCH] x86/apic/vector: Fix off by one in error path" failed to apply to 4.14-stable tree
2018-01-19 9:25 FAILED: patch "[PATCH] x86/apic/vector: Fix off by one in error path" failed to apply to 4.14-stable tree gregkh
@ 2018-01-19 12:02 ` Keith Busch
2018-01-19 15:10 ` [PATCH stable backport 4.4/4.9] x86/apic/vector: Fix off by one in error path Thomas Gleixner
1 sibling, 0 replies; 5+ messages in thread
From: Keith Busch @ 2018-01-19 12:02 UTC (permalink / raw)
To: gregkh; +Cc: tglx, stable
On Fri, Jan 19, 2018 at 10:25:10AM +0100, gregkh@linuxfoundation.org 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 <stable@vger.kernel.org>.
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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH stable backport 4.4/4.9] x86/apic/vector: Fix off by one in error path
2018-01-19 9:25 FAILED: patch "[PATCH] x86/apic/vector: Fix off by one in error path" failed to apply to 4.14-stable tree gregkh
2018-01-19 12:02 ` Keith Busch
@ 2018-01-19 15:10 ` Thomas Gleixner
2018-01-19 15:11 ` [PATCH stable backport 4.14] " Thomas Gleixner
2018-01-19 15:30 ` [PATCH stable backport 4.4/4.9] " Greg KH
1 sibling, 2 replies; 5+ messages in thread
From: Thomas Gleixner @ 2018-01-19 15:10 UTC (permalink / raw)
To: gregkh; +Cc: keith.busch, stable
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.
Fixes: b5dc8e6c21e7 ("x86/irq: Use hierarchical irqdomain to manage CPU interrupt vectors")
Reported-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Keith Busch <keith.busch@intel.com>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/alpine.DEB.2.20.1801161217300.1823@nanos
--- a/arch/x86/kernel/apic/vector.c
+++ b/arch/x86/kernel/apic/vector.c
@@ -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;
}
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH stable backport 4.14] x86/apic/vector: Fix off by one in error path
2018-01-19 15:10 ` [PATCH stable backport 4.4/4.9] x86/apic/vector: Fix off by one in error path Thomas Gleixner
@ 2018-01-19 15:11 ` Thomas Gleixner
2018-01-19 15:30 ` [PATCH stable backport 4.4/4.9] " Greg KH
1 sibling, 0 replies; 5+ messages in thread
From: Thomas Gleixner @ 2018-01-19 15:11 UTC (permalink / raw)
To: gregkh; +Cc: keith.busch, stable
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.
Fixes: b5dc8e6c21e7 ("x86/irq: Use hierarchical irqdomain to manage CPU interrupt vectors")
Reported-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Keith Busch <keith.busch@intel.com>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/alpine.DEB.2.20.1801161217300.1823@nanos
--- a/arch/x86/kernel/apic/vector.c
+++ b/arch/x86/kernel/apic/vector.c
@@ -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(struct
return 0;
error:
- x86_vector_free_irqs(domain, virq, i + 1);
+ x86_vector_free_irqs(domain, virq, i);
return err;
}
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH stable backport 4.4/4.9] x86/apic/vector: Fix off by one in error path
2018-01-19 15:10 ` [PATCH stable backport 4.4/4.9] x86/apic/vector: Fix off by one in error path Thomas Gleixner
2018-01-19 15:11 ` [PATCH stable backport 4.14] " Thomas Gleixner
@ 2018-01-19 15:30 ` Greg KH
1 sibling, 0 replies; 5+ messages in thread
From: Greg KH @ 2018-01-19 15:30 UTC (permalink / raw)
To: Thomas Gleixner; +Cc: keith.busch, stable
On Fri, Jan 19, 2018 at 04:10:56PM +0100, Thomas Gleixner wrote:
> 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.
>
> Fixes: b5dc8e6c21e7 ("x86/irq: Use hierarchical irqdomain to manage CPU interrupt vectors")
> Reported-by: Keith Busch <keith.busch@intel.com>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Tested-by: Keith Busch <keith.busch@intel.com>
> Cc: stable@vger.kernel.org
> Link: https://lkml.kernel.org/r/alpine.DEB.2.20.1801161217300.1823@nanos
Thanks for the backports, now queued up.
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-01-19 15:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-19 9:25 FAILED: patch "[PATCH] x86/apic/vector: Fix off by one in error path" failed to apply to 4.14-stable tree gregkh
2018-01-19 12:02 ` Keith Busch
2018-01-19 15:10 ` [PATCH stable backport 4.4/4.9] x86/apic/vector: Fix off by one in error path Thomas Gleixner
2018-01-19 15:11 ` [PATCH stable backport 4.14] " Thomas Gleixner
2018-01-19 15:30 ` [PATCH stable backport 4.4/4.9] " Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.