* [PATCH] clock : avoid panic on xnclock_set_wallclock() call during COBALT_STATE_WARMUP
@ 2022-12-06 11:37 florent pirou
2022-12-07 10:20 ` Florian Bezdeka
2022-12-08 7:20 ` Jan Kiszka
0 siblings, 2 replies; 4+ messages in thread
From: florent pirou @ 2022-12-06 11:37 UTC (permalink / raw)
To: xenomai
The nkvdso variable should not be unconditionally referenced in
xnclock_set_wallclock().
Call-stack:
```
IRQ stage: Linux
RIP: 0010:xnclock_set_wallclock+0xba/0x1a0
Code: 7a 01 00 4c 8b 25 e6 39 35 01 e8 31 a2 f6 ff 48 c7 c7 60 3e 4c 82 48 29 c3
48 8b 05 70 f9 9c 01 48 89 de 48 89 1d c6 39 35 01 <48> 89 58 40 4c 29 e6 e8 fa
fb ff ff 48 c7 c1 10 cb 01 82 ba 29 01
RSP: 0000:ffffffff82403e70 EFLAGS: 00010012
RAX: 0000000000000000 RBX: 172c603286674a4f RCX: 0000000000000008
RDX: 000000000f424000 RSI: 172c603286674a4f RDI: ffffffff824c3e60
RBP: 0000000000000000 R08: 0000000000000123 R09: ffffffff8201cb10
R10: 00000000fffff000 R11: 3fffffffffffffff R12: 0000000000000000
R13: 0000000000000000 R14: 0000000000000200 R15: 000000002b4448a4
FS: 0000000000000000(0000) GS:ffff888869000000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 0000000000000040 CR3: 000000000840c001 CR4: 00000000000626b0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
do_settimeofday64+0x137/0x1c0
rth_timer_init+0x60/0x7e
x86_late_time_init+0x12/0x2f
start_kernel+0x4d8/0x577
secondary_startup_64_no_verify+0xb0/0xbb
```
Kernel panic happens when the clock is set using do_settimeofday64(),
implicitly calling xnclock_set_wallclock(), during the cobalt_runstate
COBALT_STATE_WARMUP state, while nkvdso is NULL.
Yuri Zaporozhets: Crash in xnclock_set_wallclock() if time/date is set early
https://lore.kernel.org/all/CAEkURaZO-2uDFwx3ZnS=229z5XZT27WbeFs3kS5Qdq7MMPAiKw@mail.gmail.com/T/
Signed-off-by: florent pirou <florent.pirou@intel.com>
---
kernel/cobalt/clock.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/kernel/cobalt/clock.c b/kernel/cobalt/clock.c
index 2b9efad4e..b1b9a3b0e 100644
--- a/kernel/cobalt/clock.c
+++ b/kernel/cobalt/clock.c
@@ -282,6 +282,11 @@ void xnclock_set_wallclock(xnticks_t epoch_ns)
xnsticks_t old_offset_ns, offset_ns;
spl_t s;
+ /*
+ * Check if time/date is set earlier than cobalt_init
+ */
+ if (!nkvdso) return;
+
/*
* The epoch of CLOCK_REALTIME just changed. Since timeouts
* are expressed as monotonic ticks, we need to apply the
--
2.17.1
---------------------------------------------------------------------
Intel Corporation SAS (French simplified joint stock company)
Registered headquarters: "Les Montalets"- 2, rue de Paris,
92196 Meudon Cedex, France
Registration Number: 302 456 199 R.C.S. NANTERRE
Capital: 5 208 026.16 Euros
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] clock : avoid panic on xnclock_set_wallclock() call during COBALT_STATE_WARMUP
2022-12-06 11:37 [PATCH] clock : avoid panic on xnclock_set_wallclock() call during COBALT_STATE_WARMUP florent pirou
@ 2022-12-07 10:20 ` Florian Bezdeka
2022-12-08 7:20 ` Jan Kiszka
1 sibling, 0 replies; 4+ messages in thread
From: Florian Bezdeka @ 2022-12-07 10:20 UTC (permalink / raw)
To: florent pirou, xenomai
On Tue, 2022-12-06 at 04:37 -0700, florent pirou wrote:
[snip]
> ---
> kernel/cobalt/clock.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/kernel/cobalt/clock.c b/kernel/cobalt/clock.c
> index 2b9efad4e..b1b9a3b0e 100644
> --- a/kernel/cobalt/clock.c
> +++ b/kernel/cobalt/clock.c
> @@ -282,6 +282,11 @@ void xnclock_set_wallclock(xnticks_t epoch_ns)
> xnsticks_t old_offset_ns, offset_ns;
> spl_t s;
>
> + /*
> + * Check if time/date is set earlier than cobalt_init
> + */
> + if (!nkvdso) return;
> +
Thanks, but still something to improve:
Reportings from checkpatch:
ERROR: trailing whitespace
#202: FILE: kernel/cobalt/clock.c:285:
+^I/*^M$
ERROR: trailing whitespace
#203: FILE: kernel/cobalt/clock.c:286:
+^I * Check if time/date is set earlier than cobalt_init^M$
ERROR: DOS line endings
#204: FILE: kernel/cobalt/clock.c:287:
+^I */^M$
ERROR: DOS line endings
#205: FILE: kernel/cobalt/clock.c:288:
+^Iif (!nkvdso) return;^M$
ERROR: trailing statements should be on next line
#205: FILE: kernel/cobalt/clock.c:288:
+ if (!nkvdso) return;
ERROR: DOS line endings
#206: FILE: kernel/cobalt/clock.c:289:
+^M$
> /*
> * The epoch of CLOCK_REALTIME just changed. Since timeouts
> * are expressed as monotonic ticks, we need to apply the
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] clock : avoid panic on xnclock_set_wallclock() call during COBALT_STATE_WARMUP
2022-12-06 11:37 [PATCH] clock : avoid panic on xnclock_set_wallclock() call during COBALT_STATE_WARMUP florent pirou
2022-12-07 10:20 ` Florian Bezdeka
@ 2022-12-08 7:20 ` Jan Kiszka
1 sibling, 0 replies; 4+ messages in thread
From: Jan Kiszka @ 2022-12-08 7:20 UTC (permalink / raw)
To: florent pirou, xenomai
On 06.12.22 12:37, florent pirou wrote:
> The nkvdso variable should not be unconditionally referenced in
> xnclock_set_wallclock().
>
> Call-stack:
> ```
> IRQ stage: Linux
> RIP: 0010:xnclock_set_wallclock+0xba/0x1a0
> Code: 7a 01 00 4c 8b 25 e6 39 35 01 e8 31 a2 f6 ff 48 c7 c7 60 3e 4c 82 48 29 c3
> 48 8b 05 70 f9 9c 01 48 89 de 48 89 1d c6 39 35 01 <48> 89 58 40 4c 29 e6 e8 fa
> fb ff ff 48 c7 c1 10 cb 01 82 ba 29 01
> RSP: 0000:ffffffff82403e70 EFLAGS: 00010012
> RAX: 0000000000000000 RBX: 172c603286674a4f RCX: 0000000000000008
> RDX: 000000000f424000 RSI: 172c603286674a4f RDI: ffffffff824c3e60
> RBP: 0000000000000000 R08: 0000000000000123 R09: ffffffff8201cb10
> R10: 00000000fffff000 R11: 3fffffffffffffff R12: 0000000000000000
> R13: 0000000000000000 R14: 0000000000000200 R15: 000000002b4448a4
> FS: 0000000000000000(0000) GS:ffff888869000000(0000) knlGS:0000000000000000
> CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> CR2: 0000000000000040 CR3: 000000000840c001 CR4: 00000000000626b0
> DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
> DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
> Call Trace:
> do_settimeofday64+0x137/0x1c0
> rth_timer_init+0x60/0x7e
> x86_late_time_init+0x12/0x2f
> start_kernel+0x4d8/0x577
> secondary_startup_64_no_verify+0xb0/0xbb
> ```
>
> Kernel panic happens when the clock is set using do_settimeofday64(),
> implicitly calling xnclock_set_wallclock(), during the cobalt_runstate
> COBALT_STATE_WARMUP state, while nkvdso is NULL.
>
> Yuri Zaporozhets: Crash in xnclock_set_wallclock() if time/date is set early
> https://lore.kernel.org/all/CAEkURaZO-2uDFwx3ZnS=229z5XZT27WbeFs3kS5Qdq7MMPAiKw@mail.gmail.com/T/
>
> Signed-off-by: florent pirou <florent.pirou@intel.com>
> ---
> kernel/cobalt/clock.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/kernel/cobalt/clock.c b/kernel/cobalt/clock.c
> index 2b9efad4e..b1b9a3b0e 100644
> --- a/kernel/cobalt/clock.c
> +++ b/kernel/cobalt/clock.c
> @@ -282,6 +282,11 @@ void xnclock_set_wallclock(xnticks_t epoch_ns)
> xnsticks_t old_offset_ns, offset_ns;
> spl_t s;
>
> + /*
> + * Check if time/date is set earlier than cobalt_init
> + */
> + if (!nkvdso) return;
> +
> /*
> * The epoch of CLOCK_REALTIME just changed. Since timeouts
> * are expressed as monotonic ticks, we need to apply the
This also seems to obsolete the "if (realtime_core_enabled())" in
inband_clock_was_set.
Jan
--
Siemens AG, Technology
Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] clock : avoid panic on xnclock_set_wallclock() call during COBALT_STATE_WARMUP
@ 2023-09-07 21:41 Yuri Zaporozhets
0 siblings, 0 replies; 4+ messages in thread
From: Yuri Zaporozhets @ 2023-09-07 21:41 UTC (permalink / raw)
To: xenomai
Hi Jan,
Could you please apply the patch from Florent? It seems this problem
is still not fixed...
Thanks in advance!
From: Jan Kiszka <jan.kiszka@siemens.com>
To: florent pirou <florent.pirou@intel.com>, xenomai@lists.linux.dev
Subject: Re: [PATCH] clock : avoid panic on xnclock_set_wallclock()
call during COBALT_STATE_WARMUP
Date: Thu, 8 Dec 2022 08:20:31 +0100 [thread overview]
Message-ID: <e725d402-ec1c-bc60-5ec4-cc3bef3d452a@siemens.com> (raw)
In-Reply-To: <20221206113707.31311-1-florent.pirou@intel.com>
On 06.12.22 12:37, florent pirou wrote:
> The nkvdso variable should not be unconditionally referenced in
> xnclock_set_wallclock().
>
> Call-stack:
> ```
> IRQ stage: Linux
> RIP: 0010:xnclock_set_wallclock+0xba/0x1a0
> Code: 7a 01 00 4c 8b 25 e6 39 35 01 e8 31 a2 f6 ff 48 c7 c7 60 3e 4c 82 48 29 c3
> 48 8b 05 70 f9 9c 01 48 89 de 48 89 1d c6 39 35 01 <48> 89 58 40 4c 29 e6 e8 fa
> fb ff ff 48 c7 c1 10 cb 01 82 ba 29 01
> RSP: 0000:ffffffff82403e70 EFLAGS: 00010012
> RAX: 0000000000000000 RBX: 172c603286674a4f RCX: 0000000000000008
> RDX: 000000000f424000 RSI: 172c603286674a4f RDI: ffffffff824c3e60
> RBP: 0000000000000000 R08: 0000000000000123 R09: ffffffff8201cb10
> R10: 00000000fffff000 R11: 3fffffffffffffff R12: 0000000000000000
> R13: 0000000000000000 R14: 0000000000000200 R15: 000000002b4448a4
> FS: 0000000000000000(0000) GS:ffff888869000000(0000) knlGS:0000000000000000
> CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> CR2: 0000000000000040 CR3: 000000000840c001 CR4: 00000000000626b0
> DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
> DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
> Call Trace:
> do_settimeofday64+0x137/0x1c0
> rth_timer_init+0x60/0x7e
> x86_late_time_init+0x12/0x2f
> start_kernel+0x4d8/0x577
> secondary_startup_64_no_verify+0xb0/0xbb
> ```
>
> Kernel panic happens when the clock is set using do_settimeofday64(),
> implicitly calling xnclock_set_wallclock(), during the cobalt_runstate
> COBALT_STATE_WARMUP state, while nkvdso is NULL.
>
> Yuri Zaporozhets: Crash in xnclock_set_wallclock() if time/date is set early
> https://lore.kernel.org/all/CAEkURaZO-2uDFwx3ZnS=229z5XZT27WbeFs3kS5Qdq7MMPAiKw@mail.gmail.com/T/
>
> Signed-off-by: florent pirou <florent.pirou@intel.com>
> ---
> kernel/cobalt/clock.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/kernel/cobalt/clock.c b/kernel/cobalt/clock.c
> index 2b9efad4e..b1b9a3b0e 100644
> --- a/kernel/cobalt/clock.c
> +++ b/kernel/cobalt/clock.c
> @@ -282,6 +282,11 @@ void xnclock_set_wallclock(xnticks_t epoch_ns)
> xnsticks_t old_offset_ns, offset_ns;
> spl_t s;
>
> + /*
> + * Check if time/date is set earlier than cobalt_init
> + */
> + if (!nkvdso) return;
> +
> /*
> * The epoch of CLOCK_REALTIME just changed. Since timeouts
> * are expressed as monotonic ticks, we need to apply the
--
Regards,
Yuri
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-09-07 21:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-06 11:37 [PATCH] clock : avoid panic on xnclock_set_wallclock() call during COBALT_STATE_WARMUP florent pirou
2022-12-07 10:20 ` Florian Bezdeka
2022-12-08 7:20 ` Jan Kiszka
2023-09-07 21:41 Yuri Zaporozhets
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).