[PATCH] powerpc: setup_64: hack around kcov + devicetree limitations

Daniel Axtens dja at axtens.net
Wed Feb 12 15:50:14 AEDT 2020


kcov instrumentation is collected the __sanitizer_cov_trace_pc hook in
kernel/kcov.c. The compiler inserts these hooks into every basic block
unless kcov is disabled for that file.

We then have a deep call-chain:
 - __sanitizer_cov_trace_pc calls to check_kcov_mode()
 - check_kcov_mode() (kernel/kcov.c) calls in_task()
 - in_task() (include/linux/preempt.h) calls preempt_count().
 - preempt_count() (include/asm-generic/preempt.h) calls
     current_thread_info()
 - because powerpc has THREAD_INFO_IN_TASK, current_thread_info()
     (include/linux/thread_info.h) is defined to 'current'
 - current (arch/powerpc/include/asm/current.h) is defined to
     get_current().
 - get_current (same file) loads an offset of r13.
 - arch/powerpc/include/asm/paca.h makes r13 a register variable
     called local_paca - it is the PACA for the current CPU, so
     this has the effect of loading the current task from PACA.
 - get_current returns the current task from PACA,
 - current_thread_info returns the task cast to a thread_info
 - preempt_count dereferences the thread_info to load preempt_count
 - that value is used by in_task and so on up the chain

The problem is:

 - kcov instrumentation is enabled for arch/powerpc/kernel/dt_cpu_ftrs.c

 - even if it were not, dt_cpu_ftrs_init calls generic dt parsing code
   which should definitely have instrumentation enabled.

 - setup_64.c calls dt_cpu_ftrs_init before it sets up a PACA.

 - It's not clear that we can move PACA setup before dt_cpu_ftrs_init as
   the PACA setup refers to CPU features - setup_paca() looks at
   early_cpu_has_feature(CPU_FTR_HVMODE)

 - If we don't set up a paca, r13 will contain unpredictable data.

 - In a zImage compiled with kcov and KASAN, we see r13 containing a value
   that leads to dereferencing invalid memory (something like
   912a72603d420015).

 - Weirdly, the same kernel as a vmlinux loaded directly by qemu does not
   crash. Investigating with gdb, it seems that in the vmlinux boot case,
   r13 is near enough to zero that we just happen to be able to read that
   part of memory (we're operating with translation off at this point) and
   the current pointer also happens to land in readable memory and
   everything just works.

There's no generic kill switch for kcov (as far as I can tell), and we
don't want to have to turn off instrumentation in the generic dt parsing
code (which lives outside arch/powerpc/) just because we don't have a real
paca or task yet.

So: create a fake task and preload it into our fake PACA. Load the paca
just into r13 (local_paca) before we call into dt_cpu_ftrs_init. This fake
task persists just for the first part of the setup process before we set
up the real PACAs.

Translations get switched on once we leave early_setup, so I think we'd
already catch any other cases where the PACA or task aren't set up.

Fixes: fb0b0a73b223 ("powerpc: Enable kcov")
Cc: Andrew Donnellan <ajd at linux.ibm.com>
Signed-off-by: Daniel Axtens <dja at axtens.net>

---

I haven't made the setup conditional on kcov being compiled in, but I
guess I could if we think it's worth it?
---
 arch/powerpc/kernel/setup_64.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index e05e6dd67ae6..26f1b8539f8e 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -281,7 +281,18 @@ void __init record_spr_defaults(void)
 
 void __init early_setup(unsigned long dt_ptr)
 {
-	static __initdata struct paca_struct boot_paca;
+	/*
+	 * We need to get something valid into local_paca/r13 asap if we
+	 * are using kcov. dt_cpu_ftrs_init will call coverage-enabled code
+	 * in the generic dt library, and that will try to call in_task().
+	 * We need a minimal paca that at least provides a valid __current.
+	 * We can't use the usual initialise/setup/fixup path as that relies
+	 * on a CPU feature.
+	 */
+	static __initdata struct task_struct task = {};
+	static __initdata struct paca_struct boot_paca = { .__current = &task };
+
+	local_paca = &boot_paca;
 
 	/* -------- printk is _NOT_ safe to use here ! ------- */
 
-- 
2.20.1



More information about the Linuxppc-dev mailing list