From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: netdev@vger.kernel.org,
"Richard Cochran" <richardcochran@gmail.com>,
"Christopher Hall" <christopher.s.hall@intel.com>,
"David Zage" <david.zage@intel.com>,
"John Stultz" <jstultz@google.com>,
"Frederic Weisbecker" <frederic@kernel.org>,
"Anna-Maria Behnsen" <anna-maria@linutronix.de>,
"Miroslav Lichvar" <mlichvar@redhat.com>,
"Werner Abt" <werner.abt@meinberg-usa.com>,
"David Woodhouse" <dwmw2@infradead.org>,
"Stephen Boyd" <sboyd@kernel.org>,
"Thomas Weißschuh" <thomas.weissschuh@linutronix.de>,
"Kurt Kanzenbach" <kurt@linutronix.de>,
"Nam Cao" <namcao@linutronix.de>,
"Alex Gieringer" <gieri@linutronix.de>
Subject: [patch 26/26] timekeeping: Provide interface to control independent PTP clocks
Date: Tue, 13 May 2025 17:13:44 +0200 (CEST) [thread overview]
Message-ID: <20250513145138.212062332@linutronix.de> (raw)
In-Reply-To: 20250513144615.252881431@linutronix.de
Independent PTP clocks are disabled by default and attempts to access them
fail.
Provide an interface to enable/disable them at run-time.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
Documentation/ABI/stable/sysfs-kernel-time-ptp | 6 +
kernel/time/timekeeping.c | 125 +++++++++++++++++++++++++
2 files changed, 131 insertions(+)
--- /dev/null
+++ b/Documentation/ABI/stable/sysfs-kernel-time-ptp
@@ -0,0 +1,6 @@
+What: /sys/kernel/time/ptp/<ID>/enable
+Date: May 2025
+Contact: Thomas Gleixner <tglx@linutronix.de>
+Description:
+ Controls the enablement of independent PTP clock
+ timekeepers.
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -14,6 +14,7 @@
#include <linux/sched/loadavg.h>
#include <linux/sched/clock.h>
#include <linux/syscore_ops.h>
+#include <linux/sysfs.h>
#include <linux/clocksource.h>
#include <linux/jiffies.h>
#include <linux/time.h>
@@ -2900,6 +2901,130 @@ const struct k_clock clock_ptp = {
.clock_adj = ptp_clock_adj,
};
+static void ptp_clock_enable(unsigned int id)
+{
+ struct tk_read_base *tkr_raw = &tk_core.timekeeper.tkr_raw;
+ struct tk_data *tkd = ptp_get_tk_data(id);
+ struct timekeeper *tks = &tkd->shadow_timekeeper;
+
+ /* Prevent the core timekeeper from changing. */
+ guard(raw_spinlock_irq)(&tk_core.lock);
+
+ /*
+ * Setup the PTP clock assuming that the raw core timekeeper clock
+ * frequency conversion is close enough. PTP userspace has to
+ * adjust for the deviation via clock_adjtime(2).
+ */
+ guard(raw_spinlock_nested)(&tkd->lock);
+
+ /* Remove leftovers of a previous registration */
+ memset(tks, 0, sizeof(*tks));
+ /* Restore the timekeeper id */
+ tks->id = tkd->timekeeper.id;
+ /* Setup the timekeeper based on the current system clocksource */
+ tk_setup_internals(tks, tkr_raw->clock);
+
+ /* Mark it valid and set it live */
+ tks->clock_valid = true;
+ timekeeping_update_from_shadow(tkd, TK_UPDATE_ALL);
+}
+
+static void ptp_clock_disable(unsigned int id)
+{
+ struct tk_data *tkd = ptp_get_tk_data(id);
+
+ guard(raw_spinlock_irq)(&tkd->lock);
+ tkd->shadow_timekeeper.clock_valid = false;
+ timekeeping_update_from_shadow(tkd, TK_UPDATE_ALL);
+}
+
+static DEFINE_MUTEX(ptp_clock_mutex);
+
+static ssize_t ptp_clock_enable_store(struct kobject *kobj, struct kobj_attribute *attr,
+ const char *buf, size_t count)
+{
+ /* Lazy atoi() as name is "0..7" */
+ int id = kobj->name[0] & 0x7;
+ bool enable;
+
+ if (!capable(CAP_SYS_TIME))
+ return -EPERM;
+
+ if (kstrtobool(buf, &enable) < 0)
+ return -EINVAL;
+
+ guard(mutex)(&ptp_clock_mutex);
+ if (enable == test_bit(id, &ptp_timekeepers))
+ return count;
+
+ if (enable) {
+ ptp_clock_enable(CLOCK_PTP + id);
+ set_bit(id, &ptp_timekeepers);
+ } else {
+ ptp_clock_disable(CLOCK_PTP + id);
+ clear_bit(id, &ptp_timekeepers);
+ }
+ return count;
+}
+
+static ssize_t ptp_clock_enable_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
+{
+ unsigned long active = READ_ONCE(ptp_timekeepers);
+ /* Lazy atoi() as name is "0..7" */
+ int id = kobj->name[0] & 0x7;
+
+ return sysfs_emit(buf, "%d\n", test_bit(id, &active));
+}
+
+static struct kobj_attribute ptp_clock_enable_attr = __ATTR_RW(ptp_clock_enable);
+
+static struct attribute *ptp_clock_enable_attrs[] = {
+ &ptp_clock_enable_attr.attr,
+ NULL,
+};
+
+static const struct attribute_group ptp_clock_enable_attr_group = {
+ .attrs = ptp_clock_enable_attrs,
+};
+
+static int __init tk_ptp_sysfs_init(void)
+{
+ struct kobject *ptpo, *tko = kobject_create_and_add("time", kernel_kobj);
+
+ if (!tko) {
+ pr_warn("Unable to create /sys/kernel/time/. POSIX PTP clocks disabled.\n");
+ return -ENOMEM;
+ }
+
+ ptpo = kobject_create_and_add("ptp_clocks", tko);
+ if (!ptpo) {
+ pr_warn("Unable to create /sys/kernel/time/ptp_clocks. POSIX PTP clocks disabled.\n");
+ kobject_put(tko);
+ return -ENOMEM;
+ }
+
+ for (int i = TIMEKEEPER_PTP; i <= TIMEKEEPER_PTP_LAST; i++) {
+ char id[2] = { [0] = '0' + (i - TIMEKEEPER_PTP), };
+ struct kobject *clk = kobject_create_and_add(id, ptpo);
+
+ if (!clk) {
+ pr_warn("Unable to create /sys/kernel/time/ptp_clocks/%d\n",
+ i - TIMEKEEPER_PTP);
+ return -ENOMEM;
+ }
+
+ int ret = sysfs_create_group(clk, &ptp_clock_enable_attr_group);
+
+ if (ret) {
+ pr_warn("Unable to create /sys/kernel/time/ptp_clocks/%d/enable\n",
+ i - TIMEKEEPER_PTP);
+ return ret;
+ }
+ }
+ return 0;
+}
+late_initcall(tk_ptp_sysfs_init);
+
static __init void tk_ptp_setup(void)
{
for (int i = TIMEKEEPER_PTP; i <= TIMEKEEPER_PTP_LAST; i++)
next prev parent reply other threads:[~2025-05-13 15:13 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-13 15:12 [patch 00/26] timekeeping: Provide support for independent PTP timekeepers Thomas Gleixner
2025-05-13 15:12 ` [patch 01/26] timekeeping: Remove hardcoded access to tk_core Thomas Gleixner
2025-05-13 15:12 ` [patch 02/26] timekeeping: Cleanup kernel doc of __ktime_get_real_seconds() Thomas Gleixner
2025-05-13 15:13 ` [patch 03/26] timekeeping: Avoid double notification in do_adjtimex() Thomas Gleixner
2025-05-13 15:13 ` [patch 04/26] timekeeping: Introduce timekeeper ID Thomas Gleixner
2025-05-13 15:13 ` [patch 05/26] time: Introduce PTP clocks Thomas Gleixner
2025-05-13 15:13 ` [patch 06/26] ntp: Add support for PTP timekeepers Thomas Gleixner
2025-05-13 15:13 ` [patch 07/26] ntp: Add timekeeper ID arguments to public functions Thomas Gleixner
2025-05-13 15:13 ` [patch 08/26] ntp: Rename __do_adjtimex() to ntp_adjtimex() Thomas Gleixner
2025-05-13 15:13 ` [patch 09/26] timekeeping: Make __timekeeping_advance() reusable Thomas Gleixner
2025-05-13 15:13 ` [patch 10/26] timekeeping: Prepare timekeeping_update_from_shadow() Thomas Gleixner
2025-05-13 15:13 ` [patch 11/26] timekeeping: Add clock_valid flag to timekeeper Thomas Gleixner
2025-05-13 15:13 ` [patch 12/26] timekeeping: Introduce PTP time keepers Thomas Gleixner
2025-05-13 15:13 ` [patch 13/26] timekeeping: Provide ktime_get_ntp_seconds() Thomas Gleixner
2025-05-13 15:13 ` [patch 14/26] ntp: Use ktime_get_ntp_seconds() Thomas Gleixner
2025-05-13 15:13 ` [patch 15/26] timekeeping: Add PTP offset to timekeeper Thomas Gleixner
2025-05-13 15:13 ` [patch 16/26] timekeeping: Update PTP timekeepers on clocksource change Thomas Gleixner
2025-05-13 15:13 ` [patch 17/26] timekeeping: Provide time getters for PTP clocks Thomas Gleixner
2025-05-13 15:13 ` [patch 18/26] timekeeping: Add minimal posix-timers support " Thomas Gleixner
2025-05-13 15:13 ` [patch 19/26] timekeeping: Provide time setter " Thomas Gleixner
2025-05-13 15:13 ` [patch 20/26] timekeeping: Make timekeeping_inject_offset() reusable Thomas Gleixner
2025-05-13 15:13 ` [patch 21/26] timekeeping: Add PTP clock support to __timekeeping_inject_offset() Thomas Gleixner
2025-05-13 15:13 ` [patch 22/26] timekeeping: Make do_adjtimex() reusable Thomas Gleixner
2025-05-13 15:13 ` [patch 23/26] timekeeping: Prepare do_adtimex() for PTP clocks Thomas Gleixner
2025-05-13 15:13 ` [patch 24/26] timekeeping: Provide adjtimex() " Thomas Gleixner
2025-05-13 15:13 ` [patch 25/26] timekeeping: Provide update for PTP timekeepers Thomas Gleixner
2025-05-13 15:13 ` Thomas Gleixner [this message]
2025-05-14 8:07 ` [patch 26/26] timekeeping: Provide interface to control independent PTP clocks Antoine Tenart
2025-05-14 8:37 ` Thomas Gleixner
2025-05-14 7:12 ` [patch 00/26] timekeeping: Provide support for independent PTP timekeepers Miroslav Lichvar
2025-05-14 8:54 ` Thomas Gleixner
2025-05-14 15:58 ` Richard Cochran
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=20250513145138.212062332@linutronix.de \
--to=tglx@linutronix.de \
--cc=anna-maria@linutronix.de \
--cc=christopher.s.hall@intel.com \
--cc=david.zage@intel.com \
--cc=dwmw2@infradead.org \
--cc=frederic@kernel.org \
--cc=gieri@linutronix.de \
--cc=jstultz@google.com \
--cc=kurt@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=mlichvar@redhat.com \
--cc=namcao@linutronix.de \
--cc=netdev@vger.kernel.org \
--cc=richardcochran@gmail.com \
--cc=sboyd@kernel.org \
--cc=thomas.weissschuh@linutronix.de \
--cc=werner.abt@meinberg-usa.com \
/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).