KUnit tests for the various combinations of caller/trampoline/target and
kernel/module. They must be run from a module loaded at runtime to
guarantee they have a different TOC to the kernel (64-bit ELF V2) and
increase the chance of testing the non-direct branch path of the
trampoline.
For 64-bit ELF V2 ABI the tests try to mitigate the chance of panicking
by restoring the TOC after every static call. Not all possible errors
can be caught by this (we can't stop a trampoline from using a bad TOC
itself), but it makes certain errors easier to debug.
Signed-off-by: Benjamin Gray <bg...@linux.ibm.com>
---
arch/powerpc/Kconfig | 12 ++
arch/powerpc/kernel/Makefile | 1 +
arch/powerpc/kernel/static_call.c | 53 +++++
arch/powerpc/kernel/static_call_test.c | 263 +++++++++++++++++++++++++
arch/powerpc/kernel/static_call_test.h | 56 ++++++
5 files changed, 385 insertions(+)
create mode 100644 arch/powerpc/kernel/static_call_test.c
create mode 100644 arch/powerpc/kernel/static_call_test.h
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 962e36ec34ec..5b9d5fa96a9e 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -1035,6 +1035,18 @@ config PPC_RTAS_FILTER
Say Y unless you know what you are doing and the filter is causing
problems for you.
+config PPC_STATIC_CALL_KUNIT_TEST
+ tristate "KUnit tests for static calls"
+ default KUNIT_ALL_TESTS
+ depends on HAVE_STATIC_CALL && KUNIT && m
+ help
+ Tests for static calls across all combinations of
caller/trampoline/target
+ being kernel/module. On ELF ABI V2 the tests check the TOC is kept
consistent.
+
+ Must be built as a module and loaded at runtime to ensure the module
has
+ a different TOC to the kernel and make it likely that non-direct
branch
+ path of the trampoline is tested.
+
endmenu
config ISA_DMA_API
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index a30d0d0f5499..22c07e3d34df 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -131,6 +131,7 @@ obj-$(CONFIG_RELOCATABLE) += reloc_$(BITS).o
obj-$(CONFIG_PPC32) += entry_32.o setup_32.o early_32.o
obj-$(CONFIG_PPC64) += dma-iommu.o iommu.o
obj-$(CONFIG_HAVE_STATIC_CALL) += static_call.o
+obj-$(CONFIG_PPC_STATIC_CALL_KUNIT_TEST) += static_call_test.o
obj-$(CONFIG_KGDB) += kgdb.o
obj-$(CONFIG_BOOTX_TEXT) += btext.o
obj-$(CONFIG_SMP) += smp.o
diff --git a/arch/powerpc/kernel/static_call.c
b/arch/powerpc/kernel/static_call.c
index 9211b2e189bb..44957ba91e3f 100644
--- a/arch/powerpc/kernel/static_call.c
+++ b/arch/powerpc/kernel/static_call.c
@@ -153,3 +153,56 @@ void arch_static_call_transform(void *site, void *tramp,
void *func, bool tail)
panic("%s: patching failed %pS at %pS\n", __func__, func,
tramp);
}
EXPORT_SYMBOL_GPL(arch_static_call_transform);
+
+
+#if IS_MODULE(CONFIG_PPC_STATIC_CALL_KUNIT_TEST)
+
+#include "static_call_test.h"
+
+int ppc_sc_kernel_target_1(struct kunit *test)
+{
+ toc_fixup(test);
+ return 1;
+}
+
+int ppc_sc_kernel_target_2(struct kunit *test)
+{
+ toc_fixup(test);
+ return 2;
+}
+
+DEFINE_STATIC_CALL(ppc_sc_kernel, ppc_sc_kernel_target_1);
+
+int ppc_sc_kernel_call(struct kunit *test)
+{
+ return PROTECTED_SC(test, int, static_call(ppc_sc_kernel)(test));
+}
+
+int ppc_sc_kernel_call_indirect(struct kunit *test, int (*fn)(struct kunit
*test))
+{
+ return PROTECTED_SC(test, int, fn(test));
+}
+
+long ppc_sc_kernel_target_big(struct kunit *test, long a, long b, long c, long
d,
+ long e, long f, long g, long h, long i)
+{
+ toc_fixup(test);
+ KUNIT_EXPECT_EQ(test, a, b);
+ KUNIT_EXPECT_EQ(test, a, c);
+ KUNIT_EXPECT_EQ(test, a, d);
+ KUNIT_EXPECT_EQ(test, a, e);
+ KUNIT_EXPECT_EQ(test, a, f);
+ KUNIT_EXPECT_EQ(test, a, g);
+ KUNIT_EXPECT_EQ(test, a, h);
+ KUNIT_EXPECT_EQ(test, a, i);
+ return ~a;
+}
+
+EXPORT_SYMBOL_GPL(ppc_sc_kernel_target_1);
+EXPORT_SYMBOL_GPL(ppc_sc_kernel_target_2);
+EXPORT_SYMBOL_GPL(ppc_sc_kernel_target_big);
+EXPORT_STATIC_CALL_GPL(ppc_sc_kernel);
+EXPORT_SYMBOL_GPL(ppc_sc_kernel_call);
+EXPORT_SYMBOL_GPL(ppc_sc_kernel_call_indirect);
+
+#endif /* IS_MODULE(CONFIG_PPC_STATIC_CALL_KUNIT_TEST) */
diff --git a/arch/powerpc/kernel/static_call_test.c
b/arch/powerpc/kernel/static_call_test.c
new file mode 100644
index 000000000000..10a09ef455cf
--- /dev/null
+++ b/arch/powerpc/kernel/static_call_test.c
@@ -0,0 +1,263 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include "static_call_test.h"
+
+#include <linux/kconfig.h>
+#include <linux/module.h>
+#include <linux/static_call.h>
+
+/* Tests to ensure correctness in a variety of cases for static calls.
+ *
+ * The tests focus on ensuring the TOC is kept consistent across the
+ * module-kernel boundary, as compilers can't see that a trampoline
+ * defined locally to a caller might be jumping to a function with a
+ * different TOC. So it's important that these tests are compiled as
+ * a module to ensure the TOC will be different to the kernel's.
+ */
+
+#ifdef CONFIG_PPC64_ELF_ABI_V2
+
+/* Utils to hold a copy of the old register values while we test.
+ *
+ * We can't use the KUnit init/exit hooks because when the hooks and
+ * test cases return they will be in the KUnit context that doesn't know
+ * we've reserved and modified some non-volatile registers.
+ */
+
+static void *saved_registers[2];
+
+static void init_testcase(struct kunit *test)
+{
+ saved_registers[0] = actual_toc;
+ saved_registers[1] = module_toc;
+ module_toc = current_toc;
+ KUNIT_ASSERT_PTR_NE(test, module_toc, (void *)get_paca()->kernel_toc);
+}
+
+static void exit_testcase(void)
+{
+ actual_toc = saved_registers[0];
+ module_toc = saved_registers[1];
+}
+
+#else
+
+static void init_testcase(struct kunit *test) {}
+static void exit_testcase(void) {}
+
+#endif /* CONFIG_PPC64_ELF_ABI_V2 */
+
+static int module_target_11(struct kunit *test)
+{
+ toc_fixup(test);
+ return 11;
+}
+
+static int module_target_12(struct kunit *test)
+{
+ toc_fixup(test);
+ return 12;
+}
+
+DEFINE_STATIC_CALL(module_sc, module_target_11);
+
+DEFINE_STATIC_CALL_RET0(module_sc_ret0, int(void));
+DEFINE_STATIC_CALL_NULL(module_sc_null, int(int));
+
+static int add_one(int *val)
+{
+ return (*val)++;
+}
+
+static void null_function_test(struct kunit *test)
+{
+ int val = 0;
+
+ init_testcase(test);
+
+ /* Check argument unconditionally evaluated */
+ static_call_cond(module_sc_null)(add_one(&val));
+ KUNIT_ASSERT_EQ(test, 1, val);
+
+ exit_testcase();
+}
+
+static void return_zero_test(struct kunit *test)
+{
+ int ret;
+
+ init_testcase(test);
+
+ ret = PROTECTED_SC(test, int, static_call(module_sc_ret0)());
+ KUNIT_ASSERT_EQ(test, 0, ret);
+
+ static_call_update(ppc_sc_kernel, (void *)__static_call_return0);
+ ret = PROTECTED_SC(test, int, static_call(ppc_sc_kernel)(test));
+ KUNIT_ASSERT_EQ(test, 0, ret);
+
+ static_call_update(module_sc, (void *)__static_call_return0);
+ ret = PROTECTED_SC(test, int, static_call(module_sc)(test));
+ KUNIT_ASSERT_EQ(test, 0, ret);
+
+ exit_testcase();
+}
+
+static void kernel_kernel_kernel_test(struct kunit *test)
+{
+ init_testcase(test);
+
+ static_call_update(ppc_sc_kernel, ppc_sc_kernel_target_1);
+ KUNIT_ASSERT_EQ(test, 1, ppc_sc_kernel_call(test));
+
+ static_call_update(ppc_sc_kernel, ppc_sc_kernel_target_2);
+ KUNIT_ASSERT_EQ(test, 2, ppc_sc_kernel_call(test));
+
+ exit_testcase();
+}
+
+static void kernel_kernel_module_test(struct kunit *test)
+{
+ init_testcase(test);
+
+ static_call_update(ppc_sc_kernel, module_target_11);
+ KUNIT_ASSERT_EQ(test, 11, ppc_sc_kernel_call(test));
+
+ static_call_update(ppc_sc_kernel, module_target_12);
+ KUNIT_ASSERT_EQ(test, 12, ppc_sc_kernel_call(test));
+
+ exit_testcase();
+}
+
+static void kernel_module_kernel_test(struct kunit *test)
+{
+ init_testcase(test);
+
+ static_call_update(module_sc, ppc_sc_kernel_target_1);
+ KUNIT_ASSERT_EQ(test, 1, ppc_sc_kernel_call_indirect(test,
static_call(module_sc)));
+
+ static_call_update(module_sc, ppc_sc_kernel_target_2);
+ KUNIT_ASSERT_EQ(test, 2, ppc_sc_kernel_call_indirect(test,
static_call(module_sc)));
+
+ exit_testcase();
+}
+
+static void kernel_module_module_test(struct kunit *test)
+{
+ init_testcase(test);
+
+ static_call_update(module_sc, module_target_11);
+ KUNIT_ASSERT_EQ(test, 11, ppc_sc_kernel_call_indirect(test,
static_call(module_sc)));
+
+ static_call_update(module_sc, module_target_12);
+ KUNIT_ASSERT_EQ(test, 12, ppc_sc_kernel_call_indirect(test,
static_call(module_sc)));
+
+ exit_testcase();
+}
+
+static void module_kernel_kernel_test(struct kunit *test)
+{
+ int ret;
+
+ init_testcase(test);
+
+ static_call_update(ppc_sc_kernel, ppc_sc_kernel_target_1);
+ ret = PROTECTED_SC(test, int, static_call(ppc_sc_kernel)(test));
+ KUNIT_ASSERT_EQ(test, 1, ret);
+
+ static_call_update(ppc_sc_kernel, ppc_sc_kernel_target_2);
+ ret = PROTECTED_SC(test, int, static_call(ppc_sc_kernel)(test));
+ KUNIT_ASSERT_EQ(test, 2, ret);
+
+ exit_testcase();
+}
+
+static void module_kernel_module_test(struct kunit *test)
+{
+ int ret;
+
+ init_testcase(test);
+
+ static_call_update(ppc_sc_kernel, module_target_11);
+ ret = PROTECTED_SC(test, int, static_call(ppc_sc_kernel)(test));
+ KUNIT_ASSERT_EQ(test, 11, ret);
+
+ static_call_update(ppc_sc_kernel, module_target_12);
+ ret = PROTECTED_SC(test, int, static_call(ppc_sc_kernel)(test));
+ KUNIT_ASSERT_EQ(test, 12, ret);
+
+ exit_testcase();
+}
+
+static void module_module_kernel_test(struct kunit *test)
+{
+ int ret;
+
+ init_testcase(test);
+
+ static_call_update(module_sc, ppc_sc_kernel_target_1);
+ ret = PROTECTED_SC(test, int, static_call(module_sc)(test));
+ KUNIT_ASSERT_EQ(test, 1, ret);
+
+ static_call_update(module_sc, ppc_sc_kernel_target_2);
+ ret = PROTECTED_SC(test, int, static_call(module_sc)(test));
+ KUNIT_ASSERT_EQ(test, 2, ret);
+
+ exit_testcase();
+}
+
+static void module_module_module_test(struct kunit *test)
+{
+ int ret;
+
+ init_testcase(test);
+
+ static_call_update(module_sc, module_target_11);
+ ret = PROTECTED_SC(test, int, static_call(module_sc)(test));
+ KUNIT_ASSERT_EQ(test, 11, ret);
+
+ static_call_update(module_sc, module_target_12);
+ ret = PROTECTED_SC(test, int, static_call(module_sc)(test));
+ KUNIT_ASSERT_EQ(test, 12, ret);
+
+ exit_testcase();
+}
+
+DEFINE_STATIC_CALL(module_sc_stack_params, ppc_sc_kernel_target_big);
+
+static void stack_parameters_test(struct kunit *test)
+{
+ long m = -0x87654321;
+ long ret;
+
+ init_testcase(test);
+
+ ret = PROTECTED_SC(test, long,
+ static_call(module_sc_stack_params)(test, m, m, m, m, m, m, m,
m, m));
+ KUNIT_ASSERT_EQ(test, ~m, ret);
+
+ exit_testcase();
+}
+
+static struct kunit_case static_call_test_cases[] = {
+ KUNIT_CASE(null_function_test),
+ KUNIT_CASE(return_zero_test),
+ KUNIT_CASE(stack_parameters_test),
+ KUNIT_CASE(kernel_kernel_kernel_test),
+ KUNIT_CASE(kernel_kernel_module_test),
+ KUNIT_CASE(kernel_module_kernel_test),
+ KUNIT_CASE(kernel_module_module_test),
+ KUNIT_CASE(module_kernel_kernel_test),
+ KUNIT_CASE(module_kernel_module_test),
+ KUNIT_CASE(module_module_kernel_test),
+ KUNIT_CASE(module_module_module_test),
+ {}
+};
+
+static struct kunit_suite ppc_static_call_test_suite = {
+ .name = "ppc-static-call",
+ .test_cases = static_call_test_cases,
+};
+kunit_test_suite(ppc_static_call_test_suite);
+
+MODULE_AUTHOR("Benjamin Gray <bg...@linux.ibm.com>");
+MODULE_LICENSE("GPL");
diff --git a/arch/powerpc/kernel/static_call_test.h
b/arch/powerpc/kernel/static_call_test.h
new file mode 100644
index 000000000000..71b5bc52c099
--- /dev/null
+++ b/arch/powerpc/kernel/static_call_test.h
@@ -0,0 +1,56 @@
+#ifndef _POWERPC_STATIC_CALL_TEST_
+#define _POWERPC_STATIC_CALL_TEST_
+
+#include <kunit/test.h>
+
+DECLARE_STATIC_CALL(ppc_sc_kernel, int(struct kunit *test));
+int ppc_sc_kernel_target_1(struct kunit *test);
+int ppc_sc_kernel_target_2(struct kunit *test);
+long ppc_sc_kernel_target_big(struct kunit *test, long a, long b, long c, long
d,
+ long e, long f, long g, long h, long i);
+int ppc_sc_kernel_call(struct kunit *test);
+int ppc_sc_kernel_call_indirect(struct kunit *test, int(*fn)(struct kunit
*test));
+
+#ifdef CONFIG_PPC64_ELF_ABI_V2
+
+/* Reserve these registers for testing so that a TOC error
+ * doesn't necessarily crash the whole kernel.
+ *
+ * The tests ensure the contents are restored before returning.
+ */
+register void *current_toc asm ("r2");
+register void *actual_toc asm ("r14"); /* Copy of TOC before fixup */
+register void *module_toc asm ("r15");
+
+#ifdef MODULE
+
+#define toc_fixup(test) \
+ actual_toc = current_toc; \
+ current_toc = module_toc; \
+ KUNIT_EXPECT_PTR_EQ(test, module_toc, actual_toc)
+
+#else /* KERNEL */
+
+#define toc_fixup(test) \
+ actual_toc = current_toc; \
+ current_toc = (void *)get_paca()->kernel_toc; \
+ KUNIT_EXPECT_PTR_EQ(test, (void *)get_paca()->kernel_toc, actual_toc)
+
+#endif /* MODULE */
+
+#define PROTECTED_SC(test, ret_type, call) \
+({ \
+ ret_type ret; \
+ ret = call; \
+ toc_fixup(test); \
+ ret; \
+})
+
+#else
+
+#define toc_fixup(test) {}
+#define PROTECTED_SC(test, ret_type, call) call
+
+#endif /* CONFIG_PPC64_ELF_ABI_V2 */
+
+#endif /* _POWERPC_STATIC_CALL_TEST_ */
--
2.37.3
