riscv: remove usage of function-pointers from cpufeatures and t-head errata

Having a list of alternatives to check with a per-entry function pointer
to a check function is nice style-wise. But in case of early-alternatives
it can clash with the non-relocated kernel and the function pointer in
the list pointing to a completely wrong location.

This isn't an issue with one or two list entries, as in that case the
compiler seems to unroll the loop and even usage of the list structure
and then only does relative jumps into the check functions based on this.

When adding a third entry to either list though, the issue that was
hiding there from the beginning is triggered resulting a jump to a
memory address that isn't part of the kernel at all.

The list of features/erratas only contained an unused name and the
pointer to the check function, so an easy solution for the problem
is to just unroll the loop in code, dismantle the whole list structure
and just call the relevant check functions one by one ourself.

For the T-Head errata this includes moving the stage-check inside
the check functions.

The issue is only relevant for things that might be called for early-
alternatives (T-Head and possible future main extensions), so the
SiFive erratas were not affected from the beginning, as they got
an early return for early-alternatives in the original patchset.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Tested-by: Samuel Holland <samuel@sholland.org>
Link: https://lore.kernel.org/r/20220526205646.258337-6-heiko@sntech.de
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

diff --git a/arch/riscv/errata/thead/errata.c b/arch/riscv/errata/thead/errata.c
index e5d75270b99ccfadcca58394f438fa38cc1e141c..b37b6fedd53bc50932e87a49a02b59222e93391f 100644 (file)
--- a/arch/riscv/errata/thead/errata.c
+++ b/arch/riscv/errata/thead/errata.c
@@ -14,40 +14,26 @@
 #include <asm/patch.h>
 #include <asm/vendorid_list.h>
 
-struct errata_info {
-       char name[ERRATA_STRING_LENGTH_MAX];
-       bool (*check_func)(unsigned long arch_id, unsigned long impid);
-       unsigned int stage;
-};
-
-static bool errata_mt_check_func(unsigned long  arch_id, unsigned long impid)
+static bool errata_probe_pbmt(unsigned int stage,
+                             unsigned long arch_id, unsigned long impid)
 {
        if (arch_id != 0 || impid != 0)
                return false;
-       return true;
-}
 
-static const struct errata_info errata_list[ERRATA_THEAD_NUMBER] = {
-       {
-               .name = "memory-types",
-               .stage = RISCV_ALTERNATIVES_EARLY_BOOT,
-               .check_func = errata_mt_check_func
-       },
-};
+       if (stage == RISCV_ALTERNATIVES_EARLY_BOOT ||
+           stage == RISCV_ALTERNATIVES_MODULE)
+               return true;
+
+       return false;
+}
 
-static u32 thead_errata_probe(unsigned int stage, unsigned long archid, unsigned long impid)
+static u32 thead_errata_probe(unsigned int stage,
+                             unsigned long archid, unsigned long impid)
 {
-       const struct errata_info *info;
        u32 cpu_req_errata = 0;
-       int idx;
-
-       for (idx = 0; idx < ERRATA_THEAD_NUMBER; idx++) {
-               info = &errata_list[idx];
 
-               if ((stage == RISCV_ALTERNATIVES_MODULE ||
-                    info->stage == stage) && info->check_func(archid, impid))
-                       cpu_req_errata |= (1U << idx);
-       }
+       if (errata_probe_pbmt(stage, archid, impid))
+               cpu_req_errata |= (1U << ERRATA_THEAD_PBMT);
 
        return cpu_req_errata;
 }

diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c
index 12b05ce164bbe3afb4c370cd43a2094c268c84bf..6a40cb8134bd6ddf7759f3da40069990f2e18da2 100644 (file)
--- a/arch/riscv/kernel/cpufeature.c
+++ b/arch/riscv/kernel/cpufeature.c
@@ -245,12 +245,7 @@ void __init riscv_fill_hwcap(void)
 }
 
 #ifdef CONFIG_RISCV_ALTERNATIVE
-struct cpufeature_info {
-       char name[ERRATA_STRING_LENGTH_MAX];
-       bool (*check_func)(unsigned int stage);
-};
-
-static bool __init_or_module cpufeature_svpbmt_check_func(unsigned int stage)
+static bool __init_or_module cpufeature_probe_svpbmt(unsigned int stage)
 {
 #ifdef CONFIG_RISCV_ISA_SVPBMT
        switch (stage) {
@@ -264,26 +259,19 @@ static bool __init_or_module cpufeature_svpbmt_check_func(unsigned int stage)
        return false;
 }
 
-static const struct cpufeature_info __initdata_or_module
-cpufeature_list[CPUFEATURE_NUMBER] = {
-       {
-               .name = "svpbmt",
-               .check_func = cpufeature_svpbmt_check_func
-       },
-};
-
+/*
+ * Probe presence of individual extensions.
+ *
+ * This code may also be executed before kernel relocation, so we cannot use
+ * addresses generated by the address-of operator as they won't be valid in
+ * this context.
+ */
 static u32 __init_or_module cpufeature_probe(unsigned int stage)
 {
-       const struct cpufeature_info *info;
        u32 cpu_req_feature = 0;
-       int idx;
-
-       for (idx = 0; idx < CPUFEATURE_NUMBER; idx++) {
-               info = &cpufeature_list[idx];
 
-               if (info->check_func(stage))
-                       cpu_req_feature |= (1U << idx);
-       }
+       if (cpufeature_probe_svpbmt(stage))
+               cpu_req_feature |= (1U << CPUFEATURE_SVPBMT);
 
        return cpu_req_feature;
 }