superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mm: make show_free_areas() static 

All callers of show_free_areas() pass 0 and NULL, so we can directly use
show_mem() instead of show_free_areas(0, NULL), which could make
show_free_areas() a static function.

Link: https://lkml.kernel.org/r/20230630062253.189440-2-wangkefeng.wang@huawei.com
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
pull/806/head
Kefeng Wang 2023-06-30 14:22:53 +08:00 committed by Andrew Morton
parent 527ed4f7d9
commit 1279aa0656
5 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sparc/kernel/setup_32.c
View File

@ -83,7 +83,7 @@ static void prom_sync_me(void)
"nop\n\t" : : "r" (&trapbase)); "nop\n\t" : : "r" (&trapbase));
prom_printf("PROM SYNC COMMAND...\n"); prom_printf("PROM SYNC COMMAND...\n");
show_free_areas(0, NULL); show_mem();
if (!is_idle_task(current)) { if (!is_idle_task(current)) {
local_irq_enable(); local_irq_enable();
ksys_sync(); ksys_sync();

12
include/linux/mm.h
View File

@ -2236,18 +2236,6 @@ extern void pagefault_out_of_memory(void);
#define offset_in_thp(page, p) ((unsigned long)(p) & (thp_size(page) - 1)) #define offset_in_thp(page, p) ((unsigned long)(p) & (thp_size(page) - 1))
#define offset_in_folio(folio, p) ((unsigned long)(p) & (folio_size(folio) - 1)) #define offset_in_folio(folio, p) ((unsigned long)(p) & (folio_size(folio) - 1))
/*
* Flags passed to show_mem() and show_free_areas() to suppress output in
* various contexts.
*/
#define SHOW_MEM_FILTER_NODES (0x0001u) /* disallowed nodes */
extern void __show_free_areas(unsigned int flags, nodemask_t *nodemask, int max_zone_idx);
static void __maybe_unused show_free_areas(unsigned int flags, nodemask_t *nodemask)
{
__show_free_areas(flags, nodemask, MAX_NR_ZONES - 1);
}
/* /*
* Parameter block passed down to zap_pte_range in exceptional cases. * Parameter block passed down to zap_pte_range in exceptional cases.
*/ */

6
mm/internal.h
View File

@ -61,6 +61,12 @@ void page_writeback_init(void);
#define COMPOUND_MAPPED 0x800000 #define COMPOUND_MAPPED 0x800000
#define FOLIO_PAGES_MAPPED (COMPOUND_MAPPED - 1) #define FOLIO_PAGES_MAPPED (COMPOUND_MAPPED - 1)
/*
* Flags passed to __show_mem() and show_free_areas() to suppress output in
* various contexts.
*/
#define SHOW_MEM_FILTER_NODES (0x0001u) /* disallowed nodes */
/* /*
* How many individual pages have an elevated _mapcount. Excludes * How many individual pages have an elevated _mapcount. Excludes
* the folio's entire_mapcount. * the folio's entire_mapcount.

8
mm/nommu.c
View File

@ -1003,7 +1003,7 @@ error_free:
enomem: enomem:
pr_err("Allocation of length %lu from process %d (%s) failed\n", pr_err("Allocation of length %lu from process %d (%s) failed\n",
len, current->pid, current->comm); len, current->pid, current->comm);
show_free_areas(0, NULL); show_mem();
return -ENOMEM; return -ENOMEM;
} }
@ -1236,20 +1236,20 @@ error_getting_vma:
kmem_cache_free(vm_region_jar, region); kmem_cache_free(vm_region_jar, region);
pr_warn("Allocation of vma for %lu byte allocation from process %d failed\n", pr_warn("Allocation of vma for %lu byte allocation from process %d failed\n",
len, current->pid); len, current->pid);
show_free_areas(0, NULL); show_mem();
return -ENOMEM; return -ENOMEM;
error_getting_region: error_getting_region:
pr_warn("Allocation of vm region for %lu byte allocation from process %d failed\n", pr_warn("Allocation of vm region for %lu byte allocation from process %d failed\n",
len, current->pid); len, current->pid);
show_free_areas(0, NULL); show_mem();
return -ENOMEM; return -ENOMEM;
error_vma_iter_prealloc: error_vma_iter_prealloc:
kmem_cache_free(vm_region_jar, region); kmem_cache_free(vm_region_jar, region);
vm_area_free(vma); vm_area_free(vma);
pr_warn("Allocation of vma tree for process %d failed\n", current->pid); pr_warn("Allocation of vma tree for process %d failed\n", current->pid);
show_free_areas(0, NULL); show_mem();
return -ENOMEM; return -ENOMEM;
} }

4
mm/show_mem.c
View File

@ -186,7 +186,7 @@ static bool node_has_managed_zones(pg_data_t *pgdat, int max_zone_idx)
* SHOW_MEM_FILTER_NODES: suppress nodes that are not allowed by current's * SHOW_MEM_FILTER_NODES: suppress nodes that are not allowed by current's
* cpuset. * cpuset.
*/ */
void __show_free_areas(unsigned int filter, nodemask_t *nodemask, int max_zone_idx) static void show_free_areas(unsigned int filter, nodemask_t *nodemask, int max_zone_idx)
{ {
unsigned long free_pcp = 0; unsigned long free_pcp = 0;
int cpu, nid; int cpu, nid;
@ -406,7 +406,7 @@ void __show_mem(unsigned int filter, nodemask_t *nodemask, int max_zone_idx)
struct zone *zone; struct zone *zone;
printk("Mem-Info:\n"); printk("Mem-Info:\n");
__show_free_areas(filter, nodemask, max_zone_idx); show_free_areas(filter, nodemask, max_zone_idx);
for_each_populated_zone(zone) { for_each_populated_zone(zone) {