Commit b93e0f32 authored by Michal Hocko's avatar Michal Hocko Committed by Linus Torvalds
Browse files

mm, memory_hotplug: get rid of zonelists_mutex 

zonelists_mutex was introduced by commit 4eaf3f64 ("mem-hotplug: fix
potential race while building zonelist for new populated zone") to
protect zonelist building from races.  This is no longer needed though
because both memory online and offline are fully serialized.  New users
have grown since then.

Notably setup_per_zone_wmarks wants to prevent from races between memory
hotplug, khugepaged setup and manual min_free_kbytes update via sysctl
(see cfd3da1e ("mm: Serialize access to min_free_kbytes").  Let's
add a private lock for that purpose.  This will not prevent from seeing
halfway through memory hotplug operation but that shouldn't be a big
deal becuse memory hotplug will update watermarks explicitly so we will
eventually get a full picture.  The lock just makes sure we won't race
when updating watermarks leading to weird results.

Also __build_all_zonelists manipulates global data so add a private lock
for it as well.  This doesn't seem to be necessary today but it is more
robust to have a lock there.

While we are at it make sure we document that memory online/offline
depends on a full serialization either via mem_hotplug_begin() or
device_lock.

Link: http://lkml.kernel.org/r/20170721143915.14161-9-mhocko@kernel.org


Signed-off-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Joonsoo Kim <js1304@gmail.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Shaohua Li <shaohua.li@intel.com>
Cc: Toshi Kani <toshi.kani@hpe.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Haicheng Li <haicheng.li@linux.intel.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 11cd8638

include/linux/mmzone.h

+0 −1
Original line number Diff line number Diff line
@@ -770,7 +770,6 @@ static inline bool is_dev_zone(const struct zone *zone) 


#include <linux/memory_hotplug.h>



extern struct mutex zonelists_mutex;

void build_all_zonelists(pg_data_t *pgdat);

void wakeup_kswapd(struct zone *zone, int order, enum zone_type classzone_idx);

bool __zone_watermark_ok(struct zone *z, unsigned int order, unsigned long mark,

mm/memory_hotplug.c

+2 −10
Original line number Diff line number Diff line
@@ -897,7 +897,7 @@ static struct zone * __meminit move_pfn_range(int online_type, int nid, 
	return zone;

}



/* Must be protected by mem_hotplug_begin() */

/* Must be protected by mem_hotplug_begin() or a device_lock */

int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_type)

{

	unsigned long flags;
@@ -926,7 +926,6 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_typ 
	 * This means the page allocator ignores this zone.

	 * So, zonelist must be updated after online.

	 */

	mutex_lock(&zonelists_mutex);

	if (!populated_zone(zone)) {

		need_zonelists_rebuild = 1;

		setup_zone_pageset(zone);
@@ -937,7 +936,6 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_typ 
	if (ret) {

		if (need_zonelists_rebuild)

			zone_pcp_reset(zone);

		mutex_unlock(&zonelists_mutex);

		goto failed_addition;

	}
@@ -955,8 +953,6 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_typ 
			zone_pcp_update(zone);

	}



	mutex_unlock(&zonelists_mutex);



	init_per_zone_wmark_min();



	if (onlined_pages) {
@@ -1027,9 +1023,7 @@ static pg_data_t __ref *hotadd_new_pgdat(int nid, u64 start) 
	 * The node we allocated has no zone fallback lists. For avoiding

	 * to access not-initialized zonelist, build here.

	 */

	mutex_lock(&zonelists_mutex);

	build_all_zonelists(pgdat);

	mutex_unlock(&zonelists_mutex);



	/*

	 * zone->managed_pages is set to an approximate value in
@@ -1696,9 +1690,7 @@ repeat: 


	if (!populated_zone(zone)) {

		zone_pcp_reset(zone);

		mutex_lock(&zonelists_mutex);

		build_all_zonelists(NULL);

		mutex_unlock(&zonelists_mutex);

	} else

		zone_pcp_update(zone);
@@ -1724,7 +1716,7 @@ failed_removal: 
	return ret;

}



/* Must be protected by mem_hotplug_begin() */

/* Must be protected by mem_hotplug_begin() or a device_lock */

int offline_pages(unsigned long start_pfn, unsigned long nr_pages)

{

	return __offline_pages(start_pfn, start_pfn + nr_pages, 120 * HZ);

mm/page_alloc.c

+9 −9
Original line number Diff line number Diff line
@@ -5131,17 +5131,14 @@ static void setup_pageset(struct per_cpu_pageset *p, unsigned long batch); 
static DEFINE_PER_CPU(struct per_cpu_pageset, boot_pageset);

static DEFINE_PER_CPU(struct per_cpu_nodestat, boot_nodestats);



/*

 * Global mutex to protect against size modification of zonelists

 * as well as to serialize pageset setup for the new populated zone.

 */

DEFINE_MUTEX(zonelists_mutex);



static void __build_all_zonelists(void *data)

{

	int nid;

	int __maybe_unused cpu;

	pg_data_t *self = data;

	static DEFINE_SPINLOCK(lock);



	spin_lock(&lock);



#ifdef CONFIG_NUMA

	memset(node_load, 0, sizeof(node_load));
@@ -5173,6 +5170,8 @@ static void __build_all_zonelists(void *data) 
			set_cpu_numa_mem(cpu, local_memory_node(cpu_to_node(cpu)));

#endif

	}



	spin_unlock(&lock);

}



static noinline void __init
@@ -5203,7 +5202,6 @@ build_all_zonelists_init(void) 
}



/*

 * Called with zonelists_mutex held always

 * unless system_state == SYSTEM_BOOTING.

 *

 * __ref due to call of __init annotated helper build_all_zonelists_init
@@ -6939,9 +6937,11 @@ static void __setup_per_zone_wmarks(void) 
 */

void setup_per_zone_wmarks(void)

{

	mutex_lock(&zonelists_mutex);

	static DEFINE_SPINLOCK(lock);



	spin_lock(&lock);

	__setup_per_zone_wmarks();

	mutex_unlock(&zonelists_mutex);

	spin_unlock(&lock);

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE