Re: [PATCH v3 1/3] powerpc/mm: prepare kernel for KAsan on PPC32
From: Dmitry Vyukov
Date: Mon Jan 14 2019 - 04:35:08 EST
On Sat, Jan 12, 2019 at 12:16 PM Christophe Leroy
<christophe.leroy@xxxxxx> wrote:
>
> In kernel/cputable.c, explicitly use memcpy() in order
> to allow GCC to replace it with __memcpy() when KASAN is
> selected.
>
> Since commit 400c47d81ca38 ("powerpc32: memset: only use dcbz once cache is
> enabled"), memset() can be used before activation of the cache,
> so no need to use memset_io() for zeroing the BSS.
>
> Signed-off-by: Christophe Leroy <christophe.leroy@xxxxxx>
> ---
> arch/powerpc/kernel/cputable.c | 4 ++--
> arch/powerpc/kernel/setup_32.c | 6 ++----
> 2 files changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/arch/powerpc/kernel/cputable.c
b/arch/powerpc/kernel/cputable.c
> index 1eab54bc6ee9..84814c8d1bcb 100644
> --- a/arch/powerpc/kernel/cputable.c
> +++ b/arch/powerpc/kernel/cputable.c
> @@ -2147,7 +2147,7 @@ void __init set_cur_cpu_spec(struct cpu_spec *s)
> struct cpu_spec *t = &the_cpu_spec;
>
> t = PTRRELOC(t);
> - *t = *s;
> + memcpy(t, s, sizeof(*t));
Hi Christophe,
I understand why you are doing this, but this looks a bit fragile and
non-scalable. This may not work with the next version of compiler,
just different than yours version of compiler, clang, etc.
Does using -ffreestanding and/or -fno-builtin-memcpy (-memset) help?
If it helps, perhaps it makes sense to add these flags to
KASAN_SANITIZE := n files.
> *PTRRELOC(&cur_cpu_spec) = &the_cpu_spec;
> }
> @@ -2162,7 +2162,7 @@ static struct cpu_spec * __init setup_cpu_spec(unsigned long offset,
> old = *t;
>
> /* Copy everything, then do fixups */
> - *t = *s;
> + memcpy(t, s, sizeof(*t));
>
> /*
> * If we are overriding a previous value derived from the real
> diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
> index 947f904688b0..5e761eb16a6d 100644
> --- a/arch/powerpc/kernel/setup_32.c
> +++ b/arch/powerpc/kernel/setup_32.c
> @@ -73,10 +73,8 @@ notrace unsigned long __init early_init(unsigned long dt_ptr)
> {
> unsigned long offset = reloc_offset();
>
> - /* First zero the BSS -- use memset_io, some platforms don't have
> - * caches on yet */
> - memset_io((void __iomem *)PTRRELOC(&__bss_start), 0,
> - __bss_stop - __bss_start);
> + /* First zero the BSS */
> + memset(PTRRELOC(&__bss_start), 0, __bss_stop - __bss_start);
>
> /*
> * Identify the CPU type and fix up code sections
> --
> 2.13.3
>