[PATCH net 1/4] ptp: ocp: prevent timestamp rearming during detach

From
Ahmad Byagowi <hidden>
Date
2026-11-18 20:05:15
Also in
lkml
Reply to
Ahmad Byagowi, 2026-11-18
Detach disables timestamp interrupts before unregistering the PTP clock.
Until the POSIX clock is unregistered, an ioctl can rearm a channel
after that disable. The clock can then be released while the timestamp
IRQ is still registered. The core cleanup does not necessarily disable
the channel: EXTTS requests do not require a PTP_PF_EXTTS pin
assignment.

Serialize timestamp enables and disables with a mutex. Mark timestampers
as stopping under that mutex before the detach disable loop, so an
enable already in progress finishes first and later enables fail with
-ENODEV. Keep disables available for the PTP core cleanup. The existing
MMIO readback and synchronize_irq() then drain events before
ptp_clock_unregister() can release the clock.

Reported by the netdev Sashiko AI review, then checked against the
current PTP and POSIX-clock paths. A source-derived userspace harness
forces an enable after detach's disable and reproduces the rearm with
the old source. With this fix it rejects that enable, waits for an
enable already in progress, and waits for a mocked active IRQ. Both
timestamp and combined PPS/EXTTS paths pass with ASan/UBSan. This
validates ordering with stubbed MMIO/IRQ operations, not an in-kernel
use-after-free reproduction. No physical card was tested.

Codex prepared the fix, tests and changelog from the review and upstream
source, at the request to separate common-driver fixes from WiWi support
and validate removal ordering.

Fixes: 627366c51145 ("ptp: ocp: fix resource freeing order")

Link: https://lore.kernel.org/r/179502617840.3136.12704245716223038161@kernel.org (local)

Signed-off-by: Ahmad Byagowi <redacted>
---
 drivers/ptp/ptp_ocp.c | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c
index 625a85b2dc..478f7012b2 100644
--- a/drivers/ptp/ptp_ocp.c
+++ b/drivers/ptp/ptp_ocp.c
@@ -367,6 +367,9 @@ struct ptp_ocp {
 	struct pci_dev		*pdev;
 	struct device		dev;
 	spinlock_t		lock;
+	/* Serializes timestamp arming and teardown. */
+	struct mutex		ts_lock;
+	bool			ts_stopping;
 	struct ocp_reg __iomem	*reg;
 	struct tod_reg __iomem	*tod;
 	struct pps_reg __iomem	*pps_to_ext;
@@ -2550,6 +2553,13 @@ ptp_ocp_ts_enable(void *priv, u32 req, bool enable)
 	struct ptp_ocp_ext_src *ext = priv;
 	struct ts_reg __iomem *reg = ext->mem;
 	struct ptp_ocp *bp = ext->bp;
+	int err = 0;
+
+	mutex_lock(&bp->ts_lock);
+	if (enable && bp->ts_stopping) {
+		err = -ENODEV;
+		goto out;
+	}
 
 	if (ext == bp->pps) {
 		u32 old_map = bp->pps_req_map;
@@ -2561,7 +2571,7 @@ ptp_ocp_ts_enable(void *priv, u32 req, bool enable)
 
 		/* if no state change, just return */
 		if ((!!old_map ^ !!bp->pps_req_map) == 0)
-			return 0;
+			goto out;
 	}
 
 	if (enable) {
@@ -2578,7 +2588,9 @@ ptp_ocp_ts_enable(void *priv, u32 req, bool enable)
 			synchronize_irq(irq_vec);
 	}
 
-	return 0;
+out:
+	mutex_unlock(&bp->ts_lock);
+	return err;
 }
 
 static void
@@ -5613,6 +5625,7 @@ ptp_ocp_device_init(struct ptp_ocp *bp, struct pci_dev *pdev)
 
 	bp->ptp_info = ptp_ocp_clock_info;
 	spin_lock_init(&bp->lock);
+	mutex_init(&bp->ts_lock);
 
 	for (i = 0; i < __PORT_COUNT; i++)
 		bp->port[i].uport = NULL;
@@ -5755,6 +5768,10 @@ ptp_ocp_detach(struct ptp_ocp *bp)
 	ptp_ocp_detach_sysfs(bp);
 	ptp_ocp_attr_group_del(bp);
 	timer_delete_sync(&bp->watchdog);
+	/* Drain in-flight enables and prevent rearming before unregister. */
+	mutex_lock(&bp->ts_lock);
+	bp->ts_stopping = true;
+	mutex_unlock(&bp->ts_lock);
 	/* Disable interrupts on all timestampers */
 	if (bp->ts0)
 		ptp_ocp_ts_enable(bp->ts0, 0, false);
@@ -5789,6 +5806,7 @@ ptp_ocp_detach(struct ptp_ocp *bp)
 	if (bp->n_irqs)
 		pci_free_irq_vectors(bp->pdev);
 	mutex_destroy(&bp->cpld_lock);
+	mutex_destroy(&bp->ts_lock);
 	device_unregister(&bp->dev);
 }
 
-- 
2.54.0 (Apple Git-157)
Thread (7 messages) 7 messages, 2 authors, last reply 22h ago
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help