From: Miroslav Lichvar <mlichvar@redhat•com>
To: netdev@vger•kernel.org
Cc: Miroslav Lichvar <mlichvar@redhat•com>,
Yangbo Lu <yangbo.lu@nxp•com>,
Yang Yingliang <yangyingliang@huawei•com>,
Richard Cochran <richardcochran@gmail•com>
Subject: [PATCH net-next 1/5] ptp: unregister virtual clocks when unregistering physical clock.
Date: Thu, 27 Jan 2022 12:45:32 +0100 [thread overview]
Message-ID: <20220127114536.1121765-2-mlichvar@redhat.com> (raw)
In-Reply-To: <20220127114536.1121765-1-mlichvar@redhat.com>
When unregistering a physical clock which has some virtual clocks,
unregister the virtual clocks with it.
This fixes the following oops, which can be triggered by unloading
a driver providing a PTP clock when it has enabled virtual clocks:
BUG: unable to handle page fault for address: ffffffffc04fc4d8
Oops: 0000 [#1] PREEMPT SMP NOPTI
RIP: 0010:ptp_vclock_read+0x31/0xb0
Call Trace:
timecounter_read+0xf/0x50
ptp_vclock_refresh+0x2c/0x50
? ptp_clock_release+0x40/0x40
ptp_aux_kworker+0x17/0x30
kthread_worker_fn+0x9b/0x240
? kthread_should_park+0x30/0x30
kthread+0xe2/0x110
? kthread_complete_and_exit+0x20/0x20
ret_from_fork+0x22/0x30
Fixes: 73f37068d540 ("ptp: support ptp physical/virtual clocks conversion")
Signed-off-by: Miroslav Lichvar <mlichvar@redhat•com>
Cc: Yangbo Lu <yangbo.lu@nxp•com>
Cc: Yang Yingliang <yangyingliang@huawei•com>
Cc: Richard Cochran <richardcochran@gmail•com>
---
drivers/ptp/ptp_clock.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
index 0e4bc8b9329d..b6f2cfd15dd2 100644
--- a/drivers/ptp/ptp_clock.c
+++ b/drivers/ptp/ptp_clock.c
@@ -317,11 +317,18 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
}
EXPORT_SYMBOL(ptp_clock_register);
+static int unregister_vclock(struct device *dev, void *data)
+{
+ struct ptp_clock *ptp = dev_get_drvdata(dev);
+
+ ptp_vclock_unregister(info_to_vclock(ptp->info));
+ return 0;
+}
+
int ptp_clock_unregister(struct ptp_clock *ptp)
{
if (ptp_vclock_in_use(ptp)) {
- pr_err("ptp: virtual clock in use\n");
- return -EBUSY;
+ device_for_each_child(&ptp->dev, NULL, unregister_vclock);
}
ptp->defunct = 1;
--
2.34.1
next prev parent reply other threads:[~2022-01-27 11:45 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-27 11:45 [PATCH net-next 0/5] Virtual PTP clock improvements and fix Miroslav Lichvar
2022-01-27 11:45 ` Miroslav Lichvar [this message]
2022-01-27 23:58 ` [PATCH net-next 1/5] ptp: unregister virtual clocks when unregistering physical clock Vinicius Costa Gomes
2022-01-31 10:07 ` Miroslav Lichvar
2022-01-31 12:41 ` Vladimir Oltean
2022-01-27 11:45 ` [PATCH net-next 2/5] ptp: increase maximum adjustment of virtual clocks Miroslav Lichvar
2022-01-27 11:45 ` [PATCH net-next 3/5] ptp: add gettimex64() to " Miroslav Lichvar
2022-01-27 11:45 ` [PATCH net-next 4/5] ptp: add getcrosststamp() " Miroslav Lichvar
2022-01-27 11:45 ` [PATCH net-next 5/5] ptp: start virtual clocks at current system time Miroslav Lichvar
2022-01-27 22:01 ` Richard Cochran
2022-01-31 10:21 ` Miroslav Lichvar
2022-01-31 16:32 ` Richard Cochran
2022-02-01 8:42 ` Miroslav Lichvar
2022-02-01 19:10 ` Richard Cochran
2022-02-01 19:03 ` Richard Cochran
2022-02-02 9:07 ` Miroslav Lichvar
2022-01-27 22:02 ` [PATCH net-next 0/5] Virtual PTP clock improvements and fix 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=20220127114536.1121765-2-mlichvar@redhat.com \
--to=mlichvar@redhat$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=richardcochran@gmail$(echo .)com \
--cc=yangbo.lu@nxp$(echo .)com \
--cc=yangyingliang@huawei$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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