From: Anna-Maria Behnsen <anna-maria@linutronix.de>
To: linux-kernel@vger.kernel.org
Cc: Peter Zijlstra <peterz@infradead.org>,
John Stultz <john.stultz@linaro.org>,
Eric Dumazet <edumazet@google.com>,
Thomas Gleixner <tglx@linutronix.de>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
linux-pm@vger.kernel.org, Arjan van de Ven <arjan@infradead.org>,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Rik van Riel <riel@redhat.com>,
Anna-Maria Behnsen <anna-maria@linutronix.de>
Subject: [PATCH v3 16/17] add_timer_on(): Make sure callers have TIMER_PINNED flag
Date: Tue, 25 Oct 2022 15:58:49 +0200 [thread overview]
Message-ID: <20221025135850.51044-17-anna-maria@linutronix.de> (raw)
In-Reply-To: <20221025135850.51044-1-anna-maria@linutronix.de>
The hierachical timer pull model at expiry time is now in place. Timers
which should expire on a dedicated CPU needs the TIMER_PINNED
flag. Otherwise they will be queued on the dedicated CPU but in global
timer base and those timers could also expire on other CPUs. Only timers
with TIMER_PINNED flag will end up in local timer base
Therefore add the missing TIMER_PINNED flag for those who use
add_timer_on() without the flag.
Signed-off-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
---
arch/x86/kernel/tsc_sync.c | 3 ++-
kernel/time/clocksource.c | 2 +-
kernel/workqueue.c | 7 +++++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c
index 9452dc9664b5..eab827288e0f 100644
--- a/arch/x86/kernel/tsc_sync.c
+++ b/arch/x86/kernel/tsc_sync.c
@@ -110,7 +110,8 @@ static int __init start_sync_check_timer(void)
if (!cpu_feature_enabled(X86_FEATURE_TSC_ADJUST) || tsc_clocksource_reliable)
return 0;
- timer_setup(&tsc_sync_check_timer, tsc_sync_check_timer_fn, 0);
+ timer_setup(&tsc_sync_check_timer, tsc_sync_check_timer_fn,
+ TIMER_PINNED);
tsc_sync_check_timer.expires = jiffies + SYNC_CHECK_INTERVAL;
add_timer(&tsc_sync_check_timer);
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index 8058bec87ace..f8c310e62758 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -523,7 +523,7 @@ static inline void clocksource_start_watchdog(void)
{
if (watchdog_running || !watchdog || list_empty(&watchdog_list))
return;
- timer_setup(&watchdog_timer, clocksource_watchdog, 0);
+ timer_setup(&watchdog_timer, clocksource_watchdog, TIMER_PINNED);
watchdog_timer.expires = jiffies + WATCHDOG_INTERVAL;
add_timer_on(&watchdog_timer, cpumask_first(cpu_online_mask));
watchdog_running = 1;
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 7cd5f5e7e0a1..a0f7bf7be6f2 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -1670,10 +1670,13 @@ static void __queue_delayed_work(int cpu, struct workqueue_struct *wq,
dwork->cpu = cpu;
timer->expires = jiffies + delay;
- if (unlikely(cpu != WORK_CPU_UNBOUND))
+ if (unlikely(cpu != WORK_CPU_UNBOUND)) {
+ timer->flags |= TIMER_PINNED;
add_timer_on(timer, cpu);
- else
+ } else {
+ timer->flags &= ~TIMER_PINNED;
add_timer(timer);
+ }
}
/**
--
2.30.2
next prev parent reply other threads:[~2022-10-25 14:01 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-25 13:58 [PATCH v3 00/17] timer: Move from a push remote at enqueue to a pull at expiry model Anna-Maria Behnsen
2022-10-25 13:58 ` [PATCH v3 01/17] cpufreq: Prepare timer flags for hierarchical timer pull model Anna-Maria Behnsen
2022-10-26 13:54 ` Frederic Weisbecker
2022-10-31 15:22 ` Anna-Maria Behnsen
2022-10-25 13:58 ` [PATCH v3 02/17] tick-sched: Warn when next tick seems to be in the past Anna-Maria Behnsen
2022-10-25 22:11 ` Frederic Weisbecker
2022-10-25 13:58 ` [PATCH v3 03/17] timer: Move store of next event into __next_timer_interrupt() Anna-Maria Behnsen
2022-10-26 9:33 ` Frederic Weisbecker
2022-10-25 13:58 ` [PATCH v3 04/17] timer: Split next timer interrupt logic Anna-Maria Behnsen
2022-10-26 9:40 ` Frederic Weisbecker
2022-10-25 13:58 ` [PATCH v3 05/17] timer: Rework idle logic Anna-Maria Behnsen
2022-10-26 13:27 ` Frederic Weisbecker
2022-10-25 13:58 ` [PATCH v3 06/17] timer: Keep the pinned timers separate from the others Anna-Maria Behnsen
2022-10-26 15:26 ` Frederic Weisbecker
2022-10-25 13:58 ` [PATCH v3 07/17] timer: Retrieve next expiry of pinned/non-pinned timers seperately Anna-Maria Behnsen
2022-10-25 13:58 ` [PATCH v3 08/17] timer: Rename get_next_timer_interrupt() Anna-Maria Behnsen
2022-10-25 13:58 ` [PATCH v3 09/17] timer: Split out "get next timer interrupt" functionality Anna-Maria Behnsen
2022-10-25 13:58 ` [PATCH v3 10/17] timer: Add get next timer interrupt functionality for remote CPUs Anna-Maria Behnsen
2022-10-25 13:58 ` [PATCH v3 11/17] timer: Restructure internal locking Anna-Maria Behnsen
2022-10-25 13:58 ` [PATCH v3 12/17] timer: Check if timers base is handled already Anna-Maria Behnsen
2022-10-25 13:58 ` [PATCH v3 13/17] tick/sched: Split out jiffies update helper function Anna-Maria Behnsen
2022-10-25 13:58 ` [PATCH v3 14/17] timer: Implement the hierarchical pull model Anna-Maria Behnsen
2022-10-25 16:36 ` kernel test robot
2022-10-26 5:35 ` kernel test robot
2022-10-27 7:38 ` kernel test robot
2022-10-25 13:58 ` [PATCH v3 15/17] timer_migration: Add tracepoints Anna-Maria Behnsen
2022-10-25 13:58 ` Anna-Maria Behnsen [this message]
2022-10-25 13:58 ` [PATCH v3 17/17] timer: Always queue timers on the local CPU Anna-Maria Behnsen
2022-10-27 7:22 ` kernel test robot
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=20221025135850.51044-17-anna-maria@linutronix.de \
--to=anna-maria@linutronix.de \
--cc=arjan@infradead.org \
--cc=edumazet@google.com \
--cc=fweisbec@gmail.com \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=peterz@infradead.org \
--cc=rafael.j.wysocki@intel.com \
--cc=riel@redhat.com \
--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;
as well as URLs for NNTP newsgroup(s).