| Message ID | 1569657746-31672-1-git-send-email-rppt@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 899ee4afe5eb262236717188ccdaa0192c00dc5a |
| Headers | show |
| Series | [v4] arm64: use generic free_initrd_mem() | expand |
On 09/28/2019 01:32 PM, Mike Rapoport wrote: > From: Mike Rapoport <rppt@linux.ibm.com> > > arm64 calls memblock_free() for the initrd area in its implementation of > free_initrd_mem(), but this call has no actual effect that late in the boot > process. By the time initrd is freed, all the reserved memory is managed by > the page allocator and the memblock.reserved is unused, so the only purpose > of the memblock_free() call is to keep track of initrd memory for debugging > and accounting. Thats correct. memblock_free_all() gets called before free_initrd_mem(). > > Without the memblock_free() call the only difference between arm64 and the > generic versions of free_initrd_mem() is the memory poisoning. > > Move memblock_free() call to the generic code, enable it there > for the architectures that define ARCH_KEEP_MEMBLOCK and use the generic > implementation of free_initrd_mem() on arm64. This improves free_initrd_mem() generic implementation for others to use. > > Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> Tested-by: Anshuman Khandual <anshuman.khandual@arm.com> #arm64 Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com> > --- > > v4: > * memblock_free() aligned area around the initrd > > v3: > * fix powerpc build > > v2: > * add memblock_free() to the generic free_initrd_mem() > * rebase on the current upstream > > > arch/arm64/mm/init.c | 12 ------------ > init/initramfs.c | 8 ++++++++ > 2 files changed, 8 insertions(+), 12 deletions(-) > > diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c > index 45c00a5..87a0e3b 100644 > --- a/arch/arm64/mm/init.c > +++ b/arch/arm64/mm/init.c > @@ -580,18 +580,6 @@ void free_initmem(void) > unmap_kernel_range((u64)__init_begin, (u64)(__init_end - __init_begin)); > } > > -#ifdef CONFIG_BLK_DEV_INITRD > -void __init free_initrd_mem(unsigned long start, unsigned long end) > -{ > - unsigned long aligned_start, aligned_end; > - > - aligned_start = __virt_to_phys(start) & PAGE_MASK; > - aligned_end = PAGE_ALIGN(__virt_to_phys(end)); > - memblock_free(aligned_start, aligned_end - aligned_start); > - free_reserved_area((void *)start, (void *)end, 0, "initrd"); > -} > -#endif > - > /* > * Dump out memory limit information on panic. > */ > diff --git a/init/initramfs.c b/init/initramfs.c > index c47dad0..8ec1be4 100644 > --- a/init/initramfs.c > +++ b/init/initramfs.c > @@ -10,6 +10,7 @@ > #include <linux/syscalls.h> > #include <linux/utime.h> > #include <linux/file.h> > +#include <linux/memblock.h> > > static ssize_t __init xwrite(int fd, const char *p, size_t count) > { > @@ -529,6 +530,13 @@ extern unsigned long __initramfs_size; > > void __weak free_initrd_mem(unsigned long start, unsigned long end) > { > +#ifdef CONFIG_ARCH_KEEP_MEMBLOCK > + unsigned long aligned_start = ALIGN_DOWN(start, PAGE_SIZE); > + unsigned long aligned_end = ALIGN(end, PAGE_SIZE); > + > + memblock_free(__pa(aligned_start), aligned_end - aligned_start); > +#endif > + > free_reserved_area((void *)start, (void *)end, POISON_FREE_INITMEM, > "initrd"); > } >
On Sat, Sep 28, 2019 at 11:02:26AM +0300, Mike Rapoport wrote: > From: Mike Rapoport <rppt@linux.ibm.com> > > arm64 calls memblock_free() for the initrd area in its implementation of > free_initrd_mem(), but this call has no actual effect that late in the boot > process. By the time initrd is freed, all the reserved memory is managed by > the page allocator and the memblock.reserved is unused, so the only purpose > of the memblock_free() call is to keep track of initrd memory for debugging > and accounting. > > Without the memblock_free() call the only difference between arm64 and the > generic versions of free_initrd_mem() is the memory poisoning. > > Move memblock_free() call to the generic code, enable it there > for the architectures that define ARCH_KEEP_MEMBLOCK and use the generic > implementation of free_initrd_mem() on arm64. > > Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> > --- > > v4: > * memblock_free() aligned area around the initrd Looks straightforward to me: Acked-by: Will Deacon <will@kernel.org> Will
On October 15, 2019 2:46:59 AM GMT+02:00, Will Deacon <will@kernel.org> wrote: >On Sat, Sep 28, 2019 at 11:02:26AM +0300, Mike Rapoport wrote: >> From: Mike Rapoport <rppt@linux.ibm.com> >> >> arm64 calls memblock_free() for the initrd area in its implementation >of >> free_initrd_mem(), but this call has no actual effect that late in >the boot >> process. By the time initrd is freed, all the reserved memory is >managed by >> the page allocator and the memblock.reserved is unused, so the only >purpose >> of the memblock_free() call is to keep track of initrd memory for >debugging >> and accounting. >> >> Without the memblock_free() call the only difference between arm64 >and the >> generic versions of free_initrd_mem() is the memory poisoning. >> >> Move memblock_free() call to the generic code, enable it there >> for the architectures that define ARCH_KEEP_MEMBLOCK and use the >generic >> implementation of free_initrd_mem() on arm64. >> >> Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> >> --- >> >> v4: >> * memblock_free() aligned area around the initrd > >Looks straightforward to me: > >Acked-by: Will Deacon <will@kernel.org> Can it go via arm64 tree? >Will
On Tue, Oct 15, 2019 at 09:39:41AM +0200, Mike Rapoport wrote: > On October 15, 2019 2:46:59 AM GMT+02:00, Will Deacon <will@kernel.org> wrote: > >On Sat, Sep 28, 2019 at 11:02:26AM +0300, Mike Rapoport wrote: > >> From: Mike Rapoport <rppt@linux.ibm.com> > >> > >> arm64 calls memblock_free() for the initrd area in its implementation > >of > >> free_initrd_mem(), but this call has no actual effect that late in > >the boot > >> process. By the time initrd is freed, all the reserved memory is > >managed by > >> the page allocator and the memblock.reserved is unused, so the only > >purpose > >> of the memblock_free() call is to keep track of initrd memory for > >debugging > >> and accounting. > >> > >> Without the memblock_free() call the only difference between arm64 > >and the > >> generic versions of free_initrd_mem() is the memory poisoning. > >> > >> Move memblock_free() call to the generic code, enable it there > >> for the architectures that define ARCH_KEEP_MEMBLOCK and use the > >generic > >> implementation of free_initrd_mem() on arm64. > >> > >> Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> > >> --- > >> > >> v4: > >> * memblock_free() aligned area around the initrd > > > >Looks straightforward to me: > > > >Acked-by: Will Deacon <will@kernel.org> > > Can it go via arm64 tree? Yes, I was hoping Catalin would pick it up for 5.5. Will
On Sat, Sep 28, 2019 at 11:02:26AM +0300, Mike Rapoport wrote: > From: Mike Rapoport <rppt@linux.ibm.com> > > arm64 calls memblock_free() for the initrd area in its implementation of > free_initrd_mem(), but this call has no actual effect that late in the boot > process. By the time initrd is freed, all the reserved memory is managed by > the page allocator and the memblock.reserved is unused, so the only purpose > of the memblock_free() call is to keep track of initrd memory for debugging > and accounting. > > Without the memblock_free() call the only difference between arm64 and the > generic versions of free_initrd_mem() is the memory poisoning. > > Move memblock_free() call to the generic code, enable it there > for the architectures that define ARCH_KEEP_MEMBLOCK and use the generic > implementation of free_initrd_mem() on arm64. > > Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> Queued for 5.5. Thanks.
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 45c00a5..87a0e3b 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -580,18 +580,6 @@ void free_initmem(void) unmap_kernel_range((u64)__init_begin, (u64)(__init_end - __init_begin)); } -#ifdef CONFIG_BLK_DEV_INITRD -void __init free_initrd_mem(unsigned long start, unsigned long end) -{ - unsigned long aligned_start, aligned_end; - - aligned_start = __virt_to_phys(start) & PAGE_MASK; - aligned_end = PAGE_ALIGN(__virt_to_phys(end)); - memblock_free(aligned_start, aligned_end - aligned_start); - free_reserved_area((void *)start, (void *)end, 0, "initrd"); -} -#endif - /* * Dump out memory limit information on panic. */ diff --git a/init/initramfs.c b/init/initramfs.c index c47dad0..8ec1be4 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -10,6 +10,7 @@ #include <linux/syscalls.h> #include <linux/utime.h> #include <linux/file.h> +#include <linux/memblock.h> static ssize_t __init xwrite(int fd, const char *p, size_t count) { @@ -529,6 +530,13 @@ extern unsigned long __initramfs_size; void __weak free_initrd_mem(unsigned long start, unsigned long end) { +#ifdef CONFIG_ARCH_KEEP_MEMBLOCK + unsigned long aligned_start = ALIGN_DOWN(start, PAGE_SIZE); + unsigned long aligned_end = ALIGN(end, PAGE_SIZE); + + memblock_free(__pa(aligned_start), aligned_end - aligned_start); +#endif + free_reserved_area((void *)start, (void *)end, POISON_FREE_INITMEM, "initrd"); }