mm: memory hotplug with an existing resource (62cedb9f) · Commits · 戴 / test

include/linux/memory_hotplug.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -11,6 +11,7 @@ struct zone;
	struct pglist_data;		struct pglist_data;
	struct mem_section;		struct mem_section;
	struct memory_block;		struct memory_block;
			struct resource;

	#ifdef CONFIG_MEMORY_HOTPLUG		#ifdef CONFIG_MEMORY_HOTPLUG

	@@ -266,6 +267,7 @@ static inline void remove_memory(int nid, u64 start, u64 size) {}
	extern int walk_memory_range(unsigned long start_pfn, unsigned long end_pfn,		extern int walk_memory_range(unsigned long start_pfn, unsigned long end_pfn,
	void arg, int (func)(struct memory_block , void ));		void arg, int (func)(struct memory_block , void ));
	extern int add_memory(int nid, u64 start, u64 size);		extern int add_memory(int nid, u64 start, u64 size);
			extern int add_memory_resource(int nid, struct resource *resource);
	extern int zone_for_memory(int nid, u64 start, u64 size, int zone_default,		extern int zone_for_memory(int nid, u64 start, u64 size, int zone_default,
	bool for_device);		bool for_device);
	extern int arch_add_memory(int nid, u64 start, u64 size, bool for_device);		extern int arch_add_memory(int nid, u64 start, u64 size, bool for_device);

mm/memory_hotplug.c

+21 −8

Original line number	Original line	Diff line number	Diff line
	@@ -1232,23 +1232,21 @@ int zone_for_memory(int nid, u64 start, u64 size, int zone_default,
	}		}

	/* we are OK calling __meminit stuff here - we have CONFIG_MEMORY_HOTPLUG */		/* we are OK calling __meminit stuff here - we have CONFIG_MEMORY_HOTPLUG */
	int __ref add_memory(int nid, u64 start, u64 size)		int __ref add_memory_resource(int nid, struct resource *res)
	{		{
			u64 start, size;
	pg_data_t *pgdat = NULL;		pg_data_t *pgdat = NULL;
	bool new_pgdat;		bool new_pgdat;
	bool new_node;		bool new_node;
	struct resource *res;
	int ret;		int ret;

			start = res->start;
			size = resource_size(res);

	ret = check_hotplug_memory_range(start, size);		ret = check_hotplug_memory_range(start, size);
	if (ret)		if (ret)
	return ret;		return ret;

	res = register_memory_resource(start, size);
	ret = -EEXIST;
	if (!res)
	return ret;

	{ /* Stupid hack to suppress address-never-null warning */		{ /* Stupid hack to suppress address-never-null warning */
	void *p = NODE_DATA(nid);		void *p = NODE_DATA(nid);
	new_pgdat = !p;		new_pgdat = !p;
	@@ -1300,13 +1298,28 @@ error:
	/* rollback pgdat allocation and others */		/* rollback pgdat allocation and others */
	if (new_pgdat)		if (new_pgdat)
	rollback_node_hotadd(nid, pgdat);		rollback_node_hotadd(nid, pgdat);
	release_memory_resource(res);
	memblock_remove(start, size);		memblock_remove(start, size);

	out:		out:
	mem_hotplug_done();		mem_hotplug_done();
	return ret;		return ret;
	}		}
			EXPORT_SYMBOL_GPL(add_memory_resource);

			int __ref add_memory(int nid, u64 start, u64 size)
			{
			struct resource *res;
			int ret;

			res = register_memory_resource(start, size);
			if (!res)
			return -EEXIST;

			ret = add_memory_resource(nid, res);
			if (ret < 0)
			release_memory_resource(res);
			return ret;
			}
	EXPORT_SYMBOL_GPL(add_memory);		EXPORT_SYMBOL_GPL(add_memory);

	#ifdef CONFIG_MEMORY_HOTREMOVE		#ifdef CONFIG_MEMORY_HOTREMOVE

Admin message