2022-10-12 01:36:37

by ye xingchen

Subject: [PATCH linux-next v2] timers: replace in_irq() with

From: ye xingchen <[email protected]>

Replace the obsolete and ambiguos macro in_irq() with new
macro in_hardirq().

Signed-off-by: ye xingchen <[email protected]>
---
v1 -> v2
Replace both instances of in_irq() in the flie.
kernel/time/timer.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 717fcb9fb14a..8872670a285e 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1422,7 +1422,7 @@ int del_timer_sync(struct timer_list *timer)
* don't use it in hardirq context, because it
* could lead to deadlock.
*/
- WARN_ON(in_irq() && !(timer->flags & TIMER_IRQSAFE));
+ WARN_ON(in_hardirq() && !(timer->flags & TIMER_IRQSAFE));

/*
* Must be able to sleep on PREEMPT_RT because of the slowpath
* in
@@ -1838,7 +1838,7 @@ void update_process_times(int user_tick)
run_local_timers();
rcu_sched_clock_irq(user_tick);
#ifdef CONFIG_IRQ_WORK
- if (in_irq())
+ if (in_hardirq())
irq_work_tick();
#endif
scheduler_tick();
--
2.25.1

2022-10-12 03:23:22

by John Stultz

Subject: Re: [PATCH linux-next v2] timers: replace in_irq() with

On Tue, Oct 11, 2022 at 6:26 PM <[email protected]> wrote:
>
> From: ye xingchen <[email protected]>
>
> Replace the obsolete and ambiguos macro in_irq() with new

ambiguous ?

> macro in_hardirq().
>
> Signed-off-by: ye xingchen <[email protected]>

Acked-by: John Stultz <[email protected]>

2022-10-17 14:32:55

by tip-bot2 for Jacob Pan

Subject: [tip: timers/core] timers: Replace in_irq() with in_hardirq()

The following commit has been merged into the timers/core branch of tip:

Commit-ID: 8be3f96ceddb911539a53d87a66da84a04502366
Gitweb: https://git.kernel.org/tip/8be3f96ceddb911539a53d87a66da84a04502366
Author: ye xingchen <[email protected]>
AuthorDate: Wed, 12 Oct 2022 01:26:29
Committer: Thomas Gleixner <[email protected]>
CommitterDate: Mon, 17 Oct 2022 16:00:04 +02:00

timers: Replace in_irq() with in_hardirq()

Replace the obsolete and ambiguous macro in_irq() with new
macro in_hardirq().

Signed-off-by: ye xingchen <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Acked-by: John Stultz <[email protected]>
Link: https://lore.kernel.org/r/[email protected]

---
kernel/time/timer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 717fcb9..f40c88c 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1422,7 +1422,7 @@ int del_timer_sync(struct timer_list *timer)
* don't use it in hardirq context, because it
* could lead to deadlock.
*/
- WARN_ON(in_irq() && !(timer->flags & TIMER_IRQSAFE));
+ WARN_ON(in_hardirq() && !(timer->flags & TIMER_IRQSAFE));

/*
* Must be able to sleep on PREEMPT_RT because of the slowpath in