Check frequency in xnarch_init_timeconv()
PATCH 1/1 Check frequency in xnarch_init_timeconv()
In some conditions, while testing Xenomai in VirtualBox, I had the error that xnarch_init_timeconv() is called from init_32.h with a frequency of 0. That leads to a division by zero, followed by a system oops.
Of course that is a bug in the virtualisation and Linux reports a CPU frequency of 0 in /proc/cpuinfo. However, there's no harm if Xenomai checks that instead of crashing the whole system.
include/asm-arm/bits/init.h | 4 +++- include/asm-blackfin/bits/init.h | 4 +++- include/asm-generic/bits/timeconv.h | 18 +++++++++++++++++- include/asm-nios2/bits/init.h | 4 +++- include/asm-powerpc/bits/init.h | 4 +++- include/asm-x86/bits/init_32.h | 4 +++- include/asm-x86/bits/init_64.h | 4 +++- src/skins/native/timer.c | 7 ++++++- src/skins/posix/clock.c | 8 +++++++- 9 files changed, 48 insertions(+), 9 deletions(-)
In some conditions, while testing Xenomai in VirtualBox, I had the error that xnarch_init_timeconv() is called from init_32.h with a frequency of 0. That leads to a division by zero, followed by a system oops.
Of course that is a bug in the virtualisation and Linux reports a CPU frequency of 0 in /proc/cpuinfo. However, there's no harm if Xenomai checks that instead of crashing the whole system.
include/asm-arm/bits/init.h +3 -1
@@ -82,7 +82,9 @@set_cpus_allowed (current,cpumask_of_cpu (0 ));#endif /* CONFIG_SMP && MODULE */ -xnarch_init_timeconv (RTHAL_CPU_FREQ ); + ret =xnarch_init_timeconv (RTHAL_CPU_FREQ ); +if (ret) +return ret; ret =xnarch_calibrate_sched ();if (ret)
include/asm-blackfin/bits/init.h +3 -1
@@ -83,7 +83,9 @@set_cpus_allowed (current,cpumask_of_cpu (0 ));#endif /* CONFIG_SMP && MODULE */ -xnarch_init_timeconv (RTHAL_CPU_FREQ ); + ret =xnarch_init_timeconv (RTHAL_CPU_FREQ ); +if (ret) +return ret; ret =xnarch_calibrate_sched ();if (ret)
include/asm-generic/bits/timeconv.h +17 -1
@@ -100,8 +100,23 @@ }#endif /* !XNARCH_HAVE_NODIV_LLIMD */ -static inline void xnarch_init_timeconv (unsigned long long freq) +#ifndef xnarch_logerr +#define xnarch_logerr(fmt, args...) +#endif + +static inline int xnarch_init_timeconv (unsigned long long freq) { +/* +* Division by zero is not defined (and in kernel context, it +* especially leads to an oops) +*/ +if (freq ==0 ) { +xnarch_logerr ("xnarch_init_timeconv called with a " +"frequency of 0. Probably this indicates a " +"broken TSC." ); +return -EINVAL ; + } + clockfreq = freq;#ifdef XNARCH_HAVE_LLMULSHFT xnarch_init_llmulshft (1000000000 , freq, &tsc_scale, &tsc_shift);
@@ -110,6 +125,7 @@xnarch_init_u32frac (&bln_frac,1 ,1000000000 );#endif #endif +return 0 ; }#ifdef __KERNEL__
include/asm-nios2/bits/init.h +3 -1
@@ -72,7 +72,9 @@if (ret)return ret; -xnarch_init_timeconv (RTHAL_CLOCK_FREQ ); + ret =xnarch_init_timeconv (RTHAL_CLOCK_FREQ ); +if (ret) +return ret; ret =xnarch_calibrate_sched ();if (ret)
include/asm-powerpc/bits/init.h +3 -1
@@ -82,7 +82,9 @@set_cpus_allowed (current,cpumask_of_cpu (0 ));#endif /* CONFIG_SMP && MODULE */ -xnarch_init_timeconv (RTHAL_CPU_FREQ ); + ret =xnarch_init_timeconv (RTHAL_CPU_FREQ ); +if (ret) +return ret; ret =xnarch_calibrate_sched ();if (ret)
include/asm-x86/bits/init_32.h +3 -1
@@ -88,7 +88,9 @@set_cpus_allowed (current,cpumask_of_cpu (0 ));#endif /* CONFIG_SMP && MODULE */ -xnarch_init_timeconv (RTHAL_CPU_FREQ ); + ret =xnarch_init_timeconv (RTHAL_CPU_FREQ ); +if (ret) +return ret; ret =xnarch_calibrate_sched ();if (ret)
include/asm-x86/bits/init_64.h +3 -1
@@ -85,7 +85,9 @@set_cpus_allowed (current,cpumask_of_cpu (0 ));#endif /* CONFIG_SMP && MODULE */ -xnarch_init_timeconv (RTHAL_CPU_FREQ ); + ret =xnarch_init_timeconv (RTHAL_CPU_FREQ ); +if (ret) +return ret; ret =xnarch_calibrate_sched ();if (ret)
src/skins/native/timer.c +6 -1
@@ -35,7 +35,12 @@exit (EXIT_FAILURE ); } -xnarch_init_timeconv (sysinfo.cpufreq); + err =xnarch_init_timeconv (sysinfo.cpufreq); +if (err) { +fprintf (stderr,"Native skin init: " +"xnarch_init_timeconv: %s\n" ,strerror (-err)); +exit (EXIT_FAILURE ); + } }int rt_timer_set_mode (RTIME tickval)
src/skins/posix/clock.c +7 -1
@@ -38,7 +38,13 @@ "sys_info: %s\n", strerror(err)); exit(EXIT_FAILURE); } -xnarch_init_timeconv (sysinfo.cpufreq); + + err =xnarch_init_timeconv (sysinfo.cpufreq); +if (err) { +fprintf (stderr,"Xenomai Posix skin init: " +"xnarch_init_timeconv: %s\n" ,strerror (err)); +exit (EXIT_FAILURE ); + } }#endif /* XNARCH_HAVE_NONPRIV_TSC */
Quoted 9 lines · Bernhard Walle
In some conditions, while testing Xenomai in VirtualBox, I had the error that
xnarch_init_timeconv()is called frominit_32.hwith a frequency of 0. That leads to a division by zero, followed by a system oops.Of course that is a bug in the virtualisation and Linux reports a CPU frequency of 0 in
/proc/cpuinfo. However, there's no harm if Xenomai checks that instead of crashing the whole system.
I agree with the conclusion, not with the fix.
- the userland part reuses the frequency value returned by the nucleus, so testing the issue up front when the nucleus initializes would be enough. No need to propagate error detection to userland.
- the kernel side should rather test RTHAL_CPU_FREQ for consistency in the generic hal init code, and bail out with an error if 0 is detected, since there is no way for the nucleus to operate properly with such setting anyway.
It turns out that no change have to be done in xnarch_init_timeconv() which should remain a void routine, but its argument - RTHAL_CPU_FREQ - should rather be tested as early as possible for consistency, directly from kernel space.
Quoted 19 lines
Signed-off-by Bernhard Walle <[email protected]>include/asm-arm/bits/init.h | 4 +++- include/asm-blackfin/bits/init.h | 4 +++- include/asm-generic/bits/timeconv.h | 18 +++++++++++++++++- include/asm-nios2/bits/init.h | 4 +++- include/asm-powerpc/bits/init.h | 4 +++- include/asm-x86/bits/init_32.h | 4 +++- include/asm-x86/bits/init_64.h | 4 +++- src/skins/native/timer.c | 7 ++++++- src/skins/posix/clock.c | 8 +++++++- 9 files changed, 48 insertions(+), 9 deletions(-)_______________________________________________
Xenomai-core mailing list
[email protected]
https://mail.gna.org/listinfo/xenomai-core
Signature · 1 line
Philippe.
Hi,
Quoted 2 lines · Philippe Gerum
I agree with the conclusion, not with the fix.
Thanks for reviewing the patch and sorry for the late answer.
Quoted 9 lines
- the kernel side should rather test
RTHAL_CPU_FREQfor consistency in the generic hal init code, and bail out with an error if 0 is detected, since there is no way for the nucleus to operate properly with such setting anyway.It turns out that no change have to be done in
xnarch_init_timeconv()which should remain a void routine, but its argument -RTHAL_CPU_FREQ- should rather be tested as early as possible for consistency, directly from kernel space.
I'll post a new patch right now.
Regards,
Bernhard
PATCH 1/1 Check CPU frequency
In some conditions, while testing Xenomai in VirtualBox, I had the error that xnarch_init_timeconv() is called from init_32.h with a frequency of 0. That leads to a division by zero, followed by a system oops.
Of course that is a bug in the virtualisation and Linux reports a CPU frequency of 0 in /proc/cpuinfo. However, there's no harm if Xenomai checks that instead of crashing the whole system.
--- ksrc/arch/generic/hal.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
ksrc/arch/generic/hal.c +7 -0
@@ -822,6 +822,13 @@ int rthal_init(void)* The arch-dependent support must have updated the various * frequency args as required. */ + +/* check the CPU frequency first and abort if it's invalid */ +if (rthal_cpufreq_arg ==0 ) { +printk (KERN_ERR "Xenomai has detected a CPU frequency of 0. Aborting.\n" ); +return -ENODEV ; + } + rthal_tunables.cpu_freq = rthal_cpufreq_arg; rthal_tunables.timer_freq = rthal_timerfreq_arg; rthal_tunables.clock_freq = rthal_clockfreq_arg;
Signature · 1 line
1.6.3.3