ptp: fc3: register PTP clock after initialization
Subsystems (4)
PATCH v2 1/1 ptp: fc3: register PTP clock after initialization
ptp_clock_register() exposes the clock to userspace. If either following initialization operation fails, probe returns and devres frees idtfc3 while the registered clock still refers to the clock information embedded in it.
Complete the fallible initialization before registering the clock. Schedule the worker after registration because it requires the registered clock. This removes post-registration failures and avoids exposing a partially initialized clock.
---
Changes in v2:
- Register the PTP clock after initialization instead of unregistering it while holding idtfc3->lock, which could deadlock with a concurrent clock operation holding the POSIX clock rwsem.
drivers/ptp/ptp_fc3.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/ptp/ptp_fc3.c +9 -9
@@ -665,8 +665,6 @@ static int idtfc3_init_timecounter(struct idtfc3 *idtfc3)if (err)return err; -ptp_schedule_worker (idtfc3->ptp_clock, idtfc3->tc_update_period); -return 0 ; }
@@ -825,6 +823,14 @@ static int idtfc3_enable_ptp(struct idtfc3 *idtfc3) idtfc3->caps = idtfc3_caps;snprintf (idtfc3->caps.name,sizeof (idtfc3->caps.name),"IDT FC3W" ); + err =idtfc3_set_overhead (idtfc3); +if (err) +return err; + + err =idtfc3_init_timecounter (idtfc3); +if (err) +return err; + idtfc3->ptp_clock =ptp_clock_register (&idtfc3->caps,NULL );if (IS_ERR (idtfc3->ptp_clock)) {
@@ -833,13 +839,7 @@ static int idtfc3_enable_ptp(struct idtfc3 *idtfc3)return err; } - err =idtfc3_set_overhead (idtfc3); -if (err) -return err; - - err =idtfc3_init_timecounter (idtfc3); -if (err) -return err; +ptp_schedule_worker (idtfc3->ptp_clock, idtfc3->tc_update_period);dev_info (idtfc3->dev,"TIME_SYNC_CHANNEL registered as ptp%d" , idtfc3->ptp_clock->index);
Signature · 1 line
2.50.1
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Mon, 3 Aug 2026 22:59:42 +0900 you wrote:
ptp_clock_register()exposes the clock to userspace. If either following initialization operation fails, probe returns and devres frees idtfc3 while the registered clock still refers to the clock information embedded in it.Complete the fallible initialization before registering the clock. Schedule the worker after registration because it requires the registered clock. This removes post-registration failures and avoids exposing a partially initialized clock.
[...]
Here is the summary with links:
- [net,v2] ptp: fc3: register PTP clock after initialization
https://git.kernel.org/netdev/net-next/c/762137ff748f
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html