From: "tip-bot2 for Frederic Weisbecker" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Frederic Weisbecker <frederic@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/core] posix-cpu-timers: Consolidate timer base accessor
Date: Tue, 10 Aug 2021 15:13:32 -0000 [thread overview]
Message-ID: <162860841273.395.2362644052634240500.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210726125513.271824-6-frederic@kernel.org>
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 5c8f23e6b73c13d9f7b52614783dcb9169883296
Gitweb: https://git.kernel.org/tip/5c8f23e6b73c13d9f7b52614783dcb9169883296
Author: Frederic Weisbecker <frederic@kernel.org>
AuthorDate: Mon, 26 Jul 2021 14:55:12 +02:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Tue, 10 Aug 2021 17:09:59 +02:00
posix-cpu-timers: Consolidate timer base accessor
Remove the ad-hoc timer base accessors and provide a consolidated one.
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20210726125513.271824-6-frederic@kernel.org
---
kernel/time/posix-cpu-timers.c | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index 4fbbbc8..0d91811 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -407,6 +407,17 @@ static int posix_cpu_timer_create(struct k_itimer *new_timer)
return 0;
}
+static struct posix_cputimer_base *timer_base(struct k_itimer *timer,
+ struct task_struct *tsk)
+{
+ int clkidx = CPUCLOCK_WHICH(timer->it_clock);
+
+ if (CPUCLOCK_PERTHREAD(timer->it_clock))
+ return tsk->posix_cputimers.bases + clkidx;
+ else
+ return tsk->signal->posix_cputimers.bases + clkidx;
+}
+
/*
* Dequeue the timer and reset the base if it was its earliest expiration.
* It makes sure the next tick recalculates the base next expiration so we
@@ -421,18 +432,11 @@ static void disarm_timer(struct k_itimer *timer, struct task_struct *p)
{
struct cpu_timer *ctmr = &timer->it.cpu;
struct posix_cputimer_base *base;
- int clkidx;
if (!cpu_timer_dequeue(ctmr))
return;
- clkidx = CPUCLOCK_WHICH(timer->it_clock);
-
- if (CPUCLOCK_PERTHREAD(timer->it_clock))
- base = p->posix_cputimers.bases + clkidx;
- else
- base = p->signal->posix_cputimers.bases + clkidx;
-
+ base = timer_base(timer, p);
if (cpu_timer_getexpires(ctmr) == base->nextevt)
base->nextevt = 0;
}
@@ -531,15 +535,9 @@ void posix_cpu_timers_exit_group(struct task_struct *tsk)
*/
static void arm_timer(struct k_itimer *timer, struct task_struct *p)
{
- int clkidx = CPUCLOCK_WHICH(timer->it_clock);
+ struct posix_cputimer_base *base = timer_base(timer, p);
struct cpu_timer *ctmr = &timer->it.cpu;
u64 newexp = cpu_timer_getexpires(ctmr);
- struct posix_cputimer_base *base;
-
- if (CPUCLOCK_PERTHREAD(timer->it_clock))
- base = p->posix_cputimers.bases + clkidx;
- else
- base = p->signal->posix_cputimers.bases + clkidx;
if (!cpu_timer_enqueue(&base->tqhead, ctmr))
return;
next prev parent reply other threads:[~2021-08-10 15:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-26 12:55 [GIT PULL] posix-cpu-timers leftover overhead fixes Frederic Weisbecker
2021-07-26 12:55 ` [PATCH 1/6] posix-cpu-timers: Assert task sighand is locked while starting cputime counter Frederic Weisbecker
2021-08-10 15:13 ` [tip: timers/core] " tip-bot2 for Frederic Weisbecker
2021-07-26 12:55 ` [PATCH 2/6] posix-cpu-timers: Force next_expiration recalc after timer deletion Frederic Weisbecker
2021-08-10 15:13 ` [tip: timers/core] " tip-bot2 for Frederic Weisbecker
2021-07-26 12:55 ` [PATCH 3/6] posix-cpu-timers: Force next expiration recalc after itimer reset Frederic Weisbecker
2021-08-10 15:13 ` [tip: timers/core] " tip-bot2 for Frederic Weisbecker
2021-07-26 12:55 ` [PATCH 4/6] posix-cpu-timers: Remove confusing error code override Frederic Weisbecker
2021-08-10 15:13 ` [tip: timers/core] posix-cpu-timers: Remove confusing return value override tip-bot2 for Frederic Weisbecker
2021-07-26 12:55 ` [PATCH 5/6] posix-cpu-timers: Consolidate timer base accessor Frederic Weisbecker
2021-08-10 15:13 ` tip-bot2 for Frederic Weisbecker [this message]
2021-07-26 12:55 ` [PATCH 6/6] posix-cpu-timers: Recalc next expiration when timer_settime() ends up not queueing Frederic Weisbecker
2021-08-10 15:13 ` [tip: timers/core] " tip-bot2 for Frederic Weisbecker
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=162860841273.395.2362644052634240500.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=frederic@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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).