From: Frederic Weisbecker <frederic@kernel.org>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: LKML <linux-kernel@vger.kernel.org>,
Frederic Weisbecker <frederic@kernel.org>,
Anna-Maria Gleixner <anna-maria@linutronix.de>,
Peter Zijlstra <peterz@infradead.org>,
Juri Lelli <juri.lelli@redhat.com>
Subject: [PATCH 1/9] timer: Move trigger_dyntick_cpu() to enqueue_timer()
Date: Tue, 7 Jul 2020 03:32:45 +0200 [thread overview]
Message-ID: <20200707013253.26770-2-frederic@kernel.org> (raw)
In-Reply-To: <20200707013253.26770-1-frederic@kernel.org>
Consolidate the code by calling trigger_dyntick_cpu() from
enqueue_timer() instead of calling it from all its callers.
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Anna-Maria Gleixner <anna-maria@linutronix.de>
Cc: Juri Lelli <juri.lelli@redhat.com>
---
kernel/time/timer.c | 46 +++++++++++++++++++--------------------------
1 file changed, 19 insertions(+), 27 deletions(-)
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 9a838d38dbe6..4c977df3610b 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -529,29 +529,6 @@ static int calc_wheel_index(unsigned long expires, unsigned long clk)
return idx;
}
-/*
- * Enqueue the timer into the hash bucket, mark it pending in
- * the bitmap and store the index in the timer flags.
- */
-static void enqueue_timer(struct timer_base *base, struct timer_list *timer,
- unsigned int idx)
-{
- hlist_add_head(&timer->entry, base->vectors + idx);
- __set_bit(idx, base->pending_map);
- timer_set_idx(timer, idx);
-
- trace_timer_start(timer, timer->expires, timer->flags);
-}
-
-static void
-__internal_add_timer(struct timer_base *base, struct timer_list *timer)
-{
- unsigned int idx;
-
- idx = calc_wheel_index(timer->expires, base->clk);
- enqueue_timer(base, timer, idx);
-}
-
static void
trigger_dyntick_cpu(struct timer_base *base, struct timer_list *timer)
{
@@ -596,13 +573,29 @@ trigger_dyntick_cpu(struct timer_base *base, struct timer_list *timer)
wake_up_nohz_cpu(base->cpu);
}
-static void
-internal_add_timer(struct timer_base *base, struct timer_list *timer)
+/*
+ * Enqueue the timer into the hash bucket, mark it pending in
+ * the bitmap and store the index in the timer flags.
+ */
+static void enqueue_timer(struct timer_base *base, struct timer_list *timer,
+ unsigned int idx)
{
- __internal_add_timer(base, timer);
+ hlist_add_head(&timer->entry, base->vectors + idx);
+ __set_bit(idx, base->pending_map);
+ timer_set_idx(timer, idx);
+
+ trace_timer_start(timer, timer->expires, timer->flags);
trigger_dyntick_cpu(base, timer);
}
+static void internal_add_timer(struct timer_base *base, struct timer_list *timer)
+{
+ unsigned int idx;
+
+ idx = calc_wheel_index(timer->expires, base->clk);
+ enqueue_timer(base, timer, idx);
+}
+
#ifdef CONFIG_DEBUG_OBJECTS_TIMERS
static struct debug_obj_descr timer_debug_descr;
@@ -1059,7 +1052,6 @@ __mod_timer(struct timer_list *timer, unsigned long expires, unsigned int option
*/
if (idx != UINT_MAX && clk == base->clk) {
enqueue_timer(base, timer, idx);
- trigger_dyntick_cpu(base, timer);
} else {
internal_add_timer(base, timer);
}
--
2.26.2
next prev parent reply other threads:[~2020-07-07 1:33 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-07 1:32 [PATCH 0/9] timer: Reduce timers softirq v2 Frederic Weisbecker
2020-07-07 1:32 ` Frederic Weisbecker [this message]
2020-07-09 12:17 ` [PATCH 1/9] timer: Move trigger_dyntick_cpu() to enqueue_timer() Anna-Maria Behnsen
2020-07-15 13:20 ` Frederic Weisbecker
2020-07-07 1:32 ` [PATCH 2/9] timer: Add comments about calc_index() ceiling work Frederic Weisbecker
2020-07-14 9:13 ` Thomas Gleixner
2020-07-17 12:55 ` Frederic Weisbecker
2020-07-07 1:32 ` [PATCH 3/9] timer: Optimize _next_timer_interrupt() level iteration Frederic Weisbecker
2020-07-07 1:32 ` [PATCH 4/9] timers: Always keep track of next expiry Frederic Weisbecker
2020-07-14 8:49 ` Anna-Maria Behnsen
2020-07-17 12:51 ` Frederic Weisbecker
2020-07-07 1:32 ` [PATCH 5/9] timer: Reuse next expiry cache after nohz exit Frederic Weisbecker
2020-07-07 1:32 ` [PATCH 6/9] timer: Expand clk forward logic beyond nohz Frederic Weisbecker
2020-07-07 1:32 ` [PATCH 7/9] timer: Spare timer softirq until next expiry Frederic Weisbecker
2020-07-07 1:32 ` [PATCH 8/9] timer: Remove must_forward_clk Frederic Weisbecker
2020-07-07 1:32 ` [PATCH 9/9] timer: Lower base clock forwarding threshold Frederic Weisbecker
2020-07-09 7:02 ` [PATCH 0/9] timer: Reduce timers softirq v2 Juri Lelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200707013253.26770-2-frederic@kernel.org \
--to=frederic@kernel.org \
--cc=anna-maria@linutronix.de \
--cc=juri.lelli@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox