| Message ID | 1470988871-2799-5-git-send-email-jszhang@marvell.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, There are still a few missing includes as of this patch, and I have a small nit about one file as commented below. Please fix up the includes. On Fri, Aug 12, 2016 at 04:01:11PM +0800, Jisheng Zhang wrote: > diff --git a/arch/arm64/kernel/cpu_ops.c b/arch/arm64/kernel/cpu_ops.c > index c7cfb8f..6d32d1a 100644 > --- a/arch/arm64/kernel/cpu_ops.c > +++ b/arch/arm64/kernel/cpu_ops.c > @@ -28,7 +28,7 @@ extern const struct cpu_operations smp_spin_table_ops; > extern const struct cpu_operations acpi_parking_protocol_ops; > extern const struct cpu_operations cpu_psci_ops; > > -const struct cpu_operations *cpu_ops[NR_CPUS]; > +const struct cpu_operations *cpu_ops[NR_CPUS] __ro_after_init; This file is missing a <linux/cache.h> include for __ro_after_init. > static const struct cpu_operations *dt_supported_cpu_ops[] __initconst = { > &smp_spin_table_ops, > diff --git a/arch/arm64/kernel/kaslr.c b/arch/arm64/kernel/kaslr.c > index 8ebabc4..93c47e1 100644 > --- a/arch/arm64/kernel/kaslr.c > +++ b/arch/arm64/kernel/kaslr.c > @@ -20,7 +20,7 @@ > #include <asm/pgtable.h> > #include <asm/sections.h> > > -u64 module_alloc_base __read_mostly; > +u64 module_alloc_base __ro_after_init; Likewise. > u16 memstart_offset_seed __initdata; > > static __init u64 get_kaslr_seed(void *fdt) > diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c > index 10ad8ab..c1ff7c2 100644 > --- a/arch/arm64/kernel/vdso.c > +++ b/arch/arm64/kernel/vdso.c > @@ -19,6 +19,7 @@ > */ > > #include <linux/kernel.h> > +#include <linux/cache.h> > #include <linux/clocksource.h> > #include <linux/elf.h> > #include <linux/err.h> Nit: Could you please sort this list? Everything but <linux/kernel.h> is already in order. > diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c > index c4284c4..59d44e7 100644 > --- a/arch/arm64/mm/dma-mapping.c > +++ b/arch/arm64/mm/dma-mapping.c > @@ -30,7 +30,7 @@ > > #include <asm/cacheflush.h> > > -static int swiotlb __read_mostly; > +static int swiotlb __ro_after_init; This file is missing a <linux/cache.h> include for __ro_after_init. > > static pgprot_t __get_dma_pgprot(unsigned long attrs, pgprot_t prot, > bool coherent) > diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c > index bbb7ee7..e8b81ea 100644 > --- a/arch/arm64/mm/init.c > +++ b/arch/arm64/mm/init.c > @@ -55,8 +55,8 @@ > * executes, which assigns it its actual value. So use a default value > * that cannot be mistaken for a real physical address. > */ > -s64 memstart_addr __read_mostly = -1; > -phys_addr_t arm64_dma_phys_limit __read_mostly; > +s64 memstart_addr __ro_after_init = -1; > +phys_addr_t arm64_dma_phys_limit __ro_after_init; Likewise. > #ifdef CONFIG_BLK_DEV_INITRD > static int __init early_initrd(char *p) > diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c > index 4989948..6029bed 100644 > --- a/arch/arm64/mm/mmu.c > +++ b/arch/arm64/mm/mmu.c > @@ -46,7 +46,7 @@ > > u64 idmap_t0sz = TCR_T0SZ(VA_BITS); > > -u64 kimage_voffset __read_mostly; > +u64 kimage_voffset __ro_after_init; Likewise. Thanks, Mark.
Hi Mark, On Fri, 12 Aug 2016 13:43:45 +0100 Mark Rutland wrote: > Hi, > > There are still a few missing includes as of this patch, and I have a > small nit about one file as commented below. > > Please fix up the includes. > > On Fri, Aug 12, 2016 at 04:01:11PM +0800, Jisheng Zhang wrote: > > diff --git a/arch/arm64/kernel/cpu_ops.c b/arch/arm64/kernel/cpu_ops.c > > index c7cfb8f..6d32d1a 100644 > > --- a/arch/arm64/kernel/cpu_ops.c > > +++ b/arch/arm64/kernel/cpu_ops.c > > @@ -28,7 +28,7 @@ extern const struct cpu_operations smp_spin_table_ops; > > extern const struct cpu_operations acpi_parking_protocol_ops; > > extern const struct cpu_operations cpu_psci_ops; > > > > -const struct cpu_operations *cpu_ops[NR_CPUS]; > > +const struct cpu_operations *cpu_ops[NR_CPUS] __ro_after_init; > > This file is missing a <linux/cache.h> include for __ro_after_init. > > > static const struct cpu_operations *dt_supported_cpu_ops[] __initconst = { > > &smp_spin_table_ops, > > diff --git a/arch/arm64/kernel/kaslr.c b/arch/arm64/kernel/kaslr.c > > index 8ebabc4..93c47e1 100644 > > --- a/arch/arm64/kernel/kaslr.c > > +++ b/arch/arm64/kernel/kaslr.c > > @@ -20,7 +20,7 @@ > > #include <asm/pgtable.h> > > #include <asm/sections.h> > > > > -u64 module_alloc_base __read_mostly; > > +u64 module_alloc_base __ro_after_init; > > Likewise. > > > u16 memstart_offset_seed __initdata; > > > > static __init u64 get_kaslr_seed(void *fdt) > > diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c > > index 10ad8ab..c1ff7c2 100644 > > --- a/arch/arm64/kernel/vdso.c > > +++ b/arch/arm64/kernel/vdso.c > > @@ -19,6 +19,7 @@ > > */ > > > > #include <linux/kernel.h> > > +#include <linux/cache.h> > > #include <linux/clocksource.h> > > #include <linux/elf.h> > > #include <linux/err.h> > > Nit: Could you please sort this list? Everything but <linux/kernel.h> is > already in order. > > > diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c > > index c4284c4..59d44e7 100644 > > --- a/arch/arm64/mm/dma-mapping.c > > +++ b/arch/arm64/mm/dma-mapping.c > > @@ -30,7 +30,7 @@ > > > > #include <asm/cacheflush.h> > > > > -static int swiotlb __read_mostly; > > +static int swiotlb __ro_after_init; > > This file is missing a <linux/cache.h> include for __ro_after_init. > > > > > static pgprot_t __get_dma_pgprot(unsigned long attrs, pgprot_t prot, > > bool coherent) > > diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c > > index bbb7ee7..e8b81ea 100644 > > --- a/arch/arm64/mm/init.c > > +++ b/arch/arm64/mm/init.c > > @@ -55,8 +55,8 @@ > > * executes, which assigns it its actual value. So use a default value > > * that cannot be mistaken for a real physical address. > > */ > > -s64 memstart_addr __read_mostly = -1; > > -phys_addr_t arm64_dma_phys_limit __read_mostly; > > +s64 memstart_addr __ro_after_init = -1; > > +phys_addr_t arm64_dma_phys_limit __ro_after_init; > > Likewise. > > > #ifdef CONFIG_BLK_DEV_INITRD > > static int __init early_initrd(char *p) > > diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c > > index 4989948..6029bed 100644 > > --- a/arch/arm64/mm/mmu.c > > +++ b/arch/arm64/mm/mmu.c > > @@ -46,7 +46,7 @@ > > > > u64 idmap_t0sz = TCR_T0SZ(VA_BITS); > > > > -u64 kimage_voffset __read_mostly; > > +u64 kimage_voffset __ro_after_init; > > Likewise. > Thanks a lot, all comments are addressed in v4. the headers in vdso.c is sorted now. However, the headers in mmu.c, dma-mapping.c, init.c aren't, for I dunno whether it's acceptable to do so. Or we could add one separate patch to make them sorted before applying __ro_after_init Thanks, Jisheng
Hi, On Mon, Aug 15, 2016 at 02:53:03PM +0800, Jisheng Zhang wrote: > On Fri, 12 Aug 2016 13:43:45 +0100 Mark Rutland wrote: > > On Fri, Aug 12, 2016 at 04:01:11PM +0800, Jisheng Zhang wrote: > > > diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c > > > index 10ad8ab..c1ff7c2 100644 > > > --- a/arch/arm64/kernel/vdso.c > > > +++ b/arch/arm64/kernel/vdso.c > > > @@ -19,6 +19,7 @@ > > > */ > > > > > > #include <linux/kernel.h> > > > +#include <linux/cache.h> > > > #include <linux/clocksource.h> > > > #include <linux/elf.h> > > > #include <linux/err.h> > > > > Nit: Could you please sort this list? Everything but <linux/kernel.h> is > > already in order. [...] > Thanks a lot, all comments are addressed in v4. > > the headers in vdso.c is sorted now. However, the headers in mmu.c, > dma-mapping.c, init.c aren't, for I dunno whether it's acceptable > to do so. Or we could add one separate patch to make them sorted before > applying __ro_after_init Ah. Given that's a little messy, it's probably not worthwhile sorting them. Further, feel free to not bother sorting the vdso.c includes. Thanks, Mark.
diff --git a/arch/arm64/kernel/cpu_ops.c b/arch/arm64/kernel/cpu_ops.c index c7cfb8f..6d32d1a 100644 --- a/arch/arm64/kernel/cpu_ops.c +++ b/arch/arm64/kernel/cpu_ops.c @@ -28,7 +28,7 @@ extern const struct cpu_operations smp_spin_table_ops; extern const struct cpu_operations acpi_parking_protocol_ops; extern const struct cpu_operations cpu_psci_ops; -const struct cpu_operations *cpu_ops[NR_CPUS]; +const struct cpu_operations *cpu_ops[NR_CPUS] __ro_after_init; static const struct cpu_operations *dt_supported_cpu_ops[] __initconst = { &smp_spin_table_ops, diff --git a/arch/arm64/kernel/kaslr.c b/arch/arm64/kernel/kaslr.c index 8ebabc4..93c47e1 100644 --- a/arch/arm64/kernel/kaslr.c +++ b/arch/arm64/kernel/kaslr.c @@ -20,7 +20,7 @@ #include <asm/pgtable.h> #include <asm/sections.h> -u64 module_alloc_base __read_mostly; +u64 module_alloc_base __ro_after_init; u16 memstart_offset_seed __initdata; static __init u64 get_kaslr_seed(void *fdt) diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c index 10ad8ab..c1ff7c2 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -19,6 +19,7 @@ */ #include <linux/kernel.h> +#include <linux/cache.h> #include <linux/clocksource.h> #include <linux/elf.h> #include <linux/err.h> @@ -37,8 +38,7 @@ #include <asm/vdso_datapage.h> extern char vdso_start, vdso_end; -static unsigned long vdso_pages; -static struct page **vdso_pagelist; +static unsigned long vdso_pages __ro_after_init; /* * The vDSO data page. @@ -53,7 +53,7 @@ struct vdso_data *vdso_data = &vdso_data_store.data; /* * Create and map the vectors page for AArch32 tasks. */ -static struct page *vectors_page[1]; +static struct page *vectors_page[1] __ro_after_init; static int __init alloc_vectors_page(void) { @@ -110,11 +110,19 @@ int aarch32_setup_vectors_page(struct linux_binprm *bprm, int uses_interp) } #endif /* CONFIG_COMPAT */ -static struct vm_special_mapping vdso_spec[2]; +static struct vm_special_mapping vdso_spec[2] __ro_after_init = { + { + .name = "[vvar]", + }, + { + .name = "[vdso]", + }, +}; static int __init vdso_init(void) { int i; + struct page **vdso_pagelist; if (memcmp(&vdso_start, "\177ELF", 4)) { pr_err("vDSO is not a valid ELF object!\n"); @@ -138,16 +146,8 @@ static int __init vdso_init(void) for (i = 0; i < vdso_pages; i++) vdso_pagelist[i + 1] = pfn_to_page(PHYS_PFN(__pa(&vdso_start)) + i); - /* Populate the special mapping structures */ - vdso_spec[0] = (struct vm_special_mapping) { - .name = "[vvar]", - .pages = vdso_pagelist, - }; - - vdso_spec[1] = (struct vm_special_mapping) { - .name = "[vdso]", - .pages = &vdso_pagelist[1], - }; + vdso_spec[0].pages = &vdso_pagelist[0]; + vdso_spec[1].pages = &vdso_pagelist[1]; return 0; } diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index c4284c4..59d44e7 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -30,7 +30,7 @@ #include <asm/cacheflush.h> -static int swiotlb __read_mostly; +static int swiotlb __ro_after_init; static pgprot_t __get_dma_pgprot(unsigned long attrs, pgprot_t prot, bool coherent) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index bbb7ee7..e8b81ea 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -55,8 +55,8 @@ * executes, which assigns it its actual value. So use a default value * that cannot be mistaken for a real physical address. */ -s64 memstart_addr __read_mostly = -1; -phys_addr_t arm64_dma_phys_limit __read_mostly; +s64 memstart_addr __ro_after_init = -1; +phys_addr_t arm64_dma_phys_limit __ro_after_init; #ifdef CONFIG_BLK_DEV_INITRD static int __init early_initrd(char *p) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 4989948..6029bed 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -46,7 +46,7 @@ u64 idmap_t0sz = TCR_T0SZ(VA_BITS); -u64 kimage_voffset __read_mostly; +u64 kimage_voffset __ro_after_init; EXPORT_SYMBOL(kimage_voffset); /*
These objects are set during initialization, thereafter are read only. Previously I only want to mark vdso_pages, vdso_spec, vectors_page and cpu_ops as __read_mostly from performance point of view. Then inspired by Kees's patch[1] to apply more __ro_after_init for arm, I think it's better to mark them as __ro_after_init. What's more, I find some more objects are also read only after init. So apply __ro_after_init to all of them. This patch also removes global vdso_pagelist and tries to clean up vdso_spec[] assignment code. [1] http://www.spinics.net/lists/arm-kernel/msg523188.html Signed-off-by: Jisheng Zhang <jszhang@marvell.com> --- arch/arm64/kernel/cpu_ops.c | 2 +- arch/arm64/kernel/kaslr.c | 2 +- arch/arm64/kernel/vdso.c | 28 ++++++++++++++-------------- arch/arm64/mm/dma-mapping.c | 2 +- arch/arm64/mm/init.c | 4 ++-- arch/arm64/mm/mmu.c | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-)