Skip to contentSkip to conversation

csky: use free_initmem_default() in free_initmem()

PATCH In review David Hildenbrand 4 participants 5 messages Jan 26, 2021 – Jan 27, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 csky: use free_initmem_default() in free_initmem()

The existing code is essentially free_initmem_default()->free_reserved_area() without poisoning.

Note that existing code missed to update the managed page count of the zone.

Cc Andrew Morton <[email protected]>
Cc Guo Ren <[email protected]>
Cc Mike Rapoport <[email protected]>
Cc Oscar Salvador <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Wei Yang <[email protected]>

---

Not compile tested as documentation on how to get
https://gitlab.com/c-sky/buildroot
running, especially with a custom kernel, is a bit sparse.

---
 arch/csky/mm/init.c | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)
arch/csky/mm/init.c +1 -16
index 81e4e5e78f38..894050a8ce09 100644
@@ -110,24 +110,9 @@ void __init mem_init(void)
 	mem_init_print_info(NULL);
 }
 
-extern char __init_begin[], __init_end[];
-
 void free_initmem(void)
 {
-	unsigned long addr;
-
-	addr = (unsigned long) &__init_begin;
-
-	while (addr < (unsigned long) &__init_end) {
-		ClearPageReserved(virt_to_page(addr));
-		init_page_count(virt_to_page(addr));
-		free_page(addr);
-		totalram_pages_inc();
-		addr += PAGE_SIZE;
-	}
-
-	pr_info("Freeing unused kernel memory: %dk freed\n",
-	((unsigned int)&__init_end - (unsigned int)&__init_begin) >> 10);
+	free_initmem_default(-1);
 }
 
 void pgd_init(unsigned long *p)
Signature · 1 line
2.29.2
#1 lore raw
Quoted 13 lines · David Hildenbrand

The existing code is essentially free_initmem_default()->free_reserved_area() without poisoning.

Note that existing code missed to update the managed page count of the zone.

Cc Andrew Morton <[email protected]>
Cc Guo Ren <[email protected]>
Cc Mike Rapoport <[email protected]>
Cc Oscar Salvador <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Wei Yang <[email protected]>
Quoted 5 lines

---

Not compile tested as documentation on how to get
https://gitlab.com/c-sky/buildroot
running, especially with a custom kernel, is a bit sparse.

You can pick a cross-compiler from here:

https://mirrors.edge.kernel.org/pub/tools/crosstool/

Quoted 37 lines
---
 arch/csky/mm/init.c | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)
arch/csky/mm/init.c +1 -16
index 81e4e5e78f38..894050a8ce09 100644
@@ -110,24 +110,9 @@ void __init mem_init(void)
 	mem_init_print_info(NULL);
 }
 
-extern char __init_begin[], __init_end[];
-
 void free_initmem(void)
 {
-	unsigned long addr;
-
-	addr = (unsigned long) &__init_begin;
-
-	while (addr < (unsigned long) &__init_end) {
-		ClearPageReserved(virt_to_page(addr));
-		init_page_count(virt_to_page(addr));
-		free_page(addr);
-		totalram_pages_inc();
-		addr += PAGE_SIZE;
-	}
-
-	pr_info("Freeing unused kernel memory: %dk freed\n",
-	((unsigned int)&__init_end - (unsigned int)&__init_begin) >> 10);
+	free_initmem_default(-1);
 }
 
 void pgd_init(unsigned long *p)
Signature · 1 line
2.29.2
Signature · 2 lines
Sincerely yours,
Mike.
maintainer
#2 lore raw

Thx Mike,

It's under test:
https://gitlab.com/c-sky/buildroot/-/pipelines/247353584

kernel:
https://github.com/c-sky/csky-linux/commit/9d986b01feb991ded3fb8c1f8153a0c80ea84b9c

Quoted 66 lines · Mike Rapoport
Quoted 13 lines · David Hildenbrand

The existing code is essentially free_initmem_default()->free_reserved_area() without poisoning.

Note that existing code missed to update the managed page count of the zone.

