From nobody Sat Feb 7 05:49:31 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B5C5D7E772; Mon, 8 Apr 2024 13:10:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712581843; cv=none; b=QOeokV3zeBOLneSuDaJqGgQOf1O721mVggZvFpNdaIqzrMTzU4a3K5MNnuKTMg2yWujfiL/Tnrsr6vTunwgpBGrPFk2NnZtbi1YfTO2k8sgrtN9O3ZtcYPYxk9vsYDar2JUqF21tonQ97bLryziZDtcw/ey+R63uhNRjaAi8/9M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712581843; c=relaxed/simple; bh=kcdcasg4HaSBEhxHxzwPiNfUiM18+7rnpObeoF5pT7Y=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=EoneXsVS7vSzOnD0dK3Go5+XCsl2DTAZfH8BF920V0/tOP9I61ixafa6X7h65DaM5TtKX55IcJcyQ9lhK/zD3grnR2N2jtbVmzv43Vx5PjHq5tNV1ZA3PhbodGb0gCkxhCKe/WYMU4gUi86nxvJDFFLEMIxeLvHdUMsMOXjseWE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=25c1YJ+G; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=h0qfD6k7; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="25c1YJ+G"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="h0qfD6k7" Date: Mon, 08 Apr 2024 13:10:38 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1712581839; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jeXPe8gQog6JIW9GW2kibBQc1KRF2vtnIvQehR82aJw=; b=25c1YJ+GHLIHZnEC1ABJXEN571ly+P4vb12Ql/dcdowEjz3pBZ7XC4q2OeRGAWkNfvjosv V17sIQfdDtTe/H7PjNQqTQoSQAkrF1wuqxkRWPYVS0xVLn5XLepplEW38dvPkIpYk1Ktm9 g1QcsRkIJa/nGJsR+wZJToSJcgR89tnQTH6052j/6BOiiFq+39yXV4Krp86k+4O8nSzfUp aLBVpuPRJ/49InvqckICinek0UY6gxVyYJo1zFTIBPFBtdcgKqtF+gQ8OWbuxShlnYKOD0 rH+LMMOpHYTERDqKMHEWd2bjUMZzGNXywJV5QL7eW/iIv/18R4WyxBkTo62/gg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1712581839; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jeXPe8gQog6JIW9GW2kibBQc1KRF2vtnIvQehR82aJw=; b=h0qfD6k7v9aAPZNxC2TYoKfRhcYHxqMD3XbgQagHLC1pj5g9wp6CIlq+ZOd2q5QWaSJLq0 JCIgnoj3/ra0WkDQ== From: "tip-bot2 for Adrian Hunter" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/core] timekeeping: Move timekeeping helper functions Cc: Thomas Gleixner , Adrian Hunter , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20240325064023.2997-10-adrian.hunter@intel.com> References: <20240325064023.2997-10-adrian.hunter@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <171258183894.10875.8545999016373889170.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the timers/core branch of tip: Commit-ID: e98ab3d4159e6bab4e391f376a1e548dd4d32524 Gitweb: https://git.kernel.org/tip/e98ab3d4159e6bab4e391f376a1e548dd= 4d32524 Author: Adrian Hunter AuthorDate: Mon, 25 Mar 2024 08:40:13 +02:00 Committer: Thomas Gleixner CommitterDate: Mon, 08 Apr 2024 15:03:07 +02:00 timekeeping: Move timekeeping helper functions Move timekeeping helper functions to prepare for their reuse. Suggested-by: Thomas Gleixner Signed-off-by: Adrian Hunter Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/r/20240325064023.2997-10-adrian.hunter@intel.= com --- kernel/time/timekeeping.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index b58dffc..3375f0a 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -381,23 +381,31 @@ static inline u64 timekeeping_delta_to_ns(const struc= t tk_read_base *tkr, u64 de return nsec; } =20 -static inline u64 timekeeping_get_ns(const struct tk_read_base *tkr) +static inline u64 timekeeping_cycles_to_ns(const struct tk_read_base *tkr,= u64 cycles) { u64 delta; =20 - delta =3D timekeeping_get_delta(tkr); + /* calculate the delta since the last update_wall_time */ + delta =3D clocksource_delta(cycles, tkr->cycle_last, tkr->mask); return timekeeping_delta_to_ns(tkr, delta); } =20 -static inline u64 timekeeping_cycles_to_ns(const struct tk_read_base *tkr,= u64 cycles) +static __always_inline u64 fast_tk_get_delta_ns(struct tk_read_base *tkr) { - u64 delta; + u64 delta, cycles =3D tk_clock_read(tkr); =20 - /* calculate the delta since the last update_wall_time */ delta =3D clocksource_delta(cycles, tkr->cycle_last, tkr->mask); return timekeeping_delta_to_ns(tkr, delta); } =20 +static inline u64 timekeeping_get_ns(const struct tk_read_base *tkr) +{ + u64 delta; + + delta =3D timekeeping_get_delta(tkr); + return timekeeping_delta_to_ns(tkr, delta); +} + /** * update_fast_timekeeper - Update the fast and NMI safe monotonic timekee= per. * @tkr: Timekeeping readout base from which we take the update @@ -431,14 +439,6 @@ static void update_fast_timekeeper(const struct tk_rea= d_base *tkr, memcpy(base + 1, base, sizeof(*base)); } =20 -static __always_inline u64 fast_tk_get_delta_ns(struct tk_read_base *tkr) -{ - u64 delta, cycles =3D tk_clock_read(tkr); - - delta =3D clocksource_delta(cycles, tkr->cycle_last, tkr->mask); - return timekeeping_delta_to_ns(tkr, delta); -} - static __always_inline u64 __ktime_get_fast_ns(struct tk_fast *tkf) { struct tk_read_base *tkr;