[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20231019233543.1243121-2-frederic@kernel.org>
Date: Fri, 20 Oct 2023 01:35:40 +0200
From: Frederic Weisbecker <frederic@...nel.org>
To: LKML <linux-kernel@...r.kernel.org>
Cc: Frederic Weisbecker <frederic@...nel.org>,
Boqun Feng <boqun.feng@...il.com>,
Joel Fernandes <joel@...lfernandes.org>,
Josh Triplett <josh@...htriplett.org>,
Mathieu Desnoyers <mathieu.desnoyers@...icios.com>,
Neeraj Upadhyay <neeraj.upadhyay@....com>,
"Paul E . McKenney" <paulmck@...nel.org>,
Steven Rostedt <rostedt@...dmis.org>,
Uladzislau Rezki <urezki@...il.com>, rcu <rcu@...r.kernel.org>,
Zqiang <qiang.zhang1211@...il.com>,
Lai Jiangshan <jiangshanlai@...il.com>,
"Liam R . Howlett" <Liam.Howlett@...cle.com>,
Peter Zijlstra <peterz@...radead.org>,
Sebastian Siewior <bigeasy@...utronix.de>,
Thomas Gleixner <tglx@...utronix.de>
Subject: [PATCH 1/4] softirq: Rename __raise_softirq_irqoff() to raise_softirq_no_wake()
This makes the purpose of this function clearer.
Fixes: cff9b2332ab7 ("kernel/sched: Modify initial boot task idle setup")
Cc: Liam R. Howlett <Liam.Howlett@...cle.com>
Cc: Peter Zijlstra (Intel) <peterz@...radead.org>
Cc: Sebastian Siewior <bigeasy@...utronix.de>
Cc: Thomas Gleixner <tglx@...utronix.de>
Signed-off-by: Frederic Weisbecker <frederic@...nel.org>
---
block/blk-mq.c | 2 +-
include/linux/interrupt.h | 2 +-
kernel/softirq.c | 6 +++---
lib/irq_poll.c | 4 ++--
net/core/dev.c | 8 ++++----
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 1fafd54dce3c..1bda40a2aa29 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1144,7 +1144,7 @@ static int blk_softirq_cpu_dead(unsigned int cpu)
static void __blk_mq_complete_request_remote(void *data)
{
- __raise_softirq_irqoff(BLOCK_SOFTIRQ);
+ raise_softirq_no_wake(BLOCK_SOFTIRQ);
}
static inline bool blk_mq_complete_need_ipi(struct request *rq)
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 76121c2bb4f8..558a1a329da9 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -604,7 +604,7 @@ static inline void do_softirq_post_smp_call_flush(unsigned int unused)
extern void open_softirq(int nr, void (*action)(struct softirq_action *));
extern void softirq_init(void);
-extern void __raise_softirq_irqoff(unsigned int nr);
+extern void raise_softirq_no_wake(unsigned int nr);
extern void raise_softirq_irqoff(unsigned int nr);
extern void raise_softirq(unsigned int nr);
diff --git a/kernel/softirq.c b/kernel/softirq.c
index 210cf5f8d92c..acfed6f3701d 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -664,7 +664,7 @@ void irq_exit(void)
*/
inline void raise_softirq_irqoff(unsigned int nr)
{
- __raise_softirq_irqoff(nr);
+ raise_softirq_no_wake(nr);
/*
* If we're in an interrupt or softirq, we're done
@@ -688,7 +688,7 @@ void raise_softirq(unsigned int nr)
local_irq_restore(flags);
}
-void __raise_softirq_irqoff(unsigned int nr)
+void raise_softirq_no_wake(unsigned int nr)
{
lockdep_assert_irqs_disabled();
trace_softirq_raise(nr);
@@ -795,7 +795,7 @@ static void tasklet_action_common(struct softirq_action *a,
t->next = NULL;
*tl_head->tail = t;
tl_head->tail = &t->next;
- __raise_softirq_irqoff(softirq_nr);
+ raise_softirq_no_wake(softirq_nr);
local_irq_enable();
}
}
diff --git a/lib/irq_poll.c b/lib/irq_poll.c
index 2d5329a42105..193cd847fd8f 100644
--- a/lib/irq_poll.c
+++ b/lib/irq_poll.c
@@ -130,7 +130,7 @@ static void __latent_entropy irq_poll_softirq(struct softirq_action *h)
}
if (rearm)
- __raise_softirq_irqoff(IRQ_POLL_SOFTIRQ);
+ raise_softirq_no_wake(IRQ_POLL_SOFTIRQ);
local_irq_enable();
}
@@ -197,7 +197,7 @@ static int irq_poll_cpu_dead(unsigned int cpu)
local_irq_disable();
list_splice_init(&per_cpu(blk_cpu_iopoll, cpu),
this_cpu_ptr(&blk_cpu_iopoll));
- __raise_softirq_irqoff(IRQ_POLL_SOFTIRQ);
+ raise_softirq_no_wake(IRQ_POLL_SOFTIRQ);
local_irq_enable();
local_bh_enable();
diff --git a/net/core/dev.c b/net/core/dev.c
index 85df22f05c38..6f4622cc8939 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4459,7 +4459,7 @@ static inline void ____napi_schedule(struct softnet_data *sd,
* we have to raise NET_RX_SOFTIRQ.
*/
if (!sd->in_net_rx_action)
- __raise_softirq_irqoff(NET_RX_SOFTIRQ);
+ raise_softirq_no_wake(NET_RX_SOFTIRQ);
}
#ifdef CONFIG_RPS
@@ -4678,7 +4678,7 @@ static void trigger_rx_softirq(void *data)
{
struct softnet_data *sd = data;
- __raise_softirq_irqoff(NET_RX_SOFTIRQ);
+ raise_softirq_no_wake(NET_RX_SOFTIRQ);
smp_store_release(&sd->defer_ipi_scheduled, 0);
}
@@ -4705,7 +4705,7 @@ static void napi_schedule_rps(struct softnet_data *sd)
* we have to raise NET_RX_SOFTIRQ.
*/
if (!mysd->in_net_rx_action && !mysd->in_napi_threaded_poll)
- __raise_softirq_irqoff(NET_RX_SOFTIRQ);
+ raise_softirq_no_wake(NET_RX_SOFTIRQ);
return;
}
#endif /* CONFIG_RPS */
@@ -6743,7 +6743,7 @@ static __latent_entropy void net_rx_action(struct softirq_action *h)
list_splice_tail(&repoll, &list);
list_splice(&list, &sd->poll_list);
if (!list_empty(&sd->poll_list))
- __raise_softirq_irqoff(NET_RX_SOFTIRQ);
+ raise_softirq_no_wake(NET_RX_SOFTIRQ);
else
sd->in_net_rx_action = false;
--
2.34.1
Powered by blists - more mailing lists