Revert "riscv: Fixup static_obj() fail"
PATCH 1/2 Revert "riscv: Fixup static_obj() fail"
From: Guo Ren <[email protected]>
This reverts commit 6184358da0004c8fd940afda6c0a0fa4027dc911.
It will cause bootup failure with HARDENED_USERCOPY.
As Aurelien has reported:
[ 3.484586] AppArmor: AppArmor sha1 policy hashing enabled [ 4.749835] Freeing unused kernel memory: 492K [ 4.752017] Run /init as init process [ 4.753571] usercopy: Kernel memory overwrite attempt detected to kernel text (offset 507879, size 11)! [ 4.754838] ------------[ cut here ]------------ [ 4.755651] kernel BUG at mm/usercopy.c:99! [ 4.756445] Kernel BUG [#1] [ 4.756815] Modules linked in: [ 4.757542] CPU: 1 PID: 1 Comm: swapper/0 Not tainted 5.8.0-1-riscv64 #1 Debian 5.8.7-1 [ 4.758372] epc: ffffffe0003b5120 ra : ffffffe0003b5120 sp : ffffffe07f783ca0 [ 4.758960] gp : ffffffe000cc7230 tp : ffffffe07f77cec0 t0 : ffffffe000cdafc0 [ 4.759772] t1 : 0000000000000064 t2 : 0000000000000000 s0 : ffffffe07f783cf0 [ 4.760534] s1 : ffffffe00095d780 a0 : 000000000000005b a1 : 0000000000000020 [ 4.761309] a2 : 0000000000000005 a3 : 0000000000000000 a4 : ffffffe000c1f340 [ 4.761848] a5 : ffffffe000c1f340 a6 : 0000000000000000 a7 : 0000000000000087 [ 4.762684] s2 : ffffffe000941848 s3 : 000000000007bfe7 s4 : 000000000000000b [ 4.763500] s5 : 0000000000000000 s6 : ffffffe00091cc00 s7 : fffffffffffff000 [ 4.764376] s8 : 0000003ffffff000 s9 : ffffffe0769f3200 s10: 000000000000000b [ 4.765208] s11: ffffffe07d548c40 t3 : 0000000000000000 t4 : 000000000001dcd0 [ 4.766059] t5 : ffffffe000cc8510 t6 : ffffffe000cd64aa [ 4.766712] status: 0000000000000120 badaddr: 0000000000000000 cause: 0000000000000003 [ 4.768308] ---[ end trace 1f8e733e834d4c3e ]--- [ 4.769129] Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b [ 4.770070] SMP: stopping secondary CPUs [ 4.771110] ---[ end Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b ]---
--- arch/riscv/kernel/vmlinux.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/kernel/vmlinux.lds.S +1 -1
@@ -22,7 +22,6 @@ SECTIONS /* Beginning of code and text segment */ . = LOAD_OFFSET; _start = .; - _stext = .; HEAD_TEXT_SECTION . = ALIGN(PAGE_SIZE);
@@ -55,6 +54,7 @@ SECTIONS . = ALIGN(SECTION_ALIGN); .text : { _text = .; + _stext = .; TEXT_TEXT SCHED_TEXT CPUIDLE_TEXT
Signature · 1 line
2.7.4
PATCH 2/2 riscv: Fixup static_obj() fail v2
From: Guo Ren <[email protected]>
v1 is commit: 6184358da0004c8fd940afda6c0a0fa4027dc911 which has been reverted.
When enable LOCKDEP, static_obj() will cause error:
[ 0.067192] INFO: trying to register non-static key. [ 0.067325] the code is fine but needs lockdep annotation. [ 0.067449] turning off the locking correctness validator. [ 0.067718] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.7.0-rc7-dirty #44 [ 0.067945] Call Trace: [ 0.068369] [<ffffffe00020323c>] walk_stackframe+0x0/0xa4 [ 0.068506] [<ffffffe000203422>] show_stack+0x2a/0x34 [ 0.068631] [<ffffffe000521e4e>] dump_stack+0x94/0xca [ 0.068757] [<ffffffe000255a4e>] register_lock_class+0x5b8/0x5bc [ 0.068969] [<ffffffe000255abe>] __lock_acquire+0x6c/0x1d5c [ 0.069101] [<ffffffe0002550fe>] lock_acquire+0xae/0x312 [ 0.069228] [<ffffffe000989a8e>] _raw_spin_lock_irqsave+0x40/0x5a [ 0.069357] [<ffffffe000247c64>] complete+0x1e/0x50 [ 0.069479] [<ffffffe000984c38>] rest_init+0x1b0/0x28a [ 0.069660] [<ffffffe0000016a2>] 0xffffffe0000016a2 [ 0.069779] [<ffffffe000001b84>] 0xffffffe000001b84 [ 0.069953] [<ffffffe000001092>] 0xffffffe000001092
Because some __initdata static variables is before _stext:
static int static_obj(const void *obj)
{
unsigned long start = (unsigned long) &_stext,
end = (unsigned long) &_end,
addr = (unsigned long) obj;
/*
* static variable?
*/
if ((addr >= start) && (addr < end))
return 1;
if (arch_is_kernel_data(addr))
return 1;We could implement arch_is_kernel_data to fixup it.
--- arch/riscv/include/asm/sections.h | 20 ++++++++++++++++++++ arch/riscv/kernel/setup.c | 9 +++++++++ 2 files changed, 29 insertions(+) create mode 100644 arch/riscv/include/asm/sections.h
arch/riscv/include/asm/sections.h new file +20 -0
@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef _ASM_RISCV_SECTIONS_H +#define _ASM_RISCV_SECTIONS_H + +#define arch_is_kernel_data arch_is_kernel_data + +#include <asm-generic/sections.h> + +extern bool init_mem_is_free; + +static inline int arch_is_kernel_data (unsigned long addr) +{ +if (init_mem_is_free) +return 0 ; + +return addr >= (unsigned long )__init_begin && + addr < (unsigned long )__init_end; +} +#endif /* _ASM_RISCV_SECTIONS_H */
arch/riscv/kernel/setup.c +9 -0
@@ -17,6 +17,7 @@#include <linux/sched/task.h> #include <linux/swiotlb.h> #include <linux/smp.h> +#include <linux/poison.h> #include <asm/cpu_ops.h> #include <asm/setup.h>
@@ -112,3 +113,11 @@ static int __init topology_init(void)return 0 ; }subsys_initcall (topology_init); + +bool init_mem_is_free = false; + +void free_initmem (void ) +{ +free_initmem_default (POISON_FREE_INITMEM ); + init_mem_is_free = true; +}
Signature · 1 line
2.7.4
Re: [PATCH 2/2] riscv: Fixup static_obj() fail v2
arch/riscv/include/asm/sections.h
Quoted 63 lines · On Wed, Oct 7, 2020 at 8:09 AM <[email protected]> wrote:
From: Guo Ren <[email protected]>
v1 is commit:
6184358da0004c8fd940afda6c0a0fa4027dc911which has been reverted.When enable LOCKDEP,
static_obj()will cause error:[ 0.067192] INFO: trying to register non-static key. [ 0.067325] the code is fine but needs lockdep annotation. [ 0.067449] turning off the locking correctness validator. [ 0.067718] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.7.0-rc7-dirty #44 [ 0.067945] Call Trace: [ 0.068369] [<ffffffe00020323c>] walk_stackframe+0x0/0xa4 [ 0.068506] [<ffffffe000203422>] show_stack+0x2a/0x34 [ 0.068631] [<ffffffe000521e4e>] dump_stack+0x94/0xca [ 0.068757] [<ffffffe000255a4e>] register_lock_class+0x5b8/0x5bc [ 0.068969] [<ffffffe000255abe>] __lock_acquire+0x6c/0x1d5c [ 0.069101] [<ffffffe0002550fe>] lock_acquire+0xae/0x312 [ 0.069228] [<ffffffe000989a8e>] _raw_spin_lock_irqsave+0x40/0x5a [ 0.069357] [<ffffffe000247c64>] complete+0x1e/0x50 [ 0.069479] [<ffffffe000984c38>] rest_init+0x1b0/0x28a [ 0.069660] [<ffffffe0000016a2>] 0xffffffe0000016a2 [ 0.069779] [<ffffffe000001b84>] 0xffffffe000001b84 [ 0.069953] [<ffffffe000001092>] 0xffffffe000001092Because some
__initdatastatic variables is before_stext:static int
static_obj(const void *obj){ unsigned long start = (unsigned long) &_stext, end = (unsigned long) &_end, addr = (unsigned long) obj; /* * static variable? */ if ((addr >= start) && (addr < end)) return 1; if (arch_is_kernel_data(addr)) return 1;We could implement
arch_is_kernel_datato fixup it.Signed-off-by Guo Ren <[email protected]>Reported-by Aurelien Jarno <[email protected]>Cc Palmer Dabbelt <[email protected]>Cc Atish Patra <[email protected]>Cc Andreas Schwab <[email protected]>Cc Aurelien Jarno <[email protected]>--- arch/riscv/include/asm/sections.h | 20 ++++++++++++++++++++ arch/riscv/kernel/setup.c | 9 +++++++++ 2 files changed, 29 insertions(+) create mode 100644 arch/riscv/include/asm/sections.harch/riscv/include/asm/sections.h new file +0
-0
You may want to rebase it on top of for-next as UEFI series also adds this file. .
Quoted 46 lines
arch/riscv/include/asm/sections.h new file +20
-0@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef _ASM_RISCV_SECTIONS_H +#define _ASM_RISCV_SECTIONS_H + +#define arch_is_kernel_data arch_is_kernel_data + +#include <asm-generic/sections.h> + +extern bool init_mem_is_free; + +static inline int arch_is_kernel_data (unsigned long addr) +{ +if (init_mem_is_free) +return 0 ; + +return addr >= (unsigned long )__init_begin && + addr < (unsigned long )__init_end; +} +#endif /* _ASM_RISCV_SECTIONS_H */ arch/riscv/kernel/setup.c +9
-1@@ -17,6 +17,7 @@#include <linux/sched/task.h> #include <linux/swiotlb.h> #include <linux/smp.h> +#include <linux/poison.h> #include <asm/cpu_ops.h> #include <asm/setup.h> @@ -112,3 +113,11 @@ static int __init topology_init(void)return 0 ; }subsys_initcall (topology_init); + +bool init_mem_is_free = false; + +void free_initmem (void ) +{ +free_initmem_default (POISON_FREE_INITMEM ); + init_mem_is_free = true; +} --
Quoted 2 lines
2.7.4
Looks good. Much cleaner than the first approach.
FYI: I am still looking into separating __init text & data so that different permissions can be applied to them.
With this patch, we can just separate it on top of _stext.
Signature · 2 lines
Regards, Atish
Re: [PATCH 2/2] riscv: Fixup static_obj() fail v2
Quoted 60 lines · Atish Patra
Quoted 58 lines · On Wed, Oct 7, 2020 at 8:09 AM <[email protected]> wrote:
From: Guo Ren <[email protected]>
v1 is commit:
6184358da0004c8fd940afda6c0a0fa4027dc911which has been reverted.When enable LOCKDEP,
static_obj()will cause error:[ 0.067192] INFO: trying to register non-static key. [ 0.067325] the code is fine but needs lockdep annotation. [ 0.067449] turning off the locking correctness validator. [ 0.067718] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.7.0-rc7-dirty #44 [ 0.067945] Call Trace: [ 0.068369] [<ffffffe00020323c>] walk_stackframe+0x0/0xa4 [ 0.068506] [<ffffffe000203422>] show_stack+0x2a/0x34 [ 0.068631] [<ffffffe000521e4e>] dump_stack+0x94/0xca [ 0.068757] [<ffffffe000255a4e>] register_lock_class+0x5b8/0x5bc [ 0.068969] [<ffffffe000255abe>] __lock_acquire+0x6c/0x1d5c [ 0.069101] [<ffffffe0002550fe>] lock_acquire+0xae/0x312 [ 0.069228] [<ffffffe000989a8e>] _raw_spin_lock_irqsave+0x40/0x5a [ 0.069357] [<ffffffe000247c64>] complete+0x1e/0x50 [ 0.069479] [<ffffffe000984c38>] rest_init+0x1b0/0x28a [ 0.069660] [<ffffffe0000016a2>] 0xffffffe0000016a2 [ 0.069779] [<ffffffe000001b84>] 0xffffffe000001b84 [ 0.069953] [<ffffffe000001092>] 0xffffffe000001092Because some
__initdatastatic variables is before_stext:static int
static_obj(const void *obj){ unsigned long start = (unsigned long) &_stext, end = (unsigned long) &_end, addr = (unsigned long) obj; /* * static variable? */ if ((addr >= start) && (addr < end)) return 1; if (arch_is_kernel_data(addr)) return 1;We could implement
arch_is_kernel_datato fixup it.Signed-off-by Guo Ren <[email protected]>Reported-by Aurelien Jarno <[email protected]>Cc Palmer Dabbelt <[email protected]>Cc Atish Patra <[email protected]>Cc Andreas Schwab <[email protected]>Cc Aurelien Jarno <[email protected]>--- arch/riscv/include/asm/sections.h | 20 ++++++++++++++++++++ arch/riscv/kernel/setup.c | 9 +++++++++ 2 files changed, 29 insertions(+) create mode 100644 arch/riscv/include/asm/sections.h
Quoted 7 lines
arch/riscv/include/asm/sections.h
Quoted 5 lines
arch/riscv/include/asm/sections.h new file +0
-0You may want to rebase it on top of for-next as UEFI series also adds this file.
ok
Quoted 62 lines
.
Quoted 46 lines
arch/riscv/include/asm/sections.h new file +20
-0@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef _ASM_RISCV_SECTIONS_H +#define _ASM_RISCV_SECTIONS_H + +#define arch_is_kernel_data arch_is_kernel_data + +#include <asm-generic/sections.h> + +extern bool init_mem_is_free; + +static inline int arch_is_kernel_data (unsigned long addr) +{ +if (init_mem_is_free) +return 0 ; + +return addr >= (unsigned long )__init_begin && + addr < (unsigned long )__init_end; +} +#endif /* _ASM_RISCV_SECTIONS_H */ arch/riscv/kernel/setup.c +9
-1@@ -17,6 +17,7 @@#include <linux/sched/task.h> #include <linux/swiotlb.h> #include <linux/smp.h> +#include <linux/poison.h> #include <asm/cpu_ops.h> #include <asm/setup.h> @@ -112,3 +113,11 @@ static int __init topology_init(void)return 0 ; }subsys_initcall (topology_init); + +bool init_mem_is_free = false; + +void free_initmem (void ) +{ +free_initmem_default (POISON_FREE_INITMEM ); + init_mem_is_free = true; +} --Quoted 2 lines
2.7.4
Looks good. Much cleaner than the first approach.
FYI: I am still looking into separating__inittext & data so that different permissions can be applied to them.
With this patch, we can just separate it on top of_stext.Reviewed-by Atish Patra <[email protected]>--
Regards,
Atish
Signature · 4 lines
Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/
Re: [PATCH 2/2] riscv: Fixup static_obj() fail v2
In reply to [email protected]Quoted 97 lines · On Wed, 07 Oct 2020 08:08:33 PDT (-0700), [email protected] wrote:
From: Guo Ren <[email protected]>
v1 is commit:
6184358da0004c8fd940afda6c0a0fa4027dc911which has been reverted.When enable LOCKDEP,
static_obj()will cause error:[ 0.067192] INFO: trying to register non-static key. [ 0.067325] the code is fine but needs lockdep annotation. [ 0.067449] turning off the locking correctness validator. [ 0.067718] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.7.0-rc7-dirty #44 [ 0.067945] Call Trace: [ 0.068369] [<ffffffe00020323c>] walk_stackframe+0x0/0xa4 [ 0.068506] [<ffffffe000203422>] show_stack+0x2a/0x34 [ 0.068631] [<ffffffe000521e4e>] dump_stack+0x94/0xca [ 0.068757] [<ffffffe000255a4e>] register_lock_class+0x5b8/0x5bc [ 0.068969] [<ffffffe000255abe>] __lock_acquire+0x6c/0x1d5c [ 0.069101] [<ffffffe0002550fe>] lock_acquire+0xae/0x312 [ 0.069228] [<ffffffe000989a8e>] _raw_spin_lock_irqsave+0x40/0x5a [ 0.069357] [<ffffffe000247c64>] complete+0x1e/0x50 [ 0.069479] [<ffffffe000984c38>] rest_init+0x1b0/0x28a [ 0.069660] [<ffffffe0000016a2>] 0xffffffe0000016a2 [ 0.069779] [<ffffffe000001b84>] 0xffffffe000001b84 [ 0.069953] [<ffffffe000001092>] 0xffffffe000001092Because some
__initdatastatic variables is before_stext:static int
static_obj(const void *obj){ unsigned long start = (unsigned long) &_stext, end = (unsigned long) &_end, addr = (unsigned long) obj; /* * static variable? */ if ((addr >= start) && (addr < end)) return 1; if (arch_is_kernel_data(addr)) return 1;We could implement
arch_is_kernel_datato fixup it.Signed-off-by Guo Ren <[email protected]>Reported-by Aurelien Jarno <[email protected]>Cc Palmer Dabbelt <[email protected]>Cc Atish Patra <[email protected]>Cc Andreas Schwab <[email protected]>Cc Aurelien Jarno <[email protected]>--- arch/riscv/include/asm/sections.h | 20 ++++++++++++++++++++ arch/riscv/kernel/setup.c | 9 +++++++++ 2 files changed, 29 insertions(+) create mode 100644 arch/riscv/include/asm/sections.harch/riscv/include/asm/sections.h new file +20
-0@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef _ASM_RISCV_SECTIONS_H +#define _ASM_RISCV_SECTIONS_H + +#define arch_is_kernel_data arch_is_kernel_data + +#include <asm-generic/sections.h> + +extern bool init_mem_is_free; + +static inline int arch_is_kernel_data (unsigned long addr) +{ +if (init_mem_is_free) +return 0 ; + +return addr >= (unsigned long )__init_begin && + addr < (unsigned long )__init_end; +} +#endif /* _ASM_RISCV_SECTIONS_H */ arch/riscv/kernel/setup.c +1
-0@@ -17,6 +17,7 @@#include <linux/sched/task.h> #include <linux/swiotlb.h> #include <linux/smp.h> +#include <linux/poison.h> #include <asm/cpu_ops.h> #include <asm/setup.h> @@ -112,3 +113,11 @@ static int __init topology_init(void)return 0 ;
arch/riscv/kernel/setup.c static int __init topology_init(void) · line 123
Quoted 10 lines
arch/riscv/kernel/setup.c +8
-0}subsys_initcall (topology_init); + +bool init_mem_is_free = false; + +void free_initmem (void ) +{ +free_initmem_default (POISON_FREE_INITMEM ); + init_mem_is_free = true; +}
I'm a bit confused as to what you're trying to do here. Yesterday I got another version of this patch set that moves init data around, today a different one. Yesterday's is tested and simpler, and given it's so late in the process I'm inclined to take that as I don't want to break anything.
Right now I have
84814460eef9 ("riscv: Fixup bootup failure with HARDENED_USERCOPY") a78c6f5956a9 ("RISC-V: Make sure memblock reserves the memory containing DT") 549738f15da0 ("Linux 5.9-rc8")
Unless there's some functional bug, that's what I'm going to send out for 5.9 -- I'm not all that worried about lacking the ability to free init data. The above seems like fine 5.10 material.
Let me know if I'm missing something here.
Re: [PATCH 2/2] riscv: Fixup static_obj() fail v2
Quoted 106 lines · Palmer Dabbelt
Quoted 104 lines · On Wed, 07 Oct 2020 08:08:33 PDT (-0700), [email protected] wrote:
From: Guo Ren <[email protected]>
v1 is commit:
6184358da0004c8fd940afda6c0a0fa4027dc911which has been reverted.When enable LOCKDEP,
static_obj()will cause error:[ 0.067192] INFO: trying to register non-static key. [ 0.067325] the code is fine but needs lockdep annotation. [ 0.067449] turning off the locking correctness validator. [ 0.067718] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.7.0-rc7-dirty #44 [ 0.067945] Call Trace: [ 0.068369] [<ffffffe00020323c>] walk_stackframe+0x0/0xa4 [ 0.068506] [<ffffffe000203422>] show_stack+0x2a/0x34 [ 0.068631] [<ffffffe000521e4e>] dump_stack+0x94/0xca [ 0.068757] [<ffffffe000255a4e>] register_lock_class+0x5b8/0x5bc [ 0.068969] [<ffffffe000255abe>] __lock_acquire+0x6c/0x1d5c [ 0.069101] [<ffffffe0002550fe>] lock_acquire+0xae/0x312 [ 0.069228] [<ffffffe000989a8e>] _raw_spin_lock_irqsave+0x40/0x5a [ 0.069357] [<ffffffe000247c64>] complete+0x1e/0x50 [ 0.069479] [<ffffffe000984c38>] rest_init+0x1b0/0x28a [ 0.069660] [<ffffffe0000016a2>] 0xffffffe0000016a2 [ 0.069779] [<ffffffe000001b84>] 0xffffffe000001b84 [ 0.069953] [<ffffffe000001092>] 0xffffffe000001092Because some
__initdatastatic variables is before_stext:static int
static_obj(const void *obj){ unsigned long start = (unsigned long) &_stext, end = (unsigned long) &_end, addr = (unsigned long) obj; /* * static variable? */ if ((addr >= start) && (addr < end)) return 1; if (arch_is_kernel_data(addr)) return 1;We could implement
arch_is_kernel_datato fixup it.Signed-off-by Guo Ren <[email protected]>Reported-by Aurelien Jarno <[email protected]>Cc Palmer Dabbelt <[email protected]>Cc Atish Patra <[email protected]>Cc Andreas Schwab <[email protected]>Cc Aurelien Jarno <[email protected]>--- arch/riscv/include/asm/sections.h | 20 ++++++++++++++++++++ arch/riscv/kernel/setup.c | 9 +++++++++ 2 files changed, 29 insertions(+) create mode 100644 arch/riscv/include/asm/sections.harch/riscv/include/asm/sections.h new file +20
-0@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef _ASM_RISCV_SECTIONS_H +#define _ASM_RISCV_SECTIONS_H + +#define arch_is_kernel_data arch_is_kernel_data + +#include <asm-generic/sections.h> + +extern bool init_mem_is_free; + +static inline int arch_is_kernel_data (unsigned long addr) +{ +if (init_mem_is_free) +return 0 ; + +return addr >= (unsigned long )__init_begin && + addr < (unsigned long )__init_end; +} +#endif /* _ASM_RISCV_SECTIONS_H */ arch/riscv/kernel/setup.c +6
-0@@ -17,6 +17,7 @@#include <linux/sched/task.h> #include <linux/swiotlb.h> #include <linux/smp.h> +#include <linux/poison.h> #include <asm/cpu_ops.h> #include <asm/setup.h> @@ -112,3 +113,11 @@ static int __init topology_init(void)return 0 ; }subsys_initcall (topology_init); + +bool init_mem_is_free = false; + +void free_initmem (void ) +{
Quoted 9 lines
arch/riscv/kernel/setup.c static int __init topology_init(void) · line 123
Quoted 3 lines
arch/riscv/kernel/setup.c +3
-0+free_initmem_default (POISON_FREE_INITMEM ); + init_mem_is_free = true; +}I'm a bit confused as to what you're trying to do here. Yesterday I got another version of this patch set that moves init data around, today a different one. Yesterday's is tested and simpler, and given it's so late in the process I'm inclined to take that as I don't want to break anything.
I agree. This version will have some more conflicts with other patches and it's too late in cycle.
It's best to merge it in 5.10.
Quoted 11 lines
Right now I have
84814460eef9("riscv: Fixup bootup failure withHARDENED_USERCOPY")a78c6f5956a9("RISC-V: Make sure memblock reserves the memory containing DT")549738f15da0("Linux 5.9-rc8")Unless there's some functional bug, that's what I'm going to send out for 5.9 -- I'm not all that worried about lacking the ability to free init data. The above seems like fine 5.10 material.
Let me know if I'm missing something here.
Signature · 2 lines
Regards, Atish
Re: [PATCH 2/2] riscv: Fixup static_obj() fail v2
In reply to Palmer DabbeltQuoted 121 lines · Palmer Dabbelt
Quoted 97 lines · On Wed, 07 Oct 2020 08:08:33 PDT (-0700), [email protected] wrote:
From: Guo Ren <[email protected]>
v1 is commit:
6184358da0004c8fd940afda6c0a0fa4027dc911which has been reverted.When enable LOCKDEP,
static_obj()will cause error:[ 0.067192] INFO: trying to register non-static key. [ 0.067325] the code is fine but needs lockdep annotation. [ 0.067449] turning off the locking correctness validator. [ 0.067718] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.7.0-rc7-dirty #44 [ 0.067945] Call Trace: [ 0.068369] [<ffffffe00020323c>] walk_stackframe+0x0/0xa4 [ 0.068506] [<ffffffe000203422>] show_stack+0x2a/0x34 [ 0.068631] [<ffffffe000521e4e>] dump_stack+0x94/0xca [ 0.068757] [<ffffffe000255a4e>] register_lock_class+0x5b8/0x5bc [ 0.068969] [<ffffffe000255abe>] __lock_acquire+0x6c/0x1d5c [ 0.069101] [<ffffffe0002550fe>] lock_acquire+0xae/0x312 [ 0.069228] [<ffffffe000989a8e>] _raw_spin_lock_irqsave+0x40/0x5a [ 0.069357] [<ffffffe000247c64>] complete+0x1e/0x50 [ 0.069479] [<ffffffe000984c38>] rest_init+0x1b0/0x28a [ 0.069660] [<ffffffe0000016a2>] 0xffffffe0000016a2 [ 0.069779] [<ffffffe000001b84>] 0xffffffe000001b84 [ 0.069953] [<ffffffe000001092>] 0xffffffe000001092Because some
__initdatastatic variables is before_stext:static int
static_obj(const void *obj){ unsigned long start = (unsigned long) &_stext, end = (unsigned long) &_end, addr = (unsigned long) obj; /* * static variable? */ if ((addr >= start) && (addr < end)) return 1; if (arch_is_kernel_data(addr)) return 1;We could implement
arch_is_kernel_datato fixup it.Signed-off-by Guo Ren <[email protected]>Reported-by Aurelien Jarno <[email protected]>Cc Palmer Dabbelt <[email protected]>Cc Atish Patra <[email protected]>Cc Andreas Schwab <[email protected]>Cc Aurelien Jarno <[email protected]>--- arch/riscv/include/asm/sections.h | 20 ++++++++++++++++++++ arch/riscv/kernel/setup.c | 9 +++++++++ 2 files changed, 29 insertions(+) create mode 100644 arch/riscv/include/asm/sections.harch/riscv/include/asm/sections.h new file +20
-0@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef _ASM_RISCV_SECTIONS_H +#define _ASM_RISCV_SECTIONS_H + +#define arch_is_kernel_data arch_is_kernel_data + +#include <asm-generic/sections.h> + +extern bool init_mem_is_free; + +static inline int arch_is_kernel_data (unsigned long addr) +{ +if (init_mem_is_free) +return 0 ; + +return addr >= (unsigned long )__init_begin && + addr < (unsigned long )__init_end; +} +#endif /* _ASM_RISCV_SECTIONS_H */ arch/riscv/kernel/setup.c +1
-0@@ -17,6 +17,7 @@#include <linux/sched/task.h> #include <linux/swiotlb.h> #include <linux/smp.h> +#include <linux/poison.h> #include <asm/cpu_ops.h> #include <asm/setup.h> @@ -112,3 +113,11 @@ static int __init topology_init(void)return 0 ;arch/riscv/kernel/setup.c static int __init topology_init(void) · line 123
Quoted 10 lines
arch/riscv/kernel/setup.c +8
-0}subsys_initcall (topology_init); + +bool init_mem_is_free = false; + +void free_initmem (void ) +{ +free_initmem_default (POISON_FREE_INITMEM ); + init_mem_is_free = true; +}I'm a bit confused as to what you're trying to do here. Yesterday I got another version of this patch set that moves init data around, today a different one. Yesterday's is tested and simpler, and given it's so late in the process I'm inclined to take that as I don't want to break anything.
Right now I have
84814460eef9("riscv: Fixup bootup failure withHARDENED_USERCOPY")a78c6f5956a9("RISC-V: Make sure memblock reserves the memory containing DT")549738f15da0("Linux 5.9-rc8")
Quoted 5 lines
Unless there's some functional bug, that's what I'm going to send out for 5.9 -- I'm not all that worried about lacking the ability to free init data. The above seems like fine 5.10 material.
Let me know if I'm missing something here.
84814460eef9 could resolve the problem and Atish ask for any other idea? So It's another choice, I forgot RFC in prefix.
6184358da0004c8fd940afda6c0a0fa4027dc911("riscv: Fixup static_obj() fail") is a sloppy patch that introduces another problem. Sorry about that.
Signature · 4 lines
Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/
Re: [PATCH 2/2] riscv: Fixup static_obj() fail v2
Quoted 123 lines · Guo Ren
Quoted 121 lines · Palmer Dabbelt
Quoted 97 lines · On Wed, 07 Oct 2020 08:08:33 PDT (-0700), [email protected] wrote:
From: Guo Ren <[email protected]>
v1 is commit:
6184358da0004c8fd940afda6c0a0fa4027dc911which has been reverted.When enable LOCKDEP,
static_obj()will cause error:[ 0.067192] INFO: trying to register non-static key. [ 0.067325] the code is fine but needs lockdep annotation. [ 0.067449] turning off the locking correctness validator. [ 0.067718] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.7.0-rc7-dirty #44 [ 0.067945] Call Trace: [ 0.068369] [<ffffffe00020323c>] walk_stackframe+0x0/0xa4 [ 0.068506] [<ffffffe000203422>] show_stack+0x2a/0x34 [ 0.068631] [<ffffffe000521e4e>] dump_stack+0x94/0xca [ 0.068757] [<ffffffe000255a4e>] register_lock_class+0x5b8/0x5bc [ 0.068969] [<ffffffe000255abe>] __lock_acquire+0x6c/0x1d5c [ 0.069101] [<ffffffe0002550fe>] lock_acquire+0xae/0x312 [ 0.069228] [<ffffffe000989a8e>] _raw_spin_lock_irqsave+0x40/0x5a [ 0.069357] [<ffffffe000247c64>] complete+0x1e/0x50 [ 0.069479] [<ffffffe000984c38>] rest_init+0x1b0/0x28a [ 0.069660] [<ffffffe0000016a2>] 0xffffffe0000016a2 [ 0.069779] [<ffffffe000001b84>] 0xffffffe000001b84 [ 0.069953] [<ffffffe000001092>] 0xffffffe000001092Because some
__initdatastatic variables is before_stext:static int
static_obj(const void *obj){ unsigned long start = (unsigned long) &_stext, end = (unsigned long) &_end, addr = (unsigned long) obj; /* * static variable? */ if ((addr >= start) && (addr < end)) return 1; if (arch_is_kernel_data(addr)) return 1;We could implement
arch_is_kernel_datato fixup it.Signed-off-by Guo Ren <[email protected]>Reported-by Aurelien Jarno <[email protected]>Cc Palmer Dabbelt <[email protected]>Cc Atish Patra <[email protected]>Cc Andreas Schwab <[email protected]>Cc Aurelien Jarno <[email protected]>--- arch/riscv/include/asm/sections.h | 20 ++++++++++++++++++++ arch/riscv/kernel/setup.c | 9 +++++++++ 2 files changed, 29 insertions(+) create mode 100644 arch/riscv/include/asm/sections.harch/riscv/include/asm/sections.h new file +20
-0@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef _ASM_RISCV_SECTIONS_H +#define _ASM_RISCV_SECTIONS_H + +#define arch_is_kernel_data arch_is_kernel_data + +#include <asm-generic/sections.h> + +extern bool init_mem_is_free; + +static inline int arch_is_kernel_data (unsigned long addr) +{ +if (init_mem_is_free) +return 0 ; + +return addr >= (unsigned long )__init_begin && + addr < (unsigned long )__init_end; +} +#endif /* _ASM_RISCV_SECTIONS_H */ arch/riscv/kernel/setup.c +1
-0@@ -17,6 +17,7 @@#include <linux/sched/task.h> #include <linux/swiotlb.h> #include <linux/smp.h> +#include <linux/poison.h> #include <asm/cpu_ops.h> #include <asm/setup.h> @@ -112,3 +113,11 @@ static int __init topology_init(void)return 0 ;arch/riscv/kernel/setup.c static int __init topology_init(void) · line 123
Quoted 10 lines
arch/riscv/kernel/setup.c +8
-0}subsys_initcall (topology_init); + +bool init_mem_is_free = false; + +void free_initmem (void ) +{ +free_initmem_default (POISON_FREE_INITMEM ); + init_mem_is_free = true; +}I'm a bit confused as to what you're trying to do here. Yesterday I got another version of this patch set that moves init data around, today a different one. Yesterday's is tested and simpler, and given it's so late in the process I'm inclined to take that as I don't want to break anything.
Right now I have
84814460eef9("riscv: Fixup bootup failure withHARDENED_USERCOPY")a78c6f5956a9("RISC-V: Make sure memblock reserves the memory containing DT")549738f15da0("Linux 5.9-rc8")
Quoted 8 lines
Quoted 5 lines
Unless there's some functional bug, that's what I'm going to send out for 5.9 -- I'm not all that worried about lacking the ability to free init data. The above seems like fine 5.10 material.
Let me know if I'm missing something here.
84814460eef9could resolve the problem and Atish ask for any other idea? So It's another choice, I forgot RFC in prefix.
I prefer this fix as it is cleaner and doesn't waste memory. I have sent another series
on top of this fix, that addresses the init section protections we talked about. All of these are definitely
next merge window material.
Quoted 9 lines
6184358da0004c8fd940afda6c0a0fa4027dc911("riscv: Fixup
static_obj()fail") is a sloppy patch that introduces another problem. Sorry about that.--
Best Regards
Guo Ren
Signature · 2 lines
Regards, Atish
Re: [PATCH 2/2] riscv: Fixup static_obj() fail v2
Quoted 133 lines · On Fri, 09 Oct 2020 14:16:00 PDT (-0700), [email protected] wrote:
Quoted 123 lines · Guo Ren
Quoted 121 lines · Palmer Dabbelt
Quoted 97 lines · On Wed, 07 Oct 2020 08:08:33 PDT (-0700), [email protected] wrote:
From: Guo Ren <[email protected]>
v1 is commit:
6184358da0004c8fd940afda6c0a0fa4027dc911which has been reverted.When enable LOCKDEP,
static_obj()will cause error:[ 0.067192] INFO: trying to register non-static key. [ 0.067325] the code is fine but needs lockdep annotation. [ 0.067449] turning off the locking correctness validator. [ 0.067718] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.7.0-rc7-dirty #44 [ 0.067945] Call Trace: [ 0.068369] [<ffffffe00020323c>] walk_stackframe+0x0/0xa4 [ 0.068506] [<ffffffe000203422>] show_stack+0x2a/0x34 [ 0.068631] [<ffffffe000521e4e>] dump_stack+0x94/0xca [ 0.068757] [<ffffffe000255a4e>] register_lock_class+0x5b8/0x5bc [ 0.068969] [<ffffffe000255abe>] __lock_acquire+0x6c/0x1d5c [ 0.069101] [<ffffffe0002550fe>] lock_acquire+0xae/0x312 [ 0.069228] [<ffffffe000989a8e>] _raw_spin_lock_irqsave+0x40/0x5a [ 0.069357] [<ffffffe000247c64>] complete+0x1e/0x50 [ 0.069479] [<ffffffe000984c38>] rest_init+0x1b0/0x28a [ 0.069660] [<ffffffe0000016a2>] 0xffffffe0000016a2 [ 0.069779] [<ffffffe000001b84>] 0xffffffe000001b84 [ 0.069953] [<ffffffe000001092>] 0xffffffe000001092Because some
__initdatastatic variables is before_stext:static int
static_obj(const void *obj){ unsigned long start = (unsigned long) &_stext, end = (unsigned long) &_end, addr = (unsigned long) obj; /* * static variable? */ if ((addr >= start) && (addr < end)) return 1; if (arch_is_kernel_data(addr)) return 1;We could implement
arch_is_kernel_datato fixup it.Signed-off-by Guo Ren <[email protected]>Reported-by Aurelien Jarno <[email protected]>Cc Palmer Dabbelt <[email protected]>Cc Atish Patra <[email protected]>Cc Andreas Schwab <[email protected]>Cc Aurelien Jarno <[email protected]>--- arch/riscv/include/asm/sections.h | 20 ++++++++++++++++++++ arch/riscv/kernel/setup.c | 9 +++++++++ 2 files changed, 29 insertions(+) create mode 100644 arch/riscv/include/asm/sections.harch/riscv/include/asm/sections.h new file +20
-0@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef _ASM_RISCV_SECTIONS_H +#define _ASM_RISCV_SECTIONS_H + +#define arch_is_kernel_data arch_is_kernel_data + +#include <asm-generic/sections.h> + +extern bool init_mem_is_free; + +static inline int arch_is_kernel_data (unsigned long addr) +{ +if (init_mem_is_free) +return 0 ; + +return addr >= (unsigned long )__init_begin && + addr < (unsigned long )__init_end; +} +#endif /* _ASM_RISCV_SECTIONS_H */ arch/riscv/kernel/setup.c +1
-0@@ -17,6 +17,7 @@#include <linux/sched/task.h> #include <linux/swiotlb.h> #include <linux/smp.h> +#include <linux/poison.h> #include <asm/cpu_ops.h> #include <asm/setup.h> @@ -112,3 +113,11 @@ static int __init topology_init(void)return 0 ;arch/riscv/kernel/setup.c static int __init topology_init(void) · line 123
Quoted 10 lines
arch/riscv/kernel/setup.c +8
-0}subsys_initcall (topology_init); + +bool init_mem_is_free = false; + +void free_initmem (void ) +{ +free_initmem_default (POISON_FREE_INITMEM ); + init_mem_is_free = true; +}I'm a bit confused as to what you're trying to do here. Yesterday I got another version of this patch set that moves init data around, today a different one. Yesterday's is tested and simpler, and given it's so late in the process I'm inclined to take that as I don't want to break anything.
Right now I have
84814460eef9("riscv: Fixup bootup failure withHARDENED_USERCOPY")a78c6f5956a9("RISC-V: Make sure memblock reserves the memory containing DT")549738f15da0("Linux 5.9-rc8")Quoted 8 lines
Quoted 5 lines
Unless there's some functional bug, that's what I'm going to send out for 5.9 -- I'm not all that worried about lacking the ability to free init data. The above seems like fine 5.10 material.
Let me know if I'm missing something here.
84814460eef9could resolve the problem and Atish ask for any other idea? So It's another choice, I forgot RFC in prefix.
Quoted 5 lines
I prefer this fix as it is cleaner and doesn't waste memory. I have sent another series
on top of this fix, that addresses the init section protections we talked about. All of these are definitely
next merge window material.
Thanks, I'll take a look.
Quoted 10 lines
Quoted 10 lines
6184358da0004c8fd940afda6c0a0fa4027dc911("riscv: Fixup
static_obj()fail") is a sloppy patch that introduces another problem. Sorry about that.--
Best Regards
Guo Ren
Quoted 65 lines · On Wed, Oct 7, 2020 at 8:09 AM <[email protected]> wrote:
From: Guo Ren <[email protected]>
This reverts commit
6184358da0004c8fd940afda6c0a0fa4027dc911.It will cause bootup failure with
HARDENED_USERCOPY.As Aurelien has reported:
[ 3.484586] AppArmor: AppArmor sha1 policy hashing enabled [ 4.749835] Freeing unused kernel memory: 492K [ 4.752017] Run /init as init process [ 4.753571] usercopy: Kernel memory overwrite attempt detected to kernel text (offset 507879, size 11)! [ 4.754838] ------------[ cut here ]------------ [ 4.755651] kernel BUG at mm/usercopy.c:99! [ 4.756445] Kernel BUG [#1] [ 4.756815] Modules linked in: [ 4.757542] CPU: 1 PID: 1 Comm: swapper/0 Not tainted 5.8.0-1-riscv64 #1 Debian 5.8.7-1 [ 4.758372] epc: ffffffe0003b5120 ra : ffffffe0003b5120 sp : ffffffe07f783ca0 [ 4.758960] gp : ffffffe000cc7230 tp : ffffffe07f77cec0 t0 : ffffffe000cdafc0 [ 4.759772] t1 : 0000000000000064 t2 : 0000000000000000 s0 : ffffffe07f783cf0 [ 4.760534] s1 : ffffffe00095d780 a0 : 000000000000005b a1 : 0000000000000020 [ 4.761309] a2 : 0000000000000005 a3 : 0000000000000000 a4 : ffffffe000c1f340 [ 4.761848] a5 : ffffffe000c1f340 a6 : 0000000000000000 a7 : 0000000000000087 [ 4.762684] s2 : ffffffe000941848 s3 : 000000000007bfe7 s4 : 000000000000000b [ 4.763500] s5 : 0000000000000000 s6 : ffffffe00091cc00 s7 : fffffffffffff000 [ 4.764376] s8 : 0000003ffffff000 s9 : ffffffe0769f3200 s10: 000000000000000b [ 4.765208] s11: ffffffe07d548c40 t3 : 0000000000000000 t4 : 000000000001dcd0 [ 4.766059] t5 : ffffffe000cc8510 t6 : ffffffe000cd64aa [ 4.766712] status: 0000000000000120 badaddr: 0000000000000000 cause: 0000000000000003 [ 4.768308] ---[ end trace 1f8e733e834d4c3e ]--- [ 4.769129] Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b [ 4.770070] SMP: stopping secondary CPUs [ 4.771110] ---[ end Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b ]---Signed-off-by Guo Ren <[email protected]>Reported-by Aurelien Jarno <[email protected]>Cc Palmer Dabbelt <[email protected]>Cc Atish Patra <[email protected]>Cc Andreas Schwab <[email protected]>--- arch/riscv/kernel/vmlinux.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/riscv/kernel/vmlinux.lds.S +1
-2@@ -22,7 +22,6 @@ SECTIONS /* Beginning of code and text segment */ . = LOAD_OFFSET; _start = .; - _stext = .; HEAD_TEXT_SECTION . = ALIGN(PAGE_SIZE);@@ -55,6 +54,7 @@ SECTIONS . = ALIGN(SECTION_ALIGN); .text : { _text = .; + _stext = .; TEXT_TEXT SCHED_TEXT CPUIDLE_TEXT --
Quoted 2 lines
2.7.4
Signature · 2 lines
Regards, Atish