Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0ba662a authored by Jan Beulich's avatar Jan Beulich Committed by Ingo Molnar
Browse files

x86: Properly _init-annotate NMI selftest code 



After all, this code is being run once at boot only (if
configured in at all).

Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Acked-by: default avatarDon Zickus <dzickus@redhat.com>
Link: http://lkml.kernel.org/r/4F478C010200007800074A3D@nat28.tlf.novell.com


Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 21c3fcf3

arch/x86/kernel/nmi_selftest.c

+19 −18
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/smp.h>

#include <linux/smp.h>

#include <linux/cpumask.h>

#include <linux/cpumask.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/init.h>





#include <asm/apic.h>

#include <asm/apic.h>

#include <asm/nmi.h>

#include <asm/nmi.h>
@@ -20,35 +21,35 @@ 
#define FAILURE		1

#define FAILURE		1

#define TIMEOUT		2

#define TIMEOUT		2





static int nmi_fail;

static int __initdata nmi_fail;





/* check to see if NMI IPIs work on this machine */

/* check to see if NMI IPIs work on this machine */

static DECLARE_BITMAP(nmi_ipi_mask, NR_CPUS) __read_mostly;

static DECLARE_BITMAP(nmi_ipi_mask, NR_CPUS) __initdata;





static int testcase_total;

static int __initdata testcase_total;

static int testcase_successes;

static int __initdata testcase_successes;

static int expected_testcase_failures;

static int __initdata expected_testcase_failures;

static int unexpected_testcase_failures;

static int __initdata unexpected_testcase_failures;

static int unexpected_testcase_unknowns;

static int __initdata unexpected_testcase_unknowns;





static int nmi_unk_cb(unsigned int val, struct pt_regs *regs)

static int __init nmi_unk_cb(unsigned int val, struct pt_regs *regs)

{

{

	unexpected_testcase_unknowns++;

	unexpected_testcase_unknowns++;

	return NMI_HANDLED;

	return NMI_HANDLED;

}

}





static void init_nmi_testsuite(void)

static void __init init_nmi_testsuite(void)

{

{

	/* trap all the unknown NMIs we may generate */

	/* trap all the unknown NMIs we may generate */

	register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk");

	register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk");

}

}





static void cleanup_nmi_testsuite(void)

static void __init cleanup_nmi_testsuite(void)

{

{

	unregister_nmi_handler(NMI_UNKNOWN, "nmi_selftest_unk");

	unregister_nmi_handler(NMI_UNKNOWN, "nmi_selftest_unk");

}

}





static int test_nmi_ipi_callback(unsigned int val, struct pt_regs *regs)

static int __init test_nmi_ipi_callback(unsigned int val, struct pt_regs *regs)

{

{

        int cpu = raw_smp_processor_id();

        int cpu = raw_smp_processor_id();
@@ -58,7 +59,7 @@ static int test_nmi_ipi_callback(unsigned int val, struct pt_regs *regs) 
        return NMI_DONE;

        return NMI_DONE;

}

}





static void test_nmi_ipi(struct cpumask *mask)

static void __init test_nmi_ipi(struct cpumask *mask)

{

{

	unsigned long timeout;

	unsigned long timeout;
@@ -86,7 +87,7 @@ static void test_nmi_ipi(struct cpumask *mask) 
	return;

	return;

}

}





static void remote_ipi(void)

static void __init remote_ipi(void)

{

{

	cpumask_copy(to_cpumask(nmi_ipi_mask), cpu_online_mask);

	cpumask_copy(to_cpumask(nmi_ipi_mask), cpu_online_mask);

	cpumask_clear_cpu(smp_processor_id(), to_cpumask(nmi_ipi_mask));

	cpumask_clear_cpu(smp_processor_id(), to_cpumask(nmi_ipi_mask));
@@ -94,19 +95,19 @@ static void remote_ipi(void) 
		test_nmi_ipi(to_cpumask(nmi_ipi_mask));

		test_nmi_ipi(to_cpumask(nmi_ipi_mask));

}

}





static void local_ipi(void)

static void __init local_ipi(void)

{

{

	cpumask_clear(to_cpumask(nmi_ipi_mask));

	cpumask_clear(to_cpumask(nmi_ipi_mask));

	cpumask_set_cpu(smp_processor_id(), to_cpumask(nmi_ipi_mask));

	cpumask_set_cpu(smp_processor_id(), to_cpumask(nmi_ipi_mask));

	test_nmi_ipi(to_cpumask(nmi_ipi_mask));

	test_nmi_ipi(to_cpumask(nmi_ipi_mask));

}

}





static void reset_nmi(void)

static void __init reset_nmi(void)

{

{

	nmi_fail = 0;

	nmi_fail = 0;

}

}





static void dotest(void (*testcase_fn)(void), int expected)

static void __init dotest(void (*testcase_fn)(void), int expected)

{

{

	testcase_fn();

	testcase_fn();

	/*

	/*
@@ -131,12 +132,12 @@ static void dotest(void (*testcase_fn)(void), int expected) 
	reset_nmi();

	reset_nmi();

}

}





static inline void print_testname(const char *testname)

static inline void __init print_testname(const char *testname)

{

{

	printk("%12s:", testname);

	printk("%12s:", testname);

}

}





void nmi_selftest(void)

void __init nmi_selftest(void)

{

{

	init_nmi_testsuite();

	init_nmi_testsuite();