Clean up the bootmem allocator
PATCH 1/1 Clean up the bootmem allocator
This patch does _only_ some cleanup in the bootmem allocator by:
- following the kernel coding style conventions
- using pfn/page conversion macros
- removing some not needed parentheses
- removing some useless included headers
- limiting to 80 column width
It also removes __init tags in the header file and hopefully make it easier to read.
--- include/linux/bootmem.h | 101 ++++++++++++++---------- mm/bootmem.c | 195 ++++++++++++++++++++++++++--------------------- 2 files changed, 167 insertions(+), 129 deletions(-)
include/linux/bootmem.h +60 -41
@@ -41,45 +41,64 @@ typedef struct bootmem_data {struct list_head list; } bootmem_data_t; -extern unsigned long __init bootmem_bootmap_pages (unsigned long ); -extern unsigned long __init init_bootmem (unsigned long addr,unsigned long memend); -extern void __init free_bootmem (unsigned long addr,unsigned long size); -extern void *__init __alloc_bootmem (unsigned long size,unsigned long align,unsigned long goal); -extern void *__init __alloc_bootmem_nopanic (unsigned long size,unsigned long align,unsigned long goal); -extern void *__init __alloc_bootmem_low (unsigned long size, -unsigned long align, -unsigned long goal); -extern void *__init __alloc_bootmem_low_node (pg_data_t *pgdat, -unsigned long size, -unsigned long align, -unsigned long goal); -extern void *__init __alloc_bootmem_core (struct bootmem_data *bdata, -unsigned long size,unsigned long align,unsigned long goal, -unsigned long limit); +extern unsigned long bootmem_bootmap_pages (unsigned long ); +extern unsigned long init_bootmem (unsigned long addr,unsigned long memend); +extern void free_bootmem (unsigned long addr,unsigned long size); +extern void *__alloc_bootmem (unsigned long size, +unsigned long align, +unsigned long goal); +extern void *__alloc_bootmem_nopanic (unsigned long size, +unsigned long align, +unsigned long goal); +extern void *__alloc_bootmem_low (unsigned long size, +unsigned long align, +unsigned long goal); +extern void *__alloc_bootmem_low_node (pg_data_t *pgdat, +unsigned long size, +unsigned long align, +unsigned long goal); +extern void *__alloc_bootmem_core (struct bootmem_data *bdata, +unsigned long size, +unsigned long align, +unsigned long goal, +unsigned long limit); +#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE -extern void __init reserve_bootmem (unsigned long addr,unsigned long size); +extern void reserve_bootmem (unsigned long addr,unsigned long size);#define alloc_bootmem (x) \ - __alloc_bootmem((x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)) + __alloc_bootmem(x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))#define alloc_bootmem_low (x) \ - __alloc_bootmem_low((x), SMP_CACHE_BYTES, 0) + __alloc_bootmem_low(x, SMP_CACHE_BYTES, 0)#define alloc_bootmem_pages (x) \ - __alloc_bootmem((x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS)) + __alloc_bootmem(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))#define alloc_bootmem_low_pages (x) \ - __alloc_bootmem_low((x), PAGE_SIZE, 0) + __alloc_bootmem_low(x, PAGE_SIZE, 0)#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */ -extern unsigned long __init free_all_bootmem (void ); -extern void *__init __alloc_bootmem_node (pg_data_t *pgdat,unsigned long size,unsigned long align,unsigned long goal); -extern unsigned long __init init_bootmem_node (pg_data_t *pgdat,unsigned long freepfn,unsigned long startpfn,unsigned long endpfn); -extern void __init reserve_bootmem_node (pg_data_t *pgdat,unsigned long physaddr,unsigned long size); -extern void __init free_bootmem_node (pg_data_t *pgdat,unsigned long addr,unsigned long size); -extern unsigned long __init free_all_bootmem_node (pg_data_t *pgdat); + +extern unsigned long free_all_bootmem (void ); +extern unsigned long free_all_bootmem_node (pg_data_t *pgdat); +extern void *__alloc_bootmem_node (pg_data_t *pgdat, +unsigned long size, +unsigned long align, +unsigned long goal); +extern unsigned long init_bootmem_node (pg_data_t *pgdat, +unsigned long freepfn, +unsigned long startpfn, +unsigned long endpfn); +extern void reserve_bootmem_node (pg_data_t *pgdat, +unsigned long physaddr, +unsigned long size); +extern void free_bootmem_node (pg_data_t *pgdat, +unsigned long addr, +unsigned long size); +#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE #define alloc_bootmem_node (pgdat, x) \ - __alloc_bootmem_node((pgdat), (x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)) + __alloc_bootmem_node(pgdat, x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))#define alloc_bootmem_pages_node (pgdat, x) \ - __alloc_bootmem_node((pgdat), (x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS)) + __alloc_bootmem_node(pgdat, x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))#define alloc_bootmem_low_pages_node (pgdat, x) \ - __alloc_bootmem_low_node((pgdat), (x), PAGE_SIZE, 0) + __alloc_bootmem_low_node(pgdat, x, PAGE_SIZE, 0)#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */ #ifdef CONFIG_HAVE_ARCH_ALLOC_REMAP
@@ -89,19 +108,19 @@ static inline void *alloc_remap(int nid, {return NULL ; } -#endif +#endif /* CONFIG_HAVE_ARCH_ALLOC_REMAP */ -extern unsigned long __initdata nr_kernel_pages; -extern unsigned long __initdata nr_all_pages; +extern unsigned long nr_kernel_pages; +extern unsigned long nr_all_pages; -extern void *__init alloc_large_system_hash (const char *tablename, -unsigned long bucketsize, -unsigned long numentries, -int scale, -int flags, -unsigned int *_hash_shift, -unsigned int *_hash_mask, -unsigned long limit); +extern void *alloc_large_system_hash (const char *tablename, +unsigned long bucketsize, +unsigned long numentries, +int scale, +int flags, +unsigned int *_hash_shift, +unsigned int *_hash_mask, +unsigned long limit);#define HASH_HIGHMEM 0x00000001/* Consider highmem? */ #define HASH_EARLY 0x00000002/* Allocating during early boot? */
@@ -114,7 +133,7 @@ #define HASHDIST_DEFAULT 1#else #define HASHDIST_DEFAULT 0#endif -extern int __initdata hashdist;/* Distribute hashes across NUMA nodes? */ +extern int hashdist;/* Distribute hashes across NUMA nodes? */ #endif /* _LINUX_BOOTMEM_H */
mm/bootmem.c +107 -88
413 lines not on this page · raw message
Signature · 1 line
1.4.0.g64e8
Quoted 1 line · Franck Bui-Huu
This patch does _only_ some cleanup in the bootmem allocator by:
...
Quoted 3 lines
include/linux/bootmem.h | 101 ++++++++++++++---------- mm/bootmem.c | 195 ++++++++++++++++++++++++++--------------------- 2 files changed, 167 insertions(+), 129 deletions(-)
I'm always suspicious of "cleanups" which add more code than they remove ;)
Quoted 1 line
- following the kernel coding style conventions
Above everything else, this probably needs to be in its very own patch, where it is trivially verifiable.
Quoted 4 lines
- using pfn/page conversion macros
- removing some not needed parentheses
- removing some useless included headers
- limiting to 80 column width
In general, I think there is some good stuff in here. However, instead of concentrating on "kernel coding style conventions" and numeric (80 column) guidelines, I really hope that people consider _readability_ when modifying this code. I don't think this patch makes the code much more readable.
That said, there are some nice helper function in here. Would you be able to break this patch up into maybe 10 or 15 smaller patches? I have the feeling it will be easier to find the good bits then.
Quoted 2 lines
It also removes
__inittags in the header file and hopefully make it easier to read.
I think I kinda like when these are present in headers. I usually stumble across the header declarations before I do the ones in the .c files, and it is always nice to see the header visually _matching_ the .c file, and how the variable is intended to be used
-- Dave
Quoted 7 lines · On Mon, 26 Jun 2006 10:58:11 -0700 Dave Hansen <[email protected]> wrote:
Quoted 2 lines
It also removes
__inittags in the header file and hopefully make it easier to read.I think I kinda like when these are present in headers. I usually stumble across the header declarations before I do the ones in the .c files, and it is always nice to see the header visually _matching_ the .c file, and how the variable is intended to be used
__init in headers is pretty useless because the compiler doesn't check it, and they get out of sync relatively frequently. So it you see an __init in a header file, it's quite unreliable and you need to check the definition anyway.
Quoted 9 lines · Dave Hansen
Quoted 1 line · Franck Bui-Huu
This patch does _only_ some cleanup in the bootmem allocator by:
...
Quoted 3 lines
include/linux/bootmem.h | 101 ++++++++++++++---------- mm/bootmem.c | 195 ++++++++++++++++++++++++++--------------------- 2 files changed, 167 insertions(+), 129 deletions(-)I'm always suspicious of "cleanups" which add more code than they remove ;)
it's mainly due to the "80 columns limit" changes
Quoted 10 lines
Quoted 1 line
- following the kernel coding style conventions
Above everything else, this probably needs to be in its very own patch, where it is trivially verifiable.
Quoted 4 lines
- using pfn/page conversion macros
- removing some not needed parentheses
- removing some useless included headers
- limiting to 80 column width
Quoted 6 lines
In general, I think there is some good stuff in here. However, instead of concentrating on "kernel coding style conventions" and numeric (80 column) guidelines, I really hope that people consider _readability_ when modifying this code. I don't think this patch makes the code much more readable.
well, IMHO using pfn/page conversion macros makes the code more readable.
Quoted 4 lines
That said, there are some nice helper function in here. Would you be able to break this patch up into maybe 10 or 15 smaller patches? I have the feeling it will be easier to find the good bits then.
ok I'll split that.
Quoted 8 lines
Quoted 2 lines
It also removes
__inittags in the header file and hopefully make it easier to read.I think I kinda like when these are present in headers. I usually stumble across the header declarations before I do the ones in the .c files, and it is always nice to see the header visually _matching_ the .c file, and how the variable is intended to be used
see Andrew's comments...
Franck
cover Clean up the bootmem allocator
In reply to Dave Hansenok here is the clean up broken up into 7 smaller patches.
Franck
PATCH 1/7 bootmem: remove useless __init in header file
In reply to Dave Hansen__init in headers is pretty useless because the compiler doesn't check it, and they get out of sync relatively frequently. So if you see an __init in a header file, it's quite unreliable and you need to check the definition anyway.
--- include/linux/bootmem.h | 52 ++++++++++++++++++++++++----------------------- 1 files changed, 26 insertions(+), 26 deletions(-)
include/linux/bootmem.h +26 -26
@@ -41,23 +41,23 @@ typedef struct bootmem_data {struct list_head list; } bootmem_data_t; -extern unsigned long __init bootmem_bootmap_pages (unsigned long ); -extern unsigned long __init init_bootmem (unsigned long addr,unsigned long memend); -extern void __init free_bootmem (unsigned long addr,unsigned long size); -extern void *__init __alloc_bootmem (unsigned long size,unsigned long align,unsigned long goal); -extern void *__init __alloc_bootmem_nopanic (unsigned long size,unsigned long align,unsigned long goal); -extern void *__init __alloc_bootmem_low (unsigned long size, +extern unsigned long bootmem_bootmap_pages (unsigned long ); +extern unsigned long init_bootmem (unsigned long addr,unsigned long memend); +extern void free_bootmem (unsigned long addr,unsigned long size); +extern void *__alloc_bootmem (unsigned long size,unsigned long align,unsigned long goal); +extern void *__alloc_bootmem_nopanic (unsigned long size,unsigned long align,unsigned long goal); +extern void *__alloc_bootmem_low (unsigned long size,unsigned long align,unsigned long goal); -extern void *__init __alloc_bootmem_low_node (pg_data_t *pgdat, +extern void *__alloc_bootmem_low_node (pg_data_t *pgdat,unsigned long size,unsigned long align,unsigned long goal); -extern void *__init __alloc_bootmem_core (struct bootmem_data *bdata, +extern void *__alloc_bootmem_core (struct bootmem_data *bdata,unsigned long size,unsigned long align,unsigned long goal,unsigned long limit);#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE -extern void __init reserve_bootmem (unsigned long addr,unsigned long size); +extern void reserve_bootmem (unsigned long addr,unsigned long size);#define alloc_bootmem (x) \ __alloc_bootmem((x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))#define alloc_bootmem_low (x) \
@@ -67,12 +67,12 @@ #define alloc_bootmem_pages(x) \#define alloc_bootmem_low_pages (x) \ __alloc_bootmem_low((x), PAGE_SIZE, 0)#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */ -extern unsigned long __init free_all_bootmem (void ); -extern void *__init __alloc_bootmem_node (pg_data_t *pgdat,unsigned long size,unsigned long align,unsigned long goal); -extern unsigned long __init init_bootmem_node (pg_data_t *pgdat,unsigned long freepfn,unsigned long startpfn,unsigned long endpfn); -extern void __init reserve_bootmem_node (pg_data_t *pgdat,unsigned long physaddr,unsigned long size); -extern void __init free_bootmem_node (pg_data_t *pgdat,unsigned long addr,unsigned long size); -extern unsigned long __init free_all_bootmem_node (pg_data_t *pgdat); +extern unsigned long free_all_bootmem (void ); +extern void *__alloc_bootmem_node (pg_data_t *pgdat,unsigned long size,unsigned long align,unsigned long goal); +extern unsigned long init_bootmem_node (pg_data_t *pgdat,unsigned long freepfn,unsigned long startpfn,unsigned long endpfn); +extern void reserve_bootmem_node (pg_data_t *pgdat,unsigned long physaddr,unsigned long size); +extern void free_bootmem_node (pg_data_t *pgdat,unsigned long addr,unsigned long size); +extern unsigned long free_all_bootmem_node (pg_data_t *pgdat);#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE #define alloc_bootmem_node (pgdat, x) \ __alloc_bootmem_node((pgdat), (x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
@@ -91,17 +91,17 @@ static inline void *alloc_remap(int nid, }#endif -extern unsigned long __initdata nr_kernel_pages; -extern unsigned long __initdata nr_all_pages; +extern unsigned long nr_kernel_pages; +extern unsigned long nr_all_pages; -extern void *__init alloc_large_system_hash (const char *tablename, -unsigned long bucketsize, -unsigned long numentries, -int scale, -int flags, -unsigned int *_hash_shift, -unsigned int *_hash_mask, -unsigned long limit); +extern void *alloc_large_system_hash (const char *tablename, +unsigned long bucketsize, +unsigned long numentries, +int scale, +int flags, +unsigned int *_hash_shift, +unsigned int *_hash_mask, +unsigned long limit);#define HASH_HIGHMEM 0x00000001/* Consider highmem? */ #define HASH_EARLY 0x00000002/* Allocating during early boot? */
@@ -114,7 +114,7 @@ #define HASHDIST_DEFAULT 1#else #define HASHDIST_DEFAULT 0#endif -extern int __initdata hashdist;/* Distribute hashes across NUMA nodes? */ +extern int hashdist;/* Distribute hashes across NUMA nodes? */ #endif /* _LINUX_BOOTMEM_H */
Signature · 1 line
1.4.0.g64e8
Re: [PATCH 1/7] bootmem: remove useless __init in header file
include/linux/bootmem.h typedef struct bootmem_data { · line 48
Quoted 2 lines · Franck Bui-Huu
include/linux/bootmem.h +2
-0+extern void *__alloc_bootmem (unsigned long size,unsigned long align,unsigned long goal); +extern void *__alloc_bootmem_nopanic (unsigned long size,unsigned long align,unsigned long goal);
Since we're being picky about kernel coding style, doesn't the '*' go next to the function name? ;)
-- Dave
Re: [PATCH 1/7] bootmem: remove useless __init in header file
2006/6/27, Dave Hansen <[email protected]>:
Quoted 7 lines · Franck Bui-Huu
include/linux/bootmem.h typedef struct bootmem_data { · line 48
Quoted 2 lines
include/linux/bootmem.h +2
-0+extern void *__alloc_bootmem (unsigned long size,unsigned long align,unsigned long goal); +extern void *__alloc_bootmem_nopanic (unsigned long size,unsigned long align,unsigned long goal);Since we're being picky about kernel coding style, doesn't the '*' go next to the function name? ;)
yeah, I noticed that but I wouldn't be too paranoid. But since you ask for, I'll do that too :)
thanks
Signature · 1 line
Franck
PATCH 2/7 bootmem: mark link_bootmem() as part of the __init section
In reply to Dave Hansen--- mm/bootmem.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
mm/bootmem.c +1 -1
@@ -56,7 +56,7 @@ unsigned long __init bootmem_bootmap_pag/* * link bdata in order */ -static void link_bootmem (bootmem_data_t *bdata) +static void __init link_bootmem (bootmem_data_t *bdata) {bootmem_data_t *ent;if (list_empty (&bdata_list)) {
Signature · 1 line
1.4.0.g64e8
Re: [PATCH 2/7] bootmem: mark link_bootmem() as part of the __init section
Quoted 10 lines · Franck Bui-Huu
Signed-off-by Franck Bui-Huu <[email protected]>--- mm/bootmem.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)mm/bootmem.c +0
-0
mm/bootmem.c unsigned long __init bootmem_bootmap_pag · line 62
Quoted 8 lines
mm/bootmem.c +1
-1@@ -56,7 +56,7 @@ unsigned long __init bootmem_bootmap_pag/* * link bdata in order */ -static void link_bootmem (bootmem_data_t *bdata) +static void __init link_bootmem (bootmem_data_t *bdata) {bootmem_data_t *ent;if (list_empty (&bdata_list)) {
Looks sane. Just curious, did you do any wider audit in bootmem.c for more of these?
-- Dave
Re: [PATCH 2/7] bootmem: mark link_bootmem() as part of the __init section
2006/6/27, Dave Hansen <[email protected]>:
Quoted 6 lines · Franck Bui-Huu
Quoted 5 lines
Signed-off-by Franck Bui-Huu <[email protected]>--- mm/bootmem.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Quoted 17 lines
mm/bootmem.c unsigned long __init bootmem_bootmap_pag · line 62
Quoted 13 lines
mm/bootmem.c +1
-1@@ -56,7 +56,7 @@ unsigned long __init bootmem_bootmap_pag/* * link bdata in order */ -static void link_bootmem (bootmem_data_t *bdata) +static void __init link_bootmem (bootmem_data_t *bdata) {bootmem_data_t *ent;if (list_empty (&bdata_list)) {Looks sane. Just curious, did you do any wider audit in
bootmem.cfor more of these?
I checked that all functions in bootmem.c belong to the __init section.
Signature · 1 line
Franck
PATCH 3/7 bootmem: remove useless parentheses in bootmem header file
In reply to Dave Hansen--- include/linux/bootmem.h | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
include/linux/bootmem.h +7 -7
@@ -59,13 +59,13 @@ extern void * __alloc_bootmem_core(struc#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE extern void reserve_bootmem (unsigned long addr,unsigned long size);#define alloc_bootmem (x) \ - __alloc_bootmem((x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)) + __alloc_bootmem(x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))#define alloc_bootmem_low (x) \ - __alloc_bootmem_low((x), SMP_CACHE_BYTES, 0) + __alloc_bootmem_low(x, SMP_CACHE_BYTES, 0)#define alloc_bootmem_pages (x) \ - __alloc_bootmem((x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS)) + __alloc_bootmem(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))#define alloc_bootmem_low_pages (x) \ - __alloc_bootmem_low((x), PAGE_SIZE, 0) + __alloc_bootmem_low(x, PAGE_SIZE, 0)#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */ extern unsigned long free_all_bootmem (void );extern void *__alloc_bootmem_node (pg_data_t *pgdat,unsigned long size,unsigned long align,unsigned long goal);
@@ -75,11 +75,11 @@ extern void free_bootmem_node (pg_data_textern unsigned long free_all_bootmem_node (pg_data_t *pgdat);#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE #define alloc_bootmem_node (pgdat, x) \ - __alloc_bootmem_node((pgdat), (x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)) + __alloc_bootmem_node(pgdat, x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))#define alloc_bootmem_pages_node (pgdat, x) \ - __alloc_bootmem_node((pgdat), (x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS)) + __alloc_bootmem_node(pgdat, x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))#define alloc_bootmem_low_pages_node (pgdat, x) \ - __alloc_bootmem_low_node((pgdat), (x), PAGE_SIZE, 0) + __alloc_bootmem_low_node(pgdat, x, PAGE_SIZE, 0)#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */ #ifdef CONFIG_HAVE_ARCH_ALLOC_REMAP
Signature · 1 line
1.4.0.g64e8
PATCH 4/7 bootmem: limit to 80 columns width
In reply to Dave Hansen--- include/linux/bootmem.h | 42 +++++++++++++++++++++++++++++------------- mm/bootmem.c | 28 ++++++++++++++++++---------- 2 files changed, 47 insertions(+), 23 deletions(-)
include/linux/bootmem.h +29 -13
@@ -44,18 +44,24 @@ typedef struct bootmem_data {extern unsigned long bootmem_bootmap_pages (unsigned long );extern unsigned long init_bootmem (unsigned long addr,unsigned long memend);extern void free_bootmem (unsigned long addr,unsigned long size); -extern void *__alloc_bootmem (unsigned long size,unsigned long align,unsigned long goal); -extern void *__alloc_bootmem_nopanic (unsigned long size,unsigned long align,unsigned long goal); +extern void *__alloc_bootmem (unsigned long size, +unsigned long align, +unsigned long goal); +extern void *__alloc_bootmem_nopanic (unsigned long size, +unsigned long align, +unsigned long goal);extern void *__alloc_bootmem_low (unsigned long size, -unsigned long align, -unsigned long goal); +unsigned long align, +unsigned long goal);extern void *__alloc_bootmem_low_node (pg_data_t *pgdat, -unsigned long size, -unsigned long align, -unsigned long goal); +unsigned long size, +unsigned long align, +unsigned long goal);extern void *__alloc_bootmem_core (struct bootmem_data *bdata, -unsigned long size,unsigned long align,unsigned long goal, -unsigned long limit); +unsigned long size, +unsigned long align, +unsigned long goal, +unsigned long limit);#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE extern void reserve_bootmem (unsigned long addr,unsigned long size);#define alloc_bootmem (x) \
@@ -68,10 +74,20 @@ #define alloc_bootmem_low_pages(x) \ __alloc_bootmem_low(x, PAGE_SIZE, 0)#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */ extern unsigned long free_all_bootmem (void ); -extern void *__alloc_bootmem_node (pg_data_t *pgdat,unsigned long size,unsigned long align,unsigned long goal); -extern unsigned long init_bootmem_node (pg_data_t *pgdat,unsigned long freepfn,unsigned long startpfn,unsigned long endpfn); -extern void reserve_bootmem_node (pg_data_t *pgdat,unsigned long physaddr,unsigned long size); -extern void free_bootmem_node (pg_data_t *pgdat,unsigned long addr,unsigned long size); +extern void *__alloc_bootmem_node (pg_data_t *pgdat, +unsigned long size, +unsigned long align, +unsigned long goal); +extern unsigned long init_bootmem_node (pg_data_t *pgdat, +unsigned long freepfn, +unsigned long startpfn, +unsigned long endpfn); +extern void reserve_bootmem_node (pg_data_t *pgdat, +unsigned long physaddr, +unsigned long size); +extern void free_bootmem_node (pg_data_t *pgdat, +unsigned long addr, +unsigned long size);extern unsigned long free_all_bootmem_node (pg_data_t *pgdat);#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE #define alloc_bootmem_node (pgdat, x) \
mm/bootmem.c +18 -10
@@ -104,7 +104,8 @@ static unsigned long __init init_bootmem* might be used for boot-time allocations - or it might get added * to the free page pool later on. */ -static void __init reserve_bootmem_core (bootmem_data_t *bdata,unsigned long addr,unsigned long size) +static void __init reserve_bootmem_core (bootmem_data_t *bdata,unsigned long addr, +unsigned long size) {unsigned long i;/*
@@ -129,7 +130,8 @@ #endif } } -static void __init free_bootmem_core (bootmem_data_t *bdata,unsigned long addr,unsigned long size) +static void __init free_bootmem_core (bootmem_data_t *bdata,unsigned long addr, +unsigned long size) {unsigned long i;unsigned long start;
@@ -357,17 +359,20 @@ static unsigned long __init free_all_booreturn total; } -unsigned long __init init_bootmem_node (pg_data_t *pgdat,unsigned long freepfn,unsigned long startpfn,unsigned long endpfn) +unsigned long __init init_bootmem_node (pg_data_t *pgdat,unsigned long freepfn, +unsigned long startpfn,unsigned long endpfn) {return (init_bootmem_core (pgdat, freepfn, startpfn, endpfn)); } -void __init reserve_bootmem_node (pg_data_t *pgdat,unsigned long physaddr,unsigned long size) +void __init reserve_bootmem_node (pg_data_t *pgdat,unsigned long physaddr, +unsigned long size) {reserve_bootmem_core (pgdat->bdata, physaddr, size); } -void __init free_bootmem_node (pg_data_t *pgdat,unsigned long physaddr,unsigned long size) +void __init free_bootmem_node (pg_data_t *pgdat,unsigned long physaddr, +unsigned long size) {free_bootmem_core (pgdat->bdata, physaddr, size); }
@@ -401,7 +406,8 @@ unsigned long __init free_all_bootmem (vreturn (free_all_bootmem_core (NODE_DATA (0 ))); } -void *__init __alloc_bootmem_nopanic (unsigned long size,unsigned long align,unsigned long goal) +void *__init __alloc_bootmem_nopanic (unsigned long size,unsigned long align, +unsigned long goal) {bootmem_data_t *bdata;void *ptr;
@@ -412,7 +418,8 @@ void * __init __alloc_bootmem_nopanic(unreturn NULL ; } -void *__init __alloc_bootmem (unsigned long size,unsigned long align,unsigned long goal) +void *__init __alloc_bootmem (unsigned long size,unsigned long align, +unsigned long goal) {void *mem =__alloc_bootmem_nopanic (size,align,goal);if (mem)
@@ -426,8 +433,8 @@ void * __init __alloc_bootmem(unsigned l } -void *__init __alloc_bootmem_node (pg_data_t *pgdat,unsigned long size,unsigned long align, -unsigned long goal) +void *__init __alloc_bootmem_node (pg_data_t *pgdat,unsigned long size, +unsigned long align,unsigned long goal) {void *ptr;
@@ -440,7 +447,8 @@ void * __init __alloc_bootmem_node(pg_da#define LOW32LIMIT 0xffffffff -void *__init __alloc_bootmem_low (unsigned long size,unsigned long align,unsigned long goal) +void *__init __alloc_bootmem_low (unsigned long size,unsigned long align, +unsigned long goal) {bootmem_data_t *bdata;void *ptr;
Signature · 1 line
1.4.0.g64e8
PATCH 5/7 bootmem: remove useless headers inclusions
In reply to Dave Hansen--- include/linux/bootmem.h | 5 +---- mm/bootmem.c | 10 +++------- 2 files changed, 4 insertions(+), 11 deletions(-)
include/linux/bootmem.h +1 -4
@@ -4,11 +4,8 @@#ifndef _LINUX_BOOTMEM_H#define _LINUX_BOOTMEM_H -#include <asm/pgtable.h> -#include <asm/dma.h> -#include <linux/cache.h> -#include <linux/init.h> #include <linux/mmzone.h> +#include <asm/dma.h> /* * simple boot-time physical memory area allocator.
mm/bootmem.c +3 -7
@@ -8,17 +8,13 @@* free memory collector. It's used to deal with reserved * system memory and memory holes as well. */ - -#include <linux/mm.h> -#include <linux/kernel_stat.h> -#include <linux/swap.h> -#include <linux/interrupt.h> #include <linux/init.h> #include <linux/bootmem.h> -#include <linux/mmzone.h> #include <linux/module.h> -#include <asm/dma.h> + +#include <asm/bug.h> #include <asm/io.h> +#include "internal.h" /*
Signature · 1 line
1.4.0.g64e8
PATCH 6/7 bootmem: use pfn/page conversion macros
In reply to Dave HansenIt also creates get_mapsize() helper in order to make the code more readable when it calculates the boot bitmap size.
--- mm/bootmem.c | 82 ++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 45 insertions(+), 37 deletions(-)
mm/bootmem.c +45 -37
@@ -9,6 +9,7 @@* system memory and memory holes as well. */ #include <linux/init.h> +#include <linux/pfn.h> #include <linux/bootmem.h> #include <linux/module.h>
@@ -70,6 +71,18 @@ static void __init link_bootmem(bootmem_return ; } +/* +* Given an initialised bdata, it returns the size of the boot bitmap +*/ +static unsigned long __init get_mapsize (bootmem_data_t *bdata) +{ +unsigned long mapsize; +unsigned long start =PFN_DOWN (bdata->node_boot_start); +unsigned long end = bdata->node_low_pfn; + + mapsize = ((end - start) +7 ) /8 ; +return ALIGN (mapsize,sizeof (long )); +}/* * Called once to set up the allocator itself.
@@ -78,11 +91,10 @@ static unsigned long __init init_bootmem unsigned long mapstart, unsigned long start, unsigned long end) { bootmem_data_t *bdata = pgdat->bdata; -unsigned long mapsize = ((end - start)+7 )/8 ; +unsigned long mapsize; - mapsize =ALIGN (mapsize,sizeof (long )); - bdata->node_bootmem_map =phys_to_virt (mapstart <<PAGE_SHIFT ); - bdata->node_boot_start = (start <<PAGE_SHIFT ); + bdata->node_bootmem_map =phys_to_virt (PFN_PHYS (mapstart)); + bdata->node_boot_start =PFN_PHYS (start); bdata->node_low_pfn = end;link_bootmem (bdata);
@@ -90,6 +102,7 @@ static unsigned long __init init_bootmem* Initially all pages are reserved - setup_arch() has to * register free RAM areas explicitly. */ + mapsize =get_mapsize (bdata);memset (bdata->node_bootmem_map,0xff , mapsize);return mapsize;
@@ -103,20 +116,19 @@ static unsigned long __init init_bootmemstatic void __init reserve_bootmem_core (bootmem_data_t *bdata,unsigned long addr,unsigned long size) { +unsigned long sidx, eidx;unsigned long i; +/* * round up, partially reserved pages are considered * fully reserved. */ -unsigned long sidx = (addr - bdata->node_boot_start)/PAGE_SIZE ; -unsigned long eidx = (addr + size - bdata->node_boot_start + -PAGE_SIZE -1 )/PAGE_SIZE ; -unsigned long end = (addr + size +PAGE_SIZE -1 )/PAGE_SIZE ; -BUG_ON (!size); -BUG_ON (sidx >= eidx); -BUG_ON ((addr >>PAGE_SHIFT ) >= bdata->node_low_pfn); -BUG_ON (end > bdata->node_low_pfn); +BUG_ON (PFN_DOWN (addr) >= bdata->node_low_pfn); +BUG_ON (PFN_UP (addr + size) > bdata->node_low_pfn); + + sidx =PFN_DOWN (addr - bdata->node_boot_start); + eidx =PFN_UP (addr + size - bdata->node_boot_start);for (i = sidx; i < eidx; i++)if (test_and_set_bit (i, bdata->node_bootmem_map)) {
@@ -129,18 +141,15 @@ #endifstatic void __init free_bootmem_core (bootmem_data_t *bdata,unsigned long addr,unsigned long size) { +unsigned long sidx, eidx;unsigned long i; -unsigned long start; +/* * round down end of usable mem, partially free pages are * considered reserved. */ -unsigned long sidx; -unsigned long eidx = (addr + size - bdata->node_boot_start)/PAGE_SIZE ; -unsigned long end = (addr + size)/PAGE_SIZE ; -BUG_ON (!size); -BUG_ON (end > bdata->node_low_pfn); +BUG_ON (PFN_DOWN (addr + size) > bdata->node_low_pfn);if (addr < bdata->last_success) bdata->last_success = addr;
@@ -148,8 +157,8 @@ static void __init free_bootmem_core(boo/* * Round up the beginning of the address. */ - start = (addr +PAGE_SIZE -1 ) /PAGE_SIZE ; - sidx = start - (bdata->node_boot_start/PAGE_SIZE ); + sidx =PFN_UP (addr) -PFN_DOWN (bdata->node_boot_start); + eidx =PFN_DOWN (addr + size - bdata->node_boot_start);for (i = sidx; i < eidx; i++) {if (unlikely (!test_and_clear_bit (i, bdata->node_bootmem_map)))
@@ -175,7 +184,7 @@ __alloc_bootmem_core(struct bootmem_data unsigned long align, unsigned long goal, unsigned long limit) { unsigned long offset, remaining_size, areasize, preferred; -unsigned long i, start =0 , incr, eidx, end_pfn = bdata->node_low_pfn; +unsigned long i, start =0 , incr, eidx, end_pfn;void *ret;if (!size) {
@@ -187,23 +196,22 @@ __alloc_bootmem_core(struct bootmem_dataif (limit && bdata->node_boot_start >= limit)return NULL ; - limit >>=PAGE_SHIFT ; + end_pfn = bdata->node_low_pfn; + limit =PFN_DOWN (limit);if (limit && end_pfn > limit) end_pfn = limit; - eidx = end_pfn - (bdata->node_boot_start >>PAGE_SHIFT ); + eidx = end_pfn -PFN_DOWN (bdata->node_boot_start); offset =0 ; -if (align && - (bdata->node_boot_start & (align -1UL )) !=0 ) - offset = (align - (bdata->node_boot_start & (align -1UL ))); - offset >>=PAGE_SHIFT ; +if (align && (bdata->node_boot_start & (align -1UL )) !=0 ) + offset = align - (bdata->node_boot_start & (align -1UL )); + offset =PFN_DOWN (offset);/* * We try to allocate bootmem pages above 'goal' * first, then we try to allocate lower pages. */ -if (goal && (goal >= bdata->node_boot_start) && - ((goal >>PAGE_SHIFT ) < end_pfn)) { +if (goal && goal >= bdata->node_boot_start &&PFN_DOWN (goal) < end_pfn) { preferred = goal - bdata->node_boot_start;if (bdata->last_success >= preferred)
@@ -212,9 +220,8 @@ __alloc_bootmem_core(struct bootmem_data }else preferred =0 ; - preferred =ALIGN (preferred, align) >>PAGE_SHIFT ; - preferred += offset; - areasize = (size+PAGE_SIZE -1 )/PAGE_SIZE ; + preferred =PFN_DOWN (ALIGN (preferred, align)) + offset; + areasize = (size +PAGE_SIZE -1 ) /PAGE_SIZE ; incr = align >>PAGE_SHIFT ? :1 ; restart_scan:
@@ -245,7 +252,7 @@ restart_scan:return NULL ; found: - bdata->last_success = start <<PAGE_SHIFT ; + bdata->last_success =PFN_PHYS (start);BUG_ON (start >= eidx);/*
@@ -303,8 +310,8 @@ static unsigned long __init free_all_boo count =0 ;/* first extant page of the node */ - pfn = bdata->node_boot_start >>PAGE_SHIFT ; - idx = bdata->node_low_pfn - (bdata->node_boot_start >>PAGE_SHIFT ); + pfn =PFN_DOWN (bdata->node_boot_start); + idx = bdata->node_low_pfn - pfn; map = bdata->node_bootmem_map;/* Check physaddr is O(LOG2(BITS_PER_LONG)) page aligned */ if (bdata->node_boot_start == 0 ||
@@ -345,9 +352,10 @@ static unsigned long __init free_all_boo*/ page =virt_to_page (bdata->node_bootmem_map); count =0 ; -for (i =0 ; i < ((bdata->node_low_pfn-(bdata->node_boot_start >>PAGE_SHIFT ))/8 +PAGE_SIZE -1 )/PAGE_SIZE ; i++,page++) { - count++; + idx = (get_mapsize (bdata) +PAGE_SIZE -1 ) >>PAGE_SHIFT ; +for (i =0 ; i < idx; i++, page++) {__free_pages_bootmem (page,0 ); + count++; } total += count; bdata->node_bootmem_map =NULL ;
Signature · 1 line
1.4.0.g64e8
Re: [PATCH 6/7] bootmem: use pfn/page conversion macros
Quoted 15 lines · Franck Bui-Huu
static void
__initfree_bootmem_core(bootmem_data_t *bdata, unsigned
long addr,
unsigned long size)
{mm/bootmem.c +2
-3+unsigned long sidx, eidx;unsigned long i; -unsigned long start; +/* * round down end of usable mem, partially free pages are * considered reserved. */ -unsigned long sidx; - unsigned long eidx = (addr + size -bdata->node_boot_start)/PAGE_SIZE;
mm/bootmem.c #endif · line 152
Quoted 5 lines
mm/bootmem.c +1
-3-unsigned long end = (addr + size)/PAGE_SIZE ; -BUG_ON (!size); -BUG_ON (end > bdata->node_low_pfn); +BUG_ON (PFN_DOWN (addr + size) > bdata->node_low_pfn);
In general, I like these kinds of conversions. But, in this case, I think it makes the code harder to read. Those intermediate variables are really nice and I think they make the code much more readable.
Do you really prefer:
BUG_ON(PFN_DOWN(addr + size) > bdata->node_low_pfn)
over
BUG_ON(end > bdata->node_low_pfn);
Also, these do a bit more than just conversions to using the pfn/page macros. With this much churn, it is more than possible that bugs can creep in. How about a bit more restrictive conversion to the PFN_ macros, first?
Oh, and if you're going to chew through it later, feel free to make things like sidx into decent variable names. ;)
Is everybody else OK with this code churn? It doesn't appear that there is too much in -mm pending in this area.
-- Dave
Re: [PATCH 6/7] bootmem: use pfn/page conversion macros
Quoted 26 lines · Dave Hansen
Quoted 15 lines · Franck Bui-Huu
static void
__initfree_bootmem_core(bootmem_data_t *bdata, unsigned
long addr,
unsigned long size)
{mm/bootmem.c +2
-3+unsigned long sidx, eidx;unsigned long i; -unsigned long start; +/* * round down end of usable mem, partially free pages are * considered reserved. */ -unsigned long sidx; - unsigned long eidx = (addr + size -bdata->node_boot_start)/PAGE_SIZE;
mm/bootmem.c #endif · line 152
Quoted 5 lines
mm/bootmem.c +1
-3-unsigned long end = (addr + size)/PAGE_SIZE ; -BUG_ON (!size); -BUG_ON (end > bdata->node_low_pfn); +BUG_ON (PFN_DOWN (addr + size) > bdata->node_low_pfn);In general, I like these kinds of conversions. But, in this case, I think it makes the code harder to read. Those intermediate variables are really nice and I think they make the code much more readable.
Quoted 8 lines
Do you really prefer:
BUG_ON(PFN_DOWN(addr + size) > bdata->node_low_pfn)over
BUG_ON(end > bdata->node_low_pfn);
It depends of the context. Generally, I think you're right but in that case I prefer the first case. Why ? because "addr + size" is not a complex expression, it's quite easy to understand what it means. And secondly the place where "end" is defined made me think that it was used all along the function but its use was very punctual.
Quoted 11 lines
Also, these do a bit more than just conversions to using the pfn/page macros. With this much churn, it is more than possible that bugs can creep in. How about a bit more restrictive conversion to the
PFN_macros, first?Oh, and if you're going to chew through it later, feel free to make things like sidx into decent variable names. ;)
Is everybody else OK with this code churn? It doesn't appear that there is too much in -mm pending in this area.
It seems that bootmem allocator doesn't get a lot of interest... Should we stop this work ?
Franck
PATCH 7/7 bootmem: miscellaneous coding style fixes
In reply to Dave Hansen--- include/linux/bootmem.h | 29 +++++++++------- mm/bootmem.c | 84 ++++++++++++++++++++++++++--------------------- 2 files changed, 62 insertions(+), 51 deletions(-)
include/linux/bootmem.h +16 -13
@@ -38,13 +38,13 @@ typedef struct bootmem_data {struct list_head list; } bootmem_data_t; -extern unsigned long bootmem_bootmap_pages (unsigned long ); -extern unsigned long init_bootmem (unsigned long addr,unsigned long memend); -extern void free_bootmem (unsigned long addr,unsigned long size); -extern void *__alloc_bootmem (unsigned long size, +extern unsigned long bootmem_bootmap_pages (unsigned long ); +extern unsigned long init_bootmem (unsigned long addr,unsigned long memend); +extern void free_bootmem (unsigned long addr,unsigned long size); +extern void *__alloc_bootmem (unsigned long size,unsigned long align,unsigned long goal); -extern void *__alloc_bootmem_nopanic (unsigned long size, +extern void *__alloc_bootmem_nopanic (unsigned long size,unsigned long align,unsigned long goal); extern void * __alloc_bootmem_low(unsigned long size,
@@ -59,8 +59,9 @@ extern void * __alloc_bootmem_core(strucunsigned long align, unsigned long goal, unsigned long limit); +#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE -extern void reserve_bootmem (unsigned long addr,unsigned long size); +extern void reserve_bootmem (unsigned long addr,unsigned long size);#define alloc_bootmem (x) \ __alloc_bootmem(x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))#define alloc_bootmem_low (x) \
@@ -70,22 +71,24 @@ #define alloc_bootmem_pages(x) \#define alloc_bootmem_low_pages (x) \ __alloc_bootmem_low(x, PAGE_SIZE, 0)#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */ -extern unsigned long free_all_bootmem (void ); -extern void *__alloc_bootmem_node (pg_data_t *pgdat, + +extern unsigned long free_all_bootmem (void ); +extern unsigned long free_all_bootmem_node (pg_data_t *pgdat); +extern void *__alloc_bootmem_node (pg_data_t *pgdat,unsigned long size,unsigned long align,unsigned long goal); -extern unsigned long init_bootmem_node (pg_data_t *pgdat, +extern unsigned long init_bootmem_node (pg_data_t *pgdat,unsigned long freepfn,unsigned long startpfn,unsigned long endpfn); -extern void reserve_bootmem_node (pg_data_t *pgdat, +extern void reserve_bootmem_node (pg_data_t *pgdat,unsigned long physaddr,unsigned long size); -extern void free_bootmem_node (pg_data_t *pgdat, +extern void free_bootmem_node (pg_data_t *pgdat,unsigned long addr,unsigned long size); -extern unsigned long free_all_bootmem_node (pg_data_t *pgdat); +#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE #define alloc_bootmem_node (pgdat, x) \ __alloc_bootmem_node(pgdat, x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
@@ -102,7 +105,7 @@ static inline void *alloc_remap(int nid, {return NULL ; } -#endif +#endif /* CONFIG_HAVE_ARCH_ALLOC_REMAP */ extern unsigned long nr_kernel_pages;extern unsigned long nr_all_pages;
mm/bootmem.c +46 -38
218 lines not on this page · raw message
Signature · 1 line
1.4.0.g64e8
Re: [PATCH 7/7] bootmem: miscellaneous coding style fixes
mm/bootmem.c unsigned long __init bootmem_bootmap_pag · line 61
Quoted 10 lines · Franck Bui-Huu
}
mm/bootmem.c +2
-0+/* * link bdata in order */ static void __init link_bootmem (bootmem_data_t *bdata) {bootmem_data_t *ent; +if (list_empty (&bdata_list)) {
I'd discourage you from including too many of these in your patches. One or two is probably OK. But, there are a bunch of them, and it isn't clear CodingStyle to have spacing like this either way. I'd drop them.
-- Dave
Re: [PATCH 7/7] bootmem: miscellaneous coding style fixes
2006/6/27, Dave Hansen <[email protected]>:
Quoted 7 lines · Franck Bui-Huu
Quoted 6 lines
}
+
/*
* link bdata in order
*/
static void__initlink_bootmem(bootmem_data_t *bdata)
Quoted 9 lines
Quoted 4 lines
{ bootmem_data_t *ent; + if (list_empty(&bdata_list)) {I'd discourage you from including too many of these in your patches. One or two is probably OK. But, there are a bunch of them, and it isn't clear CodingStyle to have spacing like this either way. I'd drop them.
IMHO they make the code obviously more readable and obviously do not add any new bugs. So why drop them ?
Signature · 1 line
Franck
Re: [PATCH 7/7] bootmem: miscellaneous coding style fixes
Quoted 18 lines · On Tue, 27 Jun 2006 21:22:29 +0200 Franck Bui-Huu wrote:
2006/6/27, Dave Hansen <[email protected]>:
Quoted 7 lines · Franck Bui-Huu
Quoted 6 lines
}
+
/*
* link bdata in order
*/
static void__initlink_bootmem(bootmem_data_t *bdata)Quoted 9 lines
Quoted 4 lines
{ bootmem_data_t *ent; + if (list_empty(&bdata_list)) {I'd discourage you from including too many of these in your patches. One or two is probably OK. But, there are a bunch of them, and it isn't clear CodingStyle to have spacing like this either way. I'd drop them.
Quoted 2 lines
IMHO they make the code obviously more readable and obviously do not add any new bugs. So why drop them ?
I'd say the change is preferred even if it's not in CodingStyle.
---
~Randy