Commit 26011267 authored by David Hildenbrand's avatar David Hildenbrand Committed by Linus Torvalds
Browse files

mm/memory_hotplug: MEMHP_MERGE_RESOURCE -> MHP_MERGE_RESOURCE 

Let's make "MEMHP_MERGE_RESOURCE" consistent with "MHP_NONE", "mhp_t" and
"mhp_flags".  As discussed recently [1], "mhp" is our internal acronym for
memory hotplug now.

[1] https://lore.kernel.org/linux-mm/c37de2d0-28a1-4f7d-f944-cfd7d81c334d@redhat.com/

Link: https://lkml.kernel.org/r/20210126115829.10909-1-david@redhat.com


Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarOscar Salvador <osalvador@suse.de>
Acked-by: default avatarWei Liu <wei.liu@kernel.org>
Reviewed-by: default avatarPankaj Gupta <pankaj.gupta@cloud.ionos.com>
Cc: "K. Y. Srinivasan" <kys@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Stephen Hemminger <sthemmin@microsoft.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Wei Yang <richard.weiyang@linux.alibaba.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1adf8b46

drivers/hv/hv_balloon.c

+1 −1
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ static void hv_mem_hot_add(unsigned long start, unsigned long size, 


		nid = memory_add_physaddr_to_nid(PFN_PHYS(start_pfn));

		ret = add_memory(nid, PFN_PHYS((start_pfn)),

				(HA_CHUNK << PAGE_SHIFT), MEMHP_MERGE_RESOURCE);

				(HA_CHUNK << PAGE_SHIFT), MHP_MERGE_RESOURCE);



		if (ret) {

			pr_err("hot_add memory failed error is %d\n", ret);

drivers/virtio/virtio_mem.c

+1 −1
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ static int virtio_mem_add_memory(struct virtio_mem *vm, uint64_t addr, 
	/* Memory might get onlined immediately. */

	atomic64_add(size, &vm->offline_size);

	rc = add_memory_driver_managed(vm->nid, addr, size, vm->resource_name,

				       MEMHP_MERGE_RESOURCE);

				       MHP_MERGE_RESOURCE);

	if (rc) {

		atomic64_sub(size, &vm->offline_size);

		dev_warn(&vm->vdev->dev, "adding memory failed: %d\n", rc);

drivers/xen/balloon.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static enum bp_state reserve_additional_memory(void) 
	mutex_unlock(&balloon_mutex);

	/* add_memory_resource() requires the device_hotplug lock */

	lock_device_hotplug();

	rc = add_memory_resource(nid, resource, MEMHP_MERGE_RESOURCE);

	rc = add_memory_resource(nid, resource, MHP_MERGE_RESOURCE);

	unlock_device_hotplug();

	mutex_lock(&balloon_mutex);

include/linux/memory_hotplug.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ typedef int __bitwise mhp_t; 
 * with this flag set, the resource pointer must no longer be used as it

 * might be stale, or the resource might have changed.

 */

#define MEMHP_MERGE_RESOURCE	((__force mhp_t)BIT(0))

#define MHP_MERGE_RESOURCE	((__force mhp_t)BIT(0))



/*

 * Extended parameters for memory hotplug:

mm/memory_hotplug.c

+1 −1
Original line number Diff line number Diff line
@@ -1153,7 +1153,7 @@ int __ref add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags) 
	 * In case we're allowed to merge the resource, flag it and trigger

	 * merging now that adding succeeded.

	 */

	if (mhp_flags & MEMHP_MERGE_RESOURCE)

	if (mhp_flags & MHP_MERGE_RESOURCE)

		merge_system_ram_resource(res);



	/* online pages if requested */