Cc Andrew Morton <[email protected]>
Cc Guo Ren <[email protected]>
Cc Mike Rapoport <[email protected]>
Cc Oscar Salvador <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Wei Yang <[email protected]>
Quoted 5 lines

---

Not compile tested as documentation on how to get
https://gitlab.com/c-sky/buildroot
running, especially with a custom kernel, is a bit sparse.

You can pick a cross-compiler from here:

https://mirrors.edge.kernel.org/pub/tools/crosstool/

Quoted 35 lines
---
 arch/csky/mm/init.c | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)
arch/csky/mm/init.c +1 -17
index 81e4e5e78f38..894050a8ce09 100644
@@ -110,24 +110,9 @@ void __init mem_init(void)
      mem_init_print_info(NULL);
 }
 
-extern char __init_begin[], __init_end[];
-
 void free_initmem(void)
 {
-     unsigned long addr;
-
-     addr = (unsigned long) &__init_begin;
-
-     while (addr < (unsigned long) &__init_end) {
-             ClearPageReserved(virt_to_page(addr));
-             init_page_count(virt_to_page(addr));
-             free_page(addr);
-             totalram_pages_inc();
-             addr += PAGE_SIZE;
-     }
-
-     pr_info("Freeing unused kernel memory: %dk freed\n",
-     ((unsigned int)&__init_end - (unsigned int)&__init_begin) >> 10);
+     free_initmem_default(-1);
 }
 
 void pgd_init(unsigned long *p)
--
Quoted 2 lines

2.29.2

--
Sincerely yours,
Mike.

Signature · 4 lines
Best Regards
 Guo Ren

ML: https://lore.kernel.org/linux-csky/
#3 lore raw
Quoted 2 lines · Guo Ren

Thx Mike,

Thanks for triggering a build/test! I'd be curious if there is an easy way to trigger this myself (I assume, fork csky buildroot on gitlab, reroute CSKY kernel repo, adjust CSKY_LINUX_NEXT_VERSION); if so, it would be worth documenting - thanks!

Thanks Mike for the valuable links :) For now I was only relying on cross-compilers as shipped by Fedora, now I can upgrade my cross-build environment :)

Quoted 6 lines

It's under test:
https://gitlab.com/c-sky/buildroot/-/pipelines/247353584

kernel:
https://github.com/c-sky/csky-linux/commit/9d986b01feb991ded3fb8c1f8153a0c80ea84b9c

Signature · 3 lines
Thanks,

David / dhildenb
#4 lore raw

Hi David,

Quoted 7 lines · 在 2021年1月27日,下午4:49,David Hildenbrand <[email protected]> 写道:
Quoted 1 line · Guo Ren

Thx Mike,

Thanks for triggering a build/test! I'd be curious if there is an easy way to trigger this myself (I assume, fork csky buildroot on gitlab, reroute CSKY kernel repo, adjust CSKY_LINUX_NEXT_VERSION); if so, it would be worth documenting - thanks!

1. You can just simple fork our project, and enable your gitlab share-runner.
2. Modify https://gitlab.com/c-sky/buildroot/-/blob/master/package/csky-arch/csky-arch.mk
Line 28: CSKY_ARCH_SITE = $(call github,c-sky,csky-linux,$(CSKY_ARCH_VERSION)) to your own forked our kernel repo
Line 49: CSKY_LINUX_NEXT_VERSION = f0bbf052ae463b3802f1c7ba36b36da2f54945f2 change the version as you want

You also need to remove some unused entries in .gitlab.yml.

Quoted 12 lines

Thanks Mike for the valuable links :) For now I was only relying on cross-compilers as shipped by Fedora, now I can upgrade my cross-build environment :)

Quoted 4 lines

It's under test:
https://gitlab.com/c-sky/buildroot/-/pipelines/247353584
kernel:
https://github.com/c-sky/csky-linux/commit/9d986b01feb991ded3fb8c1f8153a0c80ea84b9c

Signature · 3 lines
Thanks,

David / dhildenb

Best Regards
Guo Ren