mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Thomas Weißschuh" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: thomas.weissschuh@linutronix.de,
	Thomas Gleixner <tglx@linutronix.de>,
	"Peter Zijlstra (Intel)" <peterz@infradead.org>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/core] posix-timers: Avoid direct access to hrtimer clockbase
Date: Tue, 09 Sep 2025 10:31:07 -0000	[thread overview]
Message-ID: <175741386763.1920.7524095939905626765.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250821-hrtimer-cleanup-get_time-v2-1-3ae822e5bfbd@linutronix.de>

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

Commit-ID:     24fb08dcc40f52cf5f95d2cdaa0c26e33a2f4285
Gitweb:        https://git.kernel.org/tip/24fb08dcc40f52cf5f95d2cdaa0c26e33a2f4285
Author:        Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate:    Thu, 21 Aug 2025 15:28:08 +02:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Tue, 09 Sep 2025 12:27:17 +02:00

posix-timers: Avoid direct access to hrtimer clockbase

The field timer->base->get_time is a private implementation detail and
should not be accessed outside of the hrtimer core.

Switch to the equivalent helpers.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/all/20250821-hrtimer-cleanup-get_time-v2-1-3ae822e5bfbd@linutronix.de

---
 kernel/time/posix-timers.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index 8b58217..2741f37 100644
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -299,8 +299,7 @@ static void common_hrtimer_rearm(struct k_itimer *timr)
 {
 	struct hrtimer *timer = &timr->it.real.timer;
 
-	timr->it_overrun += hrtimer_forward(timer, timer->base->get_time(),
-					    timr->it_interval);
+	timr->it_overrun += hrtimer_forward_now(timer, timr->it_interval);
 	hrtimer_restart(timer);
 }
 
@@ -825,7 +824,7 @@ static void common_hrtimer_arm(struct k_itimer *timr, ktime_t expires,
 	hrtimer_setup(&timr->it.real.timer, posix_timer_fn, timr->it_clock, mode);
 
 	if (!absolute)
-		expires = ktime_add_safe(expires, timer->base->get_time());
+		expires = ktime_add_safe(expires, hrtimer_cb_get_time(timer));
 	hrtimer_set_expires(timer, expires);
 
 	if (!sigev_none)

  reply	other threads:[~2025-09-09 10:31 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-08-21 13:28 [PATCH v2 0/9] hrtimer: Remove hrtimer_clock_base::get_time Thomas Weißschuh
2025-08-21 13:28 ` [PATCH v2 1/9] posix-timers: Avoid direct access to hrtimer clockbase Thomas Weißschuh
2025-09-09 10:31   ` tip-bot2 for Thomas Weißschuh [this message]
2025-08-21 13:28 ` [PATCH v2 2/9] timers/itimer: " Thomas Weißschuh
2025-09-09 10:31   ` [tip: timers/core] " tip-bot2 for Thomas Weißschuh
2025-08-21 13:28 ` [PATCH v2 3/9] sched/core: " Thomas Weißschuh
2025-09-09 10:31   ` [tip: timers/core] " tip-bot2 for Thomas Weißschuh
2025-08-21 13:28 ` [PATCH v2 4/9] lib: test_objpool: " Thomas Weißschuh
2025-09-09 10:31   ` [tip: timers/core] " tip-bot2 for Thomas Weißschuh
2025-08-21 13:28 ` [PATCH v2 5/9] ALSA: hrtimer: " Thomas Weißschuh
2025-09-09 10:31   ` [tip: timers/core] " tip-bot2 for Thomas Weißschuh
2025-08-21 13:28 ` [PATCH v2 6/9] media: pwm-ir-tx: " Thomas Weißschuh
2025-09-09 10:31   ` [tip: timers/core] " tip-bot2 for Thomas Weißschuh
2025-08-21 13:28 ` [PATCH v2 7/9] hrtimer: Use hrtimer_cb_get_time() helper Thomas Weißschuh
2025-09-09 10:31   ` [tip: timers/core] " tip-bot2 for Thomas Weißschuh
2025-08-21 13:28 ` [PATCH v2 8/9] hrtimer: Remove hrtimer_clock_base::get_time Thomas Weißschuh
2025-09-09 10:31   ` [tip: timers/core] hrtimer: Remove hrtimer_clock_base:: Get_time tip-bot2 for Thomas Weißschuh
2025-08-21 13:28 ` [PATCH v2 9/9] hrtimer: Reorder branches in hrtimer_clockid_to_base() Thomas Weißschuh
2025-09-09 10:30   ` [tip: timers/core] " tip-bot2 for Thomas Weißschuh
  -- strict thread matches above, loose matches on Subject: below --
2025-08-12  6:08 [PATCH 1/8] posix-timers: Avoid direct access to hrtimer clockbase Thomas Weißschuh
2025-09-09  8:56 ` [tip: timers/core] " tip-bot2 for Thomas Weißschuh

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=175741386763.1920.7524095939905626765.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=thomas.weissschuh@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

all inboxes | Powered by JetHome®