x86/time: Implement clocksource_arch_init() (2a21ad57) · Commits · 戴 / test

Runtime validate the VCLOCK_MODE in clocksource::archdata and disable VCLOCK if invalid, which disables the VDSO but keeps the system running. Signed-off-by:

Thomas Gleixner <tglx@linutronix.de> Acked-by:

Andy Lutomirski <luto@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Matt Rickard <matt@softrans.com.au> Cc: Stephen Boyd <sboyd@kernel.org> Cc: John Stultz <john.stultz@linaro.org> Cc: Florian Weimer <fweimer@redhat.com> Cc: "K. Y. Srinivasan" <kys@microsoft.com> Cc: Vitaly Kuznetsov <vkuznets@redhat.com> Cc: devel@linuxdriverproject.org Cc: virtualization@lists.linux-foundation.org Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Juergen Gross <jgross@suse.com> Link: https://lkml.kernel.org/r/20180917130707.069167446@linutronix.de

arch/x86/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ config X86
		select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI
		select ANON_INODES
		select ARCH_CLOCKSOURCE_DATA
		select ARCH_CLOCKSOURCE_INIT
		select ARCH_DISCARD_MEMBLOCK
		select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI
		select ARCH_HAS_DEBUG_VIRTUAL

arch/x86/kernel/time.c

+16 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@
		*
		*/

		#include <linux/clocksource.h>
		#include <linux/clockchips.h>
		#include <linux/interrupt.h>
		#include <linux/irq.h>
		@@ -105,3 +106,18 @@ void __init time_init(void)
		{
		late_time_init = x86_late_time_init;
		}

		/*
		* Sanity check the vdso related archdata content.
		*/
		void clocksource_arch_init(struct clocksource *cs)
		{
		if (cs->archdata.vclock_mode == VCLOCK_NONE)
		return;

		if (cs->archdata.vclock_mode > VCLOCK_MAX) {
		pr_warn("clocksource %s registered with invalid vclock_mode %d. Disabling vclock.\n",
		cs->name, cs->archdata.vclock_mode);
		cs->archdata.vclock_mode = VCLOCK_NONE;
		}
		}

Admin message