* linux-next: manual merge of the rcu tree with the irqchip tree
@ 2021-08-13 4:04 Stephen Rothwell
2021-08-13 13:52 ` Paul E. McKenney
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2021-08-13 4:04 UTC (permalink / raw)
To: Paul E. McKenney, Marc Zyngier
Cc: Linux Kernel Mailing List, Linux Next Mailing List, Mark Rutland,
Valentin Schneider
[-- Attachment #1: Type: text/plain, Size: 1615 bytes --]
Hi all,
Today's linux-next merge of the rcu tree got a conflict in:
kernel/irq/chip.c
between commit:
56707bb845f5 ("genirq, irq-gic-v3: Make NMI flow handlers use ->irq_ack() if available")
from the irqchip tree and commit:
ef62bf7e92d8 ("irq: abstract irqaction handler invocation")
from the rcu tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc kernel/irq/chip.c
index 1b1171113437,804c2791315d..000000000000
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@@ -768,11 -744,6 +768,9 @@@ void handle_nmi(struct irq_desc *desc
__kstat_incr_irqs_this_cpu(desc);
+ if (chip->irq_ack)
+ chip->irq_ack(&desc->irq_data);
+
- trace_irq_handler_entry(irq, action);
/*
* NMIs cannot be shared, there is only one action.
*/
@@@ -1050,13 -954,7 +1044,10 @@@ void handle_percpu_devid_nmi(struct irq
__kstat_incr_irqs_this_cpu(desc);
+ if (chip->irq_ack)
+ chip->irq_ack(&desc->irq_data);
+
- trace_irq_handler_entry(irq, action);
- res = action->handler(irq, raw_cpu_ptr(action->percpu_dev_id));
- trace_irq_handler_exit(irq, action, res);
+ handle_irqaction_percpu_devid(irq, action);
if (chip->irq_eoi)
chip->irq_eoi(&desc->irq_data);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the rcu tree with the irqchip tree
2021-08-13 4:04 linux-next: manual merge of the rcu tree with the irqchip tree Stephen Rothwell
@ 2021-08-13 13:52 ` Paul E. McKenney
0 siblings, 0 replies; 2+ messages in thread
From: Paul E. McKenney @ 2021-08-13 13:52 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Marc Zyngier, Linux Kernel Mailing List, Linux Next Mailing List,
Mark Rutland, Valentin Schneider
On Fri, Aug 13, 2021 at 02:04:37PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the rcu tree got a conflict in:
>
> kernel/irq/chip.c
>
> between commit:
>
> 56707bb845f5 ("genirq, irq-gic-v3: Make NMI flow handlers use ->irq_ack() if available")
>
> from the irqchip tree and commit:
>
> ef62bf7e92d8 ("irq: abstract irqaction handler invocation")
>
> from the rcu tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
I had pulled these two in just for testing only because I was chasing
a problem that looked like long-running irq handlers, but which proved
to be something rather different.
ef62bf7e92d8 ("irq: abstract irqaction handler invocation")
2eeaae3c02b9 ("irq: detect long-running IRQ handlers")
I will be dropping these this morning, Pacific Time.
Thanx, Paul
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc kernel/irq/chip.c
> index 1b1171113437,804c2791315d..000000000000
> --- a/kernel/irq/chip.c
> +++ b/kernel/irq/chip.c
> @@@ -768,11 -744,6 +768,9 @@@ void handle_nmi(struct irq_desc *desc
>
> __kstat_incr_irqs_this_cpu(desc);
>
> + if (chip->irq_ack)
> + chip->irq_ack(&desc->irq_data);
> +
> - trace_irq_handler_entry(irq, action);
> /*
> * NMIs cannot be shared, there is only one action.
> */
> @@@ -1050,13 -954,7 +1044,10 @@@ void handle_percpu_devid_nmi(struct irq
>
> __kstat_incr_irqs_this_cpu(desc);
>
> + if (chip->irq_ack)
> + chip->irq_ack(&desc->irq_data);
> +
> - trace_irq_handler_entry(irq, action);
> - res = action->handler(irq, raw_cpu_ptr(action->percpu_dev_id));
> - trace_irq_handler_exit(irq, action, res);
> + handle_irqaction_percpu_devid(irq, action);
>
> if (chip->irq_eoi)
> chip->irq_eoi(&desc->irq_data);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-08-13 13:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-13 4:04 linux-next: manual merge of the rcu tree with the irqchip tree Stephen Rothwell
2021-08-13 13:52 ` Paul E. McKenney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).