From nobody Sat Feb 7 23:06:07 2026 Received: from fra-out-005.esa.eu-central-1.outbound.mail-perimeter.amazon.com (fra-out-005.esa.eu-central-1.outbound.mail-perimeter.amazon.com [63.176.194.123]) (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 1994B2765C4; Tue, 2 Dec 2025 20:11:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=63.176.194.123 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764706320; cv=none; b=OilStuSXtkkcR2UZiq3gPdyjg8Pi48kQjILShjaGEYU10//MQkIyegokQ1x3276HQ9/1uxAhaopDf3F5cIFlLN7qOkW8+DPDg7y1kxaMiMEHdFXenvAevBJJgLhkwYoJ28ld+DCpb7UOXFpPHQuQzAuIXfhVjoe/3ixLUufqjS4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764706320; c=relaxed/simple; bh=g7IsFndKbms56CVsPSbllGYFBT85qqD7dEcsX0qXs40=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=aNsLy6R49ObPxCT6Eq6jJ3Hhq35VqMtE78L1gKls5ZYx179BSkBSwRYqTwLqLuvR4MKSw5eOLi3KbemfyEZfkzCYFhpOKVhxcMke7SUsTb9//aGnUAlPO+xXssR0Al6hM/Le28s6ykzLw2YDJEugiezunKBw1VtKExd85ZM9Khc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.es; spf=pass smtp.mailfrom=amazon.es; dkim=pass (2048-bit key) header.d=amazon.es header.i=@amazon.es header.b=om4vsGg5; arc=none smtp.client-ip=63.176.194.123 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.es Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.es Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amazon.es header.i=@amazon.es header.b="om4vsGg5" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.es; i=@amazon.es; q=dns/txt; s=amazoncorp2; t=1764706318; x=1796242318; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=rJonkJ6xqSpQHV00BuZdIsvLrs8274Dh2dbeIEwEKKA=; b=om4vsGg5X5YxtdszApm7HrrL3WY5sbDMGeQHpUQxHFUZJBC4qsoQBupi WHqecWTly0Pl6A1XzBJieM08rURhZeakC6PF2Mjl4y5vbHAEWwHdDyMXX pYbGkZ4RQMKy93ObAZAOYV6ksOVsS5D25XBxHg97xeYNTOEL27zjCl9pH 4Z+Yd5KTF9r/Td/gTJAkMUS+ZytBBSUfPNmAWTfo8+UPAp2FR6rCzS5gh qR5+f6l7puDw0rXsg60ivnkwnfvNWup2mrdOU3zvU3B25+Wu4lJV4k66l mchUAyZASdEjcKo0ACKreJo7Ki2qYb4WKm079WeDOMalj1h0W7Vve1M89 g==; X-CSE-ConnectionGUID: TlGgzM47QmG9ExDtie/71g== X-CSE-MsgGUID: i87N4NA4RJmwj19MVrnKBg== X-IronPort-AV: E=Sophos;i="6.20,243,1758585600"; d="scan'208";a="6144503" Received: from ip-10-6-3-216.eu-central-1.compute.internal (HELO smtpout.naws.eu-central-1.prod.farcaster.email.amazon.dev) ([10.6.3.216]) by internal-fra-out-005.esa.eu-central-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Dec 2025 20:11:40 +0000 Received: from EX19MTAEUA002.ant.amazon.com [54.240.197.232:16772] by smtpin.naws.eu-central-1.prod.farcaster.email.amazon.dev [10.0.21.117:2525] with esmtp (Farcaster) id a9dafb6a-c1c9-4ba0-a802-78cfe575a742; Tue, 2 Dec 2025 20:11:39 +0000 (UTC) X-Farcaster-Flow-ID: a9dafb6a-c1c9-4ba0-a802-78cfe575a742 Received: from EX19D012EUA003.ant.amazon.com (10.252.50.98) by EX19MTAEUA002.ant.amazon.com (10.252.50.124) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.29; Tue, 2 Dec 2025 20:11:32 +0000 Received: from EX19D012EUA001.ant.amazon.com (10.252.50.122) by EX19D012EUA003.ant.amazon.com (10.252.50.98) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.29; Tue, 2 Dec 2025 20:11:32 +0000 Received: from EX19D012EUA001.ant.amazon.com ([fe80::b7ea:84f7:2c4b:2719]) by EX19D012EUA001.ant.amazon.com ([fe80::b7ea:84f7:2c4b:2719%3]) with mapi id 15.02.2562.029; Tue, 2 Dec 2025 20:11:32 +0000 From: "Chalios, Babis" To: "richardcochran@gmail.com" , "dwmw2@infradead.org" , "andrew+netdev@lunn.ch" , "davem@davemloft.net" , "edumazet@google.com" , "kuba@kernel.org" , "pabeni@redhat.com" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: "Chalios, Babis" , "Graf (AWS), Alexander" , "mzxreary@0pointer.de" Subject: [PATCH v2 1/4] ptp: vmclock: add vm generation counter Thread-Topic: [PATCH v2 1/4] ptp: vmclock: add vm generation counter Thread-Index: AQHcY8faxhjiyz2mPkiGjW1j83OATw== Date: Tue, 2 Dec 2025 20:11:32 +0000 Message-ID: <20251202201118.20209-2-bchalios@amazon.es> References: <20251202201118.20209-1-bchalios@amazon.es> In-Reply-To: <20251202201118.20209-1-bchalios@amazon.es> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: Content-Transfer-Encoding: quoted-printable Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Similar to live migration, loading a VM from some saved state (aka snapshot) is also an event that calls for clock adjustments in the guest. However, guests might want to take more actions as a response to such events, e.g. as discarding UUIDs, resetting network connections, reseeding entropy pools, etc. These are actions that guests don't typically take during live migration, so add a new field in the vmclock_abi called vm_generation_counter which informs the guest about such events. Hypervisor advertises support for vm_generation_counter through the VMCLOCK_FLAG_VM_GEN_COUNTER_PRESENT flag. Users need to check the presence of this bit in vmclock_abi flags field before using this flag. Signed-off-by: Babis Chalios --- include/uapi/linux/vmclock-abi.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/uapi/linux/vmclock-abi.h b/include/uapi/linux/vmclock-= abi.h index 2d99b29ac44a..937fe00e4f33 100644 --- a/include/uapi/linux/vmclock-abi.h +++ b/include/uapi/linux/vmclock-abi.h @@ -115,6 +115,12 @@ struct vmclock_abi { * bit again after the update, using the about-to-be-valid fields. */ #define VMCLOCK_FLAG_TIME_MONOTONIC (1 << 7) + /* + * If the VM_GEN_COUNTER_PRESENT flag is set, the hypervisor will + * bump the vm_generation_counter field every time the guest is + * loaded from some save state (restored from a snapshot). + */ +#define VMCLOCK_FLAG_VM_GEN_COUNTER_PRESENT (1 << 8) =20 __u8 pad[2]; __u8 clock_status; @@ -177,6 +183,15 @@ struct vmclock_abi { __le64 time_frac_sec; /* Units of 1/2^64 of a second */ __le64 time_esterror_nanosec; __le64 time_maxerror_nanosec; + + /* + * This field changes to another non-repeating value when the guest + * has been loaded from a snapshot. In addition to handling a + * disruption in time (which will also be signalled through the + * disruption_marker field), a guest may wish to discard UUIDs, + * reset network connections, reseed entropy, etc. + */ + __le64 vm_generation_counter; }; =20 #endif /* __VMCLOCK_ABI_H__ */ --=20 2.34.1 From nobody Sat Feb 7 23:06:07 2026 Received: from fra-out-011.esa.eu-central-1.outbound.mail-perimeter.amazon.com (fra-out-011.esa.eu-central-1.outbound.mail-perimeter.amazon.com [52.28.197.132]) (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 9949E2F1FF1; Tue, 2 Dec 2025 20:12:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=52.28.197.132 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764706326; cv=none; b=GMthUTZVDBw0zwokObra7ns8tpi6tC47fh3fte6UP/LVE7ruHB+icpnS5+wJ3UfCJ7H2nOFE4Kx/sWND9mKUCKsvAxHnTYqV4Wwc0odbnJ3FkzvCcdt8uQfSEmQXa15g22WLuGqKKflA6shXz/HFjbCwzlwOfMrRsSw1+uQMUIk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764706326; c=relaxed/simple; bh=jKDLhxOuXSGECxVi17C7Xvw3+r4ZTtQ9XW/EHnzHzXU=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=LPO/wFVA7SAMvbfMlaK1Xh4OUAtDoFev7yUtyB/JlfKIgjD0HdaEhCgyB5rd5LpMEpI63cujZjLiq1l5MDs26SB6EmXBHWiaoJG/K/k7BHHGGmDj5QkFnjxL6tQ3RdCXxc/W/E8uBFUEr00Jf+EFE9CAUt3IqY7oabv9jC04TnU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.es; spf=pass smtp.mailfrom=amazon.es; dkim=pass (2048-bit key) header.d=amazon.es header.i=@amazon.es header.b=HqRg/x+w; arc=none smtp.client-ip=52.28.197.132 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.es Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.es Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amazon.es header.i=@amazon.es header.b="HqRg/x+w" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.es; i=@amazon.es; q=dns/txt; s=amazoncorp2; t=1764706324; x=1796242324; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-id:content-transfer-encoding: mime-version; bh=jKDLhxOuXSGECxVi17C7Xvw3+r4ZTtQ9XW/EHnzHzXU=; b=HqRg/x+w22xKLhW5vdkaPVkD4TiFngYtDiAUUaxCN0N5rSe0rY+a9FRo MpgC0dvP7Z/M6TwOSBSqbveHMoD5z9pPLojPnX9+SbQKcNzbXdwOnVcvi ElXlvBkTUP4PuZYjn0J0vK2thwT/Ub25tK3UVR+taVbZM2OEFHRvxCZ7S Npxiu+YbjpF/3LeTr9nKQVwfI7jBjcaZUDwjs9ju9NwXCq4iHDa+tV6fs y9Pmg8jGpIspi79ww5+RMRjYULkRQLkmNObNQ/cyl3MHyaQYZKc7DSnUc +QG4DShdDBcRgRz2Z1BuNsLZJGaStqXvZovVcEIPWYipJAhkymQpVgSr3 A==; X-CSE-ConnectionGUID: lq1P4VrnR4Ke3Hf9616ZgA== X-CSE-MsgGUID: YRF23LAbSZmoZPTb+9JLvA== X-IronPort-AV: E=Sophos;i="6.20,243,1758585600"; d="scan'208";a="6028386" Received: from ip-10-6-6-97.eu-central-1.compute.internal (HELO smtpout.naws.eu-central-1.prod.farcaster.email.amazon.dev) ([10.6.6.97]) by internal-fra-out-011.esa.eu-central-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Dec 2025 20:11:46 +0000 Received: from EX19MTAEUB002.ant.amazon.com [54.240.197.232:20374] by smtpin.naws.eu-central-1.prod.farcaster.email.amazon.dev [10.0.27.255:2525] with esmtp (Farcaster) id fed2d096-45ad-42e0-b281-fa886dbd7a03; Tue, 2 Dec 2025 20:11:46 +0000 (UTC) X-Farcaster-Flow-ID: fed2d096-45ad-42e0-b281-fa886dbd7a03 Received: from EX19D012EUA001.ant.amazon.com (10.252.50.122) by EX19MTAEUB002.ant.amazon.com (10.252.51.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.29; Tue, 2 Dec 2025 20:11:44 +0000 Received: from EX19D012EUA001.ant.amazon.com (10.252.50.122) by EX19D012EUA001.ant.amazon.com (10.252.50.122) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.29; Tue, 2 Dec 2025 20:11:44 +0000 Received: from EX19D012EUA001.ant.amazon.com ([fe80::b7ea:84f7:2c4b:2719]) by EX19D012EUA001.ant.amazon.com ([fe80::b7ea:84f7:2c4b:2719%3]) with mapi id 15.02.2562.029; Tue, 2 Dec 2025 20:11:44 +0000 From: "Chalios, Babis" To: "richardcochran@gmail.com" , "dwmw2@infradead.org" , "andrew+netdev@lunn.ch" , "davem@davemloft.net" , "edumazet@google.com" , "kuba@kernel.org" , "pabeni@redhat.com" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: "Chalios, Babis" , "Graf (AWS), Alexander" , "mzxreary@0pointer.de" Subject: [PATCH v2 2/4] ptp: vmclock: support device notifications Thread-Topic: [PATCH v2 2/4] ptp: vmclock: support device notifications Thread-Index: AQHcY8fhllbu2ppda0GOES0yZ505WA== Date: Tue, 2 Dec 2025 20:11:44 +0000 Message-ID: <20251202201118.20209-3-bchalios@amazon.es> References: <20251202201118.20209-1-bchalios@amazon.es> In-Reply-To: <20251202201118.20209-1-bchalios@amazon.es> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: Content-Type: text/plain; charset="utf-8" Content-ID: <52C5D8D376790041A203A3E3DE0ED712@amazon.com> Content-Transfer-Encoding: quoted-printable Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add optional support for device notifications in VMClock. When supported, the hypervisor will send a device notification every time it updates the seq_count to a new even value. Moreover, add support for poll() in VMClock as a means to propagate this notification to user space. poll() will return a POLLIN event to listeners every time seq_count changes to a value different than the one last seen (since open() or last read()/pread()). This means that when poll() returns a POLLIN event, listeners need to use read() to observe what has changed and update the reader's view of seq_count. In other words, after a poll() returned, all subsequent calls to poll() will immediately return with a POLLIN event until the listener calls read(). The device advertises support for the notification mechanism by setting flag VMCLOCK_FLAG_NOTIFICATION_PRESENT in vmclock_abi flags field. If the flag is not present the driver won't setup the ACPI notification handler and poll() will always immediately return POLLHUP. Signed-off-by: Babis Chalios --- drivers/ptp/ptp_vmclock.c | 126 +++++++++++++++++++++++++++++-- include/uapi/linux/vmclock-abi.h | 5 ++ 2 files changed, 124 insertions(+), 7 deletions(-) diff --git a/drivers/ptp/ptp_vmclock.c b/drivers/ptp/ptp_vmclock.c index b3a83b03d9c1..49a17435bd35 100644 --- a/drivers/ptp/ptp_vmclock.c +++ b/drivers/ptp/ptp_vmclock.c @@ -5,6 +5,9 @@ * Copyright =C2=A9 2024 Amazon.com, Inc. or its affiliates. */ =20 +#include "linux/poll.h" +#include "linux/types.h" +#include "linux/wait.h" #include #include #include @@ -39,6 +42,7 @@ struct vmclock_state { struct resource res; struct vmclock_abi *clk; struct miscdevice miscdev; + wait_queue_head_t disrupt_wait; struct ptp_clock_info ptp_clock_info; struct ptp_clock *ptp_clock; enum clocksource_ids cs_id, sys_cs_id; @@ -357,10 +361,15 @@ static struct ptp_clock *vmclock_ptp_register(struct = device *dev, return ptp_clock_register(&st->ptp_clock_info, dev); } =20 +struct vmclock_file_state { + struct vmclock_state *st; + atomic_t seq; +}; + static int vmclock_miscdev_mmap(struct file *fp, struct vm_area_struct *vm= a) { - struct vmclock_state *st =3D container_of(fp->private_data, - struct vmclock_state, miscdev); + struct vmclock_file_state *fst =3D fp->private_data; + struct vmclock_state *st =3D fst->st; =20 if ((vma->vm_flags & (VM_READ|VM_WRITE)) !=3D VM_READ) return -EROFS; @@ -379,11 +388,12 @@ static int vmclock_miscdev_mmap(struct file *fp, stru= ct vm_area_struct *vma) static ssize_t vmclock_miscdev_read(struct file *fp, char __user *buf, size_t count, loff_t *ppos) { - struct vmclock_state *st =3D container_of(fp->private_data, - struct vmclock_state, miscdev); + struct vmclock_file_state *fst =3D fp->private_data; + struct vmclock_state *st =3D fst->st; + ktime_t deadline =3D ktime_add(ktime_get(), VMCLOCK_MAX_WAIT); size_t max_count; - uint32_t seq; + uint32_t seq, old_seq; =20 if (*ppos >=3D PAGE_SIZE) return 0; @@ -392,6 +402,7 @@ static ssize_t vmclock_miscdev_read(struct file *fp, ch= ar __user *buf, if (count > max_count) count =3D max_count; =20 + old_seq =3D atomic_read(&fst->seq); while (1) { seq =3D le32_to_cpu(st->clk->seq_count) & ~1U; /* Pairs with hypervisor wmb */ @@ -402,8 +413,16 @@ static ssize_t vmclock_miscdev_read(struct file *fp, c= har __user *buf, =20 /* Pairs with hypervisor wmb */ virt_rmb(); - if (seq =3D=3D le32_to_cpu(st->clk->seq_count)) - break; + if (seq =3D=3D le32_to_cpu(st->clk->seq_count)) { + /* + * Either we updated fst->seq to seq (the latest version we observed) + * or someone else did (old_seq =3D=3D seq), so we can break. + */ + if (atomic_try_cmpxchg(&fst->seq, &old_seq, seq) || + old_seq =3D=3D seq) { + break; + } + } =20 if (ktime_after(ktime_get(), deadline)) return -ETIMEDOUT; @@ -413,10 +432,58 @@ static ssize_t vmclock_miscdev_read(struct file *fp, = char __user *buf, return count; } =20 +static __poll_t vmclock_miscdev_poll(struct file *fp, poll_table *wait) +{ + struct vmclock_file_state *fst =3D fp->private_data; + struct vmclock_state *st =3D fst->st; + uint32_t seq; + + /* + * Hypervisor will not send us any notifications, so fail immediately + * to avoid having caller sleeping for ever. + */ + if (!(st->clk->flags & VMCLOCK_FLAG_NOTIFICATION_PRESENT)) + return POLLHUP; + + poll_wait(fp, &st->disrupt_wait, wait); + + seq =3D le32_to_cpu(st->clk->seq_count); + if (atomic_read(&fst->seq) !=3D seq) + return POLLIN | POLLRDNORM; + + return 0; +} + +static int vmclock_miscdev_open(struct inode *inode, struct file *fp) +{ + struct vmclock_state *st =3D container_of(fp->private_data, + struct vmclock_state, miscdev); + struct vmclock_file_state *fst =3D kzalloc(sizeof(*fst), GFP_KERNEL); + + if (!fst) + return -ENOMEM; + + fst->st =3D st; + atomic_set(&fst->seq, 0); + + fp->private_data =3D fst; + + return 0; +} + +static int vmclock_miscdev_release(struct inode *inode, struct file *fp) +{ + kfree(fp->private_data); + return 0; +} + static const struct file_operations vmclock_miscdev_fops =3D { .owner =3D THIS_MODULE, + .open =3D vmclock_miscdev_open, + .release =3D vmclock_miscdev_release, .mmap =3D vmclock_miscdev_mmap, .read =3D vmclock_miscdev_read, + .poll =3D vmclock_miscdev_poll, }; =20 /* module operations */ @@ -459,6 +526,44 @@ static acpi_status vmclock_acpi_resources(struct acpi_= resource *ares, void *data return AE_ERROR; } =20 +static void +vmclock_acpi_notification_handler(acpi_handle __always_unused handle, + u32 __always_unused event, void *dev) +{ + struct device *device =3D dev; + struct vmclock_state *st =3D device->driver_data; + + wake_up_interruptible(&st->disrupt_wait); +} + +static int vmclock_setup_notification(struct device *dev, struct vmclock_s= tate *st) +{ + struct acpi_device *adev =3D ACPI_COMPANION(dev); + acpi_status status; + + /* + * This should never happen as this function is only called when + * has_acpi_companion(dev) is true, but the logic is sufficiently + * complex that Coverity can't see the tautology. + */ + if (!adev) + return -ENODEV; + + /* The device does not support notifications. Nothing else to do */ + if (!(le64_to_cpu(st->clk->flags) & VMCLOCK_FLAG_NOTIFICATION_PRESENT)) + return 0; + + status =3D acpi_install_notify_handler(adev->handle, ACPI_DEVICE_NOTIFY, + vmclock_acpi_notification_handler, + dev); + if (ACPI_FAILURE(status)) { + dev_err(dev, "failed to install notification handler"); + return -ENODEV; + } + + return 0; +} + static int vmclock_probe_acpi(struct device *dev, struct vmclock_state *st) { struct acpi_device *adev =3D ACPI_COMPANION(dev); @@ -549,6 +654,11 @@ static int vmclock_probe(struct platform_device *pdev) if (ret) return ret; =20 + init_waitqueue_head(&st->disrupt_wait); + ret =3D vmclock_setup_notification(dev, st); + if (ret) + return ret; + /* * If the structure is big enough, it can be mapped to userspace. * Theoretically a guest OS even using larger pages could still @@ -581,6 +691,8 @@ static int vmclock_probe(struct platform_device *pdev) return -ENODEV; } =20 + dev->driver_data =3D st; + dev_info(dev, "%s: registered %s%s%s\n", st->name, st->miscdev.minor ? "miscdev" : "", (st->miscdev.minor && st->ptp_clock) ? ", " : "", diff --git a/include/uapi/linux/vmclock-abi.h b/include/uapi/linux/vmclock-= abi.h index 937fe00e4f33..d320623b0118 100644 --- a/include/uapi/linux/vmclock-abi.h +++ b/include/uapi/linux/vmclock-abi.h @@ -121,6 +121,11 @@ struct vmclock_abi { * loaded from some save state (restored from a snapshot). */ #define VMCLOCK_FLAG_VM_GEN_COUNTER_PRESENT (1 << 8) + /* + * If the NOTIFICATION_PRESENT flag is set, the hypervisor will send + * a notification every time it updates seq_count to a new even number. + */ +#define VMCLOCK_FLAG_NOTIFICATION_PRESENT (1 << 9) =20 __u8 pad[2]; __u8 clock_status; --=20 2.34.1 From nobody Sat Feb 7 23:06:07 2026 Received: from fra-out-011.esa.eu-central-1.outbound.mail-perimeter.amazon.com (fra-out-011.esa.eu-central-1.outbound.mail-perimeter.amazon.com [52.28.197.132]) (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 453932F25F1; Tue, 2 Dec 2025 20:12:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=52.28.197.132 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764706329; cv=none; b=FXsB8Oer+AnzZ8NYfPaBeBnBL7QlFEBB4mjJRov6xLgF8RwLKzSYFIrOsDK094rE/a9gidjjcoFSawi4tN22pLEVRJExQm0ouD8vm5UPps58xFYtsXCC/SdmMl2miUKvDt4G9Lftf9EmUjRdPKkGR9ZuESDCnr1puiAXKSQoqRA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764706329; c=relaxed/simple; bh=Fsj3pmw5yQQaqvWUUUBc+HPOsoYlv+wjOFoZLU/Tagc=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=dw58vW1fZypM31+DRTHXY2dpwQ+zWiBuULkniszGdKku6kp490bym/XN/HWH3hKO3GICfHaofgZj2Xk2K2VZGCD97L7d1KSaUYV5haaHjSAo03a5y/rRSDeAIllapmLtDaHzR2VzaBm4t9pP095gRfvvaHKTpzPMzQqxXak2ARI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.es; spf=pass smtp.mailfrom=amazon.es; dkim=pass (2048-bit key) header.d=amazon.es header.i=@amazon.es header.b=q1tY+BeQ; arc=none smtp.client-ip=52.28.197.132 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.es Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.es Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amazon.es header.i=@amazon.es header.b="q1tY+BeQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.es; i=@amazon.es; q=dns/txt; s=amazoncorp2; t=1764706327; x=1796242327; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=+XRX+zfeLkFYnkeD4QM7WrFm6Yhmh8DiQzSrma3Jqd8=; b=q1tY+BeQh8uztrEQ3k2qQ3mmcszsWuPspr2cU0M9r7D6IS2eMTDR936Q 0gJ4XJDkX5Ifdklyl4u5mcHurwjae+XzcYCg0M7RUErcdFc4/6kaPVYee +9QpP9Yf0kVprrDGytfzUhnVhgvyhwvix7Gy4eNmFEkXhLFwp2irDU/0M /RM3xqU2qL4fYXPS0mQQu9rArsJ61kuME/uRrFuG87J9q/6eUkIUQmoCm rFazsWF2ocDWTTkM6JgtqsYkCAaI4oMK1HozRX797uJuaFJWpW8qhAwCq m5Phq7V4LrqLrqMKwr8HXjCn3htpU+2cW81sdirmvLJCXlEaraLlj2SRa w==; X-CSE-ConnectionGUID: FCJ9coTHQ2KfQmKz72ceew== X-CSE-MsgGUID: kA82ZogUTomQb9BT12wnCg== X-IronPort-AV: E=Sophos;i="6.20,243,1758585600"; d="scan'208";a="6028406" Received: from ip-10-6-11-83.eu-central-1.compute.internal (HELO smtpout.naws.eu-central-1.prod.farcaster.email.amazon.dev) ([10.6.11.83]) by internal-fra-out-011.esa.eu-central-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Dec 2025 20:11:56 +0000 Received: from EX19MTAEUB001.ant.amazon.com [54.240.197.234:19834] by smtpin.naws.eu-central-1.prod.farcaster.email.amazon.dev [10.0.33.168:2525] with esmtp (Farcaster) id ff878b85-38c1-4897-bf1b-02f6f1882526; Tue, 2 Dec 2025 20:11:56 +0000 (UTC) X-Farcaster-Flow-ID: ff878b85-38c1-4897-bf1b-02f6f1882526 Received: from EX19D012EUA002.ant.amazon.com (10.252.50.32) by EX19MTAEUB001.ant.amazon.com (10.252.51.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.29; Tue, 2 Dec 2025 20:11:56 +0000 Received: from EX19D012EUA001.ant.amazon.com (10.252.50.122) by EX19D012EUA002.ant.amazon.com (10.252.50.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.29; Tue, 2 Dec 2025 20:11:56 +0000 Received: from EX19D012EUA001.ant.amazon.com ([fe80::b7ea:84f7:2c4b:2719]) by EX19D012EUA001.ant.amazon.com ([fe80::b7ea:84f7:2c4b:2719%3]) with mapi id 15.02.2562.029; Tue, 2 Dec 2025 20:11:56 +0000 From: "Chalios, Babis" To: "richardcochran@gmail.com" , "dwmw2@infradead.org" , "andrew+netdev@lunn.ch" , "davem@davemloft.net" , "edumazet@google.com" , "kuba@kernel.org" , "pabeni@redhat.com" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: "Chalios, Babis" , "Graf (AWS), Alexander" , "mzxreary@0pointer.de" , "Woodhouse, David" Subject: [PATCH v2 3/4] dt-bindings: clock: Add device tree bindings for vmclock Thread-Topic: [PATCH v2 3/4] dt-bindings: clock: Add device tree bindings for vmclock Thread-Index: AQHcY8fodA3Kt0qHa0qr5uQyHwjehw== Date: Tue, 2 Dec 2025 20:11:55 +0000 Message-ID: <20251202201118.20209-4-bchalios@amazon.es> References: <20251202201118.20209-1-bchalios@amazon.es> In-Reply-To: <20251202201118.20209-1-bchalios@amazon.es> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: Content-Transfer-Encoding: quoted-printable Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: David Woodhouse Add device tree bindings for the vmclock device, similar to the existing vmgenid bindings. The vmclock device provides a PTP clock source and precise timekeeping across live migration and snapshot/restore operations. The bindings specify a required memory region containing the vmclock_abi structure and an optional interrupt for clock disruption notifications. Signed-off-by: David Woodhouse Signed-off-by: Babis Chalios --- .../bindings/clock/amazon,vmclock.yaml | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/amazon,vmclock.= yaml diff --git a/Documentation/devicetree/bindings/clock/amazon,vmclock.yaml b/= Documentation/devicetree/bindings/clock/amazon,vmclock.yaml new file mode 100644 index 000000000000..f7dfa022bf6f --- /dev/null +++ b/Documentation/devicetree/bindings/clock/amazon,vmclock.yaml @@ -0,0 +1,46 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/clock/amazon,vmclock.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Virtual Machine Clock + +maintainers: + - David Woodhouse + +description: + The vmclock device provides a precise clock source and allows for + accurate timekeeping across live migration and snapshot/restore + operations. The full specification of the shared data structure + is available at https://david.woodhou.se/VMClock.pdf + +properties: + compatible: + const: amazon,vmclock + + reg: + description: + Specifies the shared memory region containing the vmclock_abi struct= ure. + maxItems: 1 + + interrupts: + description: + Interrupt used to notify when the contents of the vmclock_abi struct= ure + have been updated. + maxItems: 1 + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + #include + vmclock@80000000 { + compatible =3D "amazon,vmclock"; + reg =3D <0x80000000 0x1000>; + interrupts =3D ; + }; --=20 2.34.1 From nobody Sat Feb 7 23:06:07 2026 Received: from fra-out-010.esa.eu-central-1.outbound.mail-perimeter.amazon.com (fra-out-010.esa.eu-central-1.outbound.mail-perimeter.amazon.com [63.178.143.178]) (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 CB8CB2F12C5; Tue, 2 Dec 2025 20:12:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=63.178.143.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764706353; cv=none; b=cUzyX522ILxwwdALKtBW61siHeY5IySD6PEXYIdRBb56EZ4JVdoRLblHzcvm+61zSVyu7Eg8CpofDxD7g0KrJamIe4GXzEniDlnSN9Vos5I+HVaOb9eH4c2ck+SgLZ6ziaOJIj0aGeVBx7cCVTsycNy2cIS5LHx0phmH0rCLNDI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764706353; c=relaxed/simple; bh=AOaiu2tMawVBD0mZxdxa9p7svFZnda8T89m0tVUD3LE=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=KH9A3wlEkh/yZCthXDNhzmlU6inJNisKOPnM/JdXeXUTAEway4D5ULf6RWmzYNPZayG4Dko/2PioQ9h96aLF26EzPJ9tYEG8R7W2iRcxIwTUWS8y2ywaIWg1jecMk9nbjaFI1r18R5iZzGHOML2OPOO5wJqVGmsZtCQJTfHJz4g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.es; spf=pass smtp.mailfrom=amazon.es; dkim=pass (2048-bit key) header.d=amazon.es header.i=@amazon.es header.b=c17NsUMO; arc=none smtp.client-ip=63.178.143.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.es Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.es Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amazon.es header.i=@amazon.es header.b="c17NsUMO" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.es; i=@amazon.es; q=dns/txt; s=amazoncorp2; t=1764706352; x=1796242352; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=zbbsCUZvcc0HWMG+iqOrpHdbOsL0drXWWmqWxPz+iJA=; b=c17NsUMOQvKz/md4dZssIphquJmBlP5aYQHauZ7ynbyh1lIbx10ZYDsj q8thTDhvLgGKTwdvJxgxdqFy6Jw+AaJUZZEujY0Gsc0oXRIXpTV3dFDaD APsAvbKxnoHc8IbkegkKHzB83woZYS24Vd1tI9ollX8vOdeOgPupUU4sl Gh1Da9cg7jTcz3t3S+2X/IBbh4m5xqN9ndkr+/t8W1ABQkLe48a0k0FHW Ki1VaiKg+g+eDWxrS3eLj6No/MP32dHuMpv8FEsL2BCFmXKRoEImsBBL8 P5/ZrE20jSZdtNtvLUuMKvm2Xkn/xpLlSBG3Vz0O1hdB+luC1A9KyK7f1 g==; X-CSE-ConnectionGUID: VS4+5G4ySkqrHmdcSGjltw== X-CSE-MsgGUID: 3GSuVhiAS52a+oO6o4FY7A== X-IronPort-AV: E=Sophos;i="6.20,243,1758585600"; d="scan'208";a="6035275" Received: from ip-10-6-11-83.eu-central-1.compute.internal (HELO smtpout.naws.eu-central-1.prod.farcaster.email.amazon.dev) ([10.6.11.83]) by internal-fra-out-010.esa.eu-central-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Dec 2025 20:12:11 +0000 Received: from EX19MTAEUB001.ant.amazon.com [54.240.197.226:24061] by smtpin.naws.eu-central-1.prod.farcaster.email.amazon.dev [10.0.9.5:2525] with esmtp (Farcaster) id da84706e-e464-4186-9cc2-e593722a54cd; Tue, 2 Dec 2025 20:12:08 +0000 (UTC) X-Farcaster-Flow-ID: da84706e-e464-4186-9cc2-e593722a54cd Received: from EX19D012EUA003.ant.amazon.com (10.252.50.98) by EX19MTAEUB001.ant.amazon.com (10.252.51.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.29; Tue, 2 Dec 2025 20:12:08 +0000 Received: from EX19D012EUA001.ant.amazon.com (10.252.50.122) by EX19D012EUA003.ant.amazon.com (10.252.50.98) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.29; Tue, 2 Dec 2025 20:12:07 +0000 Received: from EX19D012EUA001.ant.amazon.com ([fe80::b7ea:84f7:2c4b:2719]) by EX19D012EUA001.ant.amazon.com ([fe80::b7ea:84f7:2c4b:2719%3]) with mapi id 15.02.2562.029; Tue, 2 Dec 2025 20:12:07 +0000 From: "Chalios, Babis" To: "richardcochran@gmail.com" , "dwmw2@infradead.org" , "andrew+netdev@lunn.ch" , "davem@davemloft.net" , "edumazet@google.com" , "kuba@kernel.org" , "pabeni@redhat.com" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: "Chalios, Babis" , "Graf (AWS), Alexander" , "mzxreary@0pointer.de" , "Woodhouse, David" Subject: [PATCH v2 4/4] ptp: ptp_vmclock: Add device tree support Thread-Topic: [PATCH v2 4/4] ptp: ptp_vmclock: Add device tree support Thread-Index: AQHcY8fv2rka6hdwsk+0SPLJdAw4NA== Date: Tue, 2 Dec 2025 20:12:07 +0000 Message-ID: <20251202201118.20209-5-bchalios@amazon.es> References: <20251202201118.20209-1-bchalios@amazon.es> In-Reply-To: <20251202201118.20209-1-bchalios@amazon.es> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: Content-Transfer-Encoding: quoted-printable Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: David Woodhouse Add device tree support to the ptp_vmclock driver, allowing it to probe via device tree in addition to ACPI. Handle optional interrupt for clock disruption notifications, mirroring the ACPI notification behavior. Signed-off-by: David Woodhouse Signed-off-by: Babis Chalios --- drivers/ptp/ptp_vmclock.c | 69 +++++++++++++++++++++++++++++++++++---- 1 file changed, 63 insertions(+), 6 deletions(-) diff --git a/drivers/ptp/ptp_vmclock.c b/drivers/ptp/ptp_vmclock.c index 49a17435bd35..1af50e06e212 100644 --- a/drivers/ptp/ptp_vmclock.c +++ b/drivers/ptp/ptp_vmclock.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include =20 @@ -536,7 +537,7 @@ vmclock_acpi_notification_handler(acpi_handle __always_= unused handle, wake_up_interruptible(&st->disrupt_wait); } =20 -static int vmclock_setup_notification(struct device *dev, struct vmclock_s= tate *st) +static int vmclock_setup_acpi_notification(struct device *dev) { struct acpi_device *adev =3D ACPI_COMPANION(dev); acpi_status status; @@ -549,10 +550,6 @@ static int vmclock_setup_notification(struct device *d= ev, struct vmclock_state * if (!adev) return -ENODEV; =20 - /* The device does not support notifications. Nothing else to do */ - if (!(le64_to_cpu(st->clk->flags) & VMCLOCK_FLAG_NOTIFICATION_PRESENT)) - return 0; - status =3D acpi_install_notify_handler(adev->handle, ACPI_DEVICE_NOTIFY, vmclock_acpi_notification_handler, dev); @@ -587,6 +584,59 @@ static int vmclock_probe_acpi(struct device *dev, stru= ct vmclock_state *st) return 0; } =20 +static irqreturn_t vmclock_of_irq_handler(int __always_unused irq, void *d= ev) +{ + struct device *device =3D dev; + struct vmclock_state *st =3D device->driver_data; + + wake_up_interruptible(&st->disrupt_wait); + return IRQ_HANDLED; +} + +static int vmclock_probe_dt(struct device *dev, struct vmclock_state *st) +{ + struct platform_device *pdev =3D to_platform_device(dev); + struct resource *res; + int irq, ret; + + res =3D platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) + return -ENODEV; + + st->res =3D *res; + + return 0; +} + +static int vmclock_setup_of_notification(struct device *dev) +{ + struct platform_device *pdev =3D to_platform_device(dev); + int irq; + + irq =3D platform_get_irq(pdev, 0); + if (irq < 0) + return irq; + + return devm_request_irq(dev, irq, vmclock_of_irq_handler, IRQF_SHARED, + "vmclock", dev); +} + +static int vmclock_setup_notification(struct device *dev, + struct vmclock_state *st) +{ + /* The device does not support notifications. Nothing else to do */ + if (!(le64_to_cpu(st->clk->flags) & VMCLOCK_FLAG_NOTIFICATION_PRESENT)) + return 0; + + if (has_acpi_companion(dev)) { + return vmclock_setup_acpi_notification(dev); + } else { + return vmclock_setup_of_notification(dev); + } + +} + + static void vmclock_put_idx(void *data) { struct vmclock_state *st =3D data; @@ -607,7 +657,7 @@ static int vmclock_probe(struct platform_device *pdev) if (has_acpi_companion(dev)) ret =3D vmclock_probe_acpi(dev, st); else - ret =3D -EINVAL; /* Only ACPI for now */ + ret =3D vmclock_probe_dt(dev, st); =20 if (ret) { dev_info(dev, "Failed to obtain physical address: %d\n", ret); @@ -707,11 +757,18 @@ static const struct acpi_device_id vmclock_acpi_ids[]= =3D { }; MODULE_DEVICE_TABLE(acpi, vmclock_acpi_ids); =20 +static const struct of_device_id vmclock_of_ids[] =3D { + { .compatible =3D "amazon,vmclock", }, + { }, +}; +MODULE_DEVICE_TABLE(of, vmclock_of_ids); + static struct platform_driver vmclock_platform_driver =3D { .probe =3D vmclock_probe, .driver =3D { .name =3D "vmclock", .acpi_match_table =3D vmclock_acpi_ids, + .of_match_table =3D vmclock_of_ids, }, }; =20 --=20 2.34.1