| Message ID | 20210401002551.0ddbacf9@xhacker |
|---|---|
| State | New |
| Headers | show |
| Series | riscv: improve self-protection | expand |
On Wed, Mar 31, 2021 at 10:01 PM Jisheng Zhang <jszhang3@mail.ustc.edu.cn> wrote: > > From: Jisheng Zhang <jszhang@kernel.org> > > All of these are never modified after init, so they can be > __ro_after_init. > > Signed-off-by: Jisheng Zhang <jszhang@kernel.org> Looks good to me. Reviewed-by: Anup Patel <anup@brainfault.org> Regards, Anup > --- > arch/riscv/kernel/sbi.c | 8 ++++---- > arch/riscv/kernel/smp.c | 4 ++-- > arch/riscv/kernel/time.c | 2 +- > arch/riscv/kernel/vdso.c | 4 ++-- > arch/riscv/mm/init.c | 6 +++--- > 5 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/arch/riscv/kernel/sbi.c b/arch/riscv/kernel/sbi.c > index d3bf756321a5..cbd94a72eaa7 100644 > --- a/arch/riscv/kernel/sbi.c > +++ b/arch/riscv/kernel/sbi.c > @@ -11,14 +11,14 @@ > #include <asm/smp.h> > > /* default SBI version is 0.1 */ > -unsigned long sbi_spec_version = SBI_SPEC_VERSION_DEFAULT; > +unsigned long sbi_spec_version __ro_after_init = SBI_SPEC_VERSION_DEFAULT; > EXPORT_SYMBOL(sbi_spec_version); > > -static void (*__sbi_set_timer)(uint64_t stime); > -static int (*__sbi_send_ipi)(const unsigned long *hart_mask); > +static void (*__sbi_set_timer)(uint64_t stime) __ro_after_init; > +static int (*__sbi_send_ipi)(const unsigned long *hart_mask) __ro_after_init; > static int (*__sbi_rfence)(int fid, const unsigned long *hart_mask, > unsigned long start, unsigned long size, > - unsigned long arg4, unsigned long arg5); > + unsigned long arg4, unsigned long arg5) __ro_after_init; > > struct sbiret sbi_ecall(int ext, int fid, unsigned long arg0, > unsigned long arg1, unsigned long arg2, > diff --git a/arch/riscv/kernel/smp.c b/arch/riscv/kernel/smp.c > index ea028d9e0d24..504284d49135 100644 > --- a/arch/riscv/kernel/smp.c > +++ b/arch/riscv/kernel/smp.c > @@ -30,7 +30,7 @@ enum ipi_message_type { > IPI_MAX > }; > > -unsigned long __cpuid_to_hartid_map[NR_CPUS] = { > +unsigned long __cpuid_to_hartid_map[NR_CPUS] __ro_after_init = { > [0 ... NR_CPUS-1] = INVALID_HARTID > }; > > @@ -85,7 +85,7 @@ static void ipi_stop(void) > wait_for_interrupt(); > } > > -static struct riscv_ipi_ops *ipi_ops; > +static struct riscv_ipi_ops *ipi_ops __ro_after_init; > > void riscv_set_ipi_ops(struct riscv_ipi_ops *ops) > { > diff --git a/arch/riscv/kernel/time.c b/arch/riscv/kernel/time.c > index 1b432264f7ef..8217b0f67c6c 100644 > --- a/arch/riscv/kernel/time.c > +++ b/arch/riscv/kernel/time.c > @@ -11,7 +11,7 @@ > #include <asm/processor.h> > #include <asm/timex.h> > > -unsigned long riscv_timebase; > +unsigned long riscv_timebase __ro_after_init; > EXPORT_SYMBOL_GPL(riscv_timebase); > > void __init time_init(void) > diff --git a/arch/riscv/kernel/vdso.c b/arch/riscv/kernel/vdso.c > index 3f1d35e7c98a..25a3b8849599 100644 > --- a/arch/riscv/kernel/vdso.c > +++ b/arch/riscv/kernel/vdso.c > @@ -20,8 +20,8 @@ > > extern char vdso_start[], vdso_end[]; > > -static unsigned int vdso_pages; > -static struct page **vdso_pagelist; > +static unsigned int vdso_pages __ro_after_init; > +static struct page **vdso_pagelist __ro_after_init; > > /* > * The vDSO data page. > diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c > index 76bf2de8aa59..719ec72ef069 100644 > --- a/arch/riscv/mm/init.c > +++ b/arch/riscv/mm/init.c > @@ -149,11 +149,11 @@ void __init setup_bootmem(void) > } > > #ifdef CONFIG_MMU > -static struct pt_alloc_ops pt_ops; > +static struct pt_alloc_ops pt_ops __ro_after_init; > > -unsigned long va_pa_offset; > +unsigned long va_pa_offset __ro_after_init; > EXPORT_SYMBOL(va_pa_offset); > -unsigned long pfn_base; > +unsigned long pfn_base __ro_after_init; > EXPORT_SYMBOL(pfn_base); > > pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_bss; > -- > 2.31.0 > > > > _______________________________________________ > linux-riscv mailing list > linux-riscv@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-riscv
diff --git a/arch/riscv/kernel/sbi.c b/arch/riscv/kernel/sbi.c index d3bf756321a5..cbd94a72eaa7 100644 --- a/arch/riscv/kernel/sbi.c +++ b/arch/riscv/kernel/sbi.c @@ -11,14 +11,14 @@ #include <asm/smp.h> /* default SBI version is 0.1 */ -unsigned long sbi_spec_version = SBI_SPEC_VERSION_DEFAULT; +unsigned long sbi_spec_version __ro_after_init = SBI_SPEC_VERSION_DEFAULT; EXPORT_SYMBOL(sbi_spec_version); -static void (*__sbi_set_timer)(uint64_t stime); -static int (*__sbi_send_ipi)(const unsigned long *hart_mask); +static void (*__sbi_set_timer)(uint64_t stime) __ro_after_init; +static int (*__sbi_send_ipi)(const unsigned long *hart_mask) __ro_after_init; static int (*__sbi_rfence)(int fid, const unsigned long *hart_mask, unsigned long start, unsigned long size, - unsigned long arg4, unsigned long arg5); + unsigned long arg4, unsigned long arg5) __ro_after_init; struct sbiret sbi_ecall(int ext, int fid, unsigned long arg0, unsigned long arg1, unsigned long arg2, diff --git a/arch/riscv/kernel/smp.c b/arch/riscv/kernel/smp.c index ea028d9e0d24..504284d49135 100644 --- a/arch/riscv/kernel/smp.c +++ b/arch/riscv/kernel/smp.c @@ -30,7 +30,7 @@ enum ipi_message_type { IPI_MAX }; -unsigned long __cpuid_to_hartid_map[NR_CPUS] = { +unsigned long __cpuid_to_hartid_map[NR_CPUS] __ro_after_init = { [0 ... NR_CPUS-1] = INVALID_HARTID }; @@ -85,7 +85,7 @@ static void ipi_stop(void) wait_for_interrupt(); } -static struct riscv_ipi_ops *ipi_ops; +static struct riscv_ipi_ops *ipi_ops __ro_after_init; void riscv_set_ipi_ops(struct riscv_ipi_ops *ops) { diff --git a/arch/riscv/kernel/time.c b/arch/riscv/kernel/time.c index 1b432264f7ef..8217b0f67c6c 100644 --- a/arch/riscv/kernel/time.c +++ b/arch/riscv/kernel/time.c @@ -11,7 +11,7 @@ #include <asm/processor.h> #include <asm/timex.h> -unsigned long riscv_timebase; +unsigned long riscv_timebase __ro_after_init; EXPORT_SYMBOL_GPL(riscv_timebase); void __init time_init(void) diff --git a/arch/riscv/kernel/vdso.c b/arch/riscv/kernel/vdso.c index 3f1d35e7c98a..25a3b8849599 100644 --- a/arch/riscv/kernel/vdso.c +++ b/arch/riscv/kernel/vdso.c @@ -20,8 +20,8 @@ extern char vdso_start[], vdso_end[]; -static unsigned int vdso_pages; -static struct page **vdso_pagelist; +static unsigned int vdso_pages __ro_after_init; +static struct page **vdso_pagelist __ro_after_init; /* * The vDSO data page. diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 76bf2de8aa59..719ec72ef069 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -149,11 +149,11 @@ void __init setup_bootmem(void) } #ifdef CONFIG_MMU -static struct pt_alloc_ops pt_ops; +static struct pt_alloc_ops pt_ops __ro_after_init; -unsigned long va_pa_offset; +unsigned long va_pa_offset __ro_after_init; EXPORT_SYMBOL(va_pa_offset); -unsigned long pfn_base; +unsigned long pfn_base __ro_after_init; EXPORT_SYMBOL(pfn_base); pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_bss;