path: root/lib
diff options
authorMichal Hocko <>2017-02-22 15:46:16 -0800
committerLinus Torvalds <>2017-02-22 16:41:30 -0800
commit9af744d743170b5f5ef70031dea8d772d166ab28 (patch)
tree87290ffc304288352c66bc9afda0d4214403862c /lib
parent6d23f8a5d432337aa2590ea8fd5eee8b0bc28eee (diff)
lib/show_mem.c: teach show_mem to work with the given nodemask
show_mem() allows to filter out node specific data which is irrelevant to the allocation request via SHOW_MEM_FILTER_NODES. The filtering is done in skip_free_areas_node which skips all nodes which are not in the mems_allowed of the current process. This works most of the time as expected because the nodemask shouldn't be outside of the allocating task but there are some exceptions. E.g. memory hotplug might want to request allocations from outside of the allowed nodes (see new_node_page). Get rid of this hardcoded behavior and push the allocation mask down the show_mem path and use it instead of cpuset_current_mems_allowed. NULL nodemask is interpreted as cpuset_current_mems_allowed. [ coding-style fixes] Link: Signed-off-by: Michal Hocko <> Acked-by: Mel Gorman <> Cc: Hillf Danton <> Cc: Johannes Weiner <> Cc: Vlastimil Babka <> Cc: David Rientjes <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'lib')
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/show_mem.c b/lib/show_mem.c
index 1feed6a2b12a..0beaa1d899aa 100644
--- a/lib/show_mem.c
+++ b/lib/show_mem.c
@@ -9,13 +9,13 @@
#include <linux/quicklist.h>
#include <linux/cma.h>
-void show_mem(unsigned int filter)
+void show_mem(unsigned int filter, nodemask_t *nodemask)
pg_data_t *pgdat;
unsigned long total = 0, reserved = 0, highmem = 0;
- show_free_areas(filter);
+ show_free_areas(filter, nodemask);
for_each_online_pgdat(pgdat) {
unsigned long flags;