mm/memory_hotplug: MEMHP_MERGE_RESOURCE -> MHP_MERGE_RESOURCE
Subsystems (7)
PATCH 1/1 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/[email protected]/
--- drivers/hv/hv_balloon.c | 2 +- drivers/virtio/virtio_mem.c | 2 +- drivers/xen/balloon.c | 2 +- include/linux/memory_hotplug.h | 2 +- mm/memory_hotplug.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
drivers/hv/hv_balloon.c +1 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 */
Signature · 1 line
2.29.2
Quoted 16 lines · David Hildenbrand
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/[email protected]/
Cc Andrew Morton <[email protected]>Cc "K. Y. Srinivasan" <[email protected]>Cc Haiyang Zhang <[email protected]>Cc Stephen Hemminger <[email protected]>Cc Wei Liu <[email protected]>Cc "Michael S. Tsirkin" <[email protected]>Cc Jason Wang <[email protected]>Cc Boris Ostrovsky <[email protected]>Cc Juergen Gross <[email protected]>Cc Stefano Stabellini <[email protected]>
Quoted 8 lines
Cc Pankaj Gupta <[email protected]>Cc Michal Hocko <[email protected]>Cc Oscar Salvador <[email protected]>Cc Anshuman Khandual <[email protected]>Cc Wei Yang <[email protected]>Cc [email protected]> Signed-off-by: David Hildenbrand <[email protected]>
Quoted 74 lines
--- drivers/hv/hv_balloon.c | 2 +- drivers/virtio/virtio_mem.c | 2 +- drivers/xen/balloon.c | 2 +- include/linux/memory_hotplug.h | 2 +- mm/memory_hotplug.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)drivers/hv/hv_balloon.c +1
-1@@ -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@@ -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@@ -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@@ -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@@ -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 */
Quoted 17 lines · David Hildenbrand
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/[email protected]/
Cc Andrew Morton <[email protected]>Cc "K. Y. Srinivasan" <[email protected]>Cc Haiyang Zhang <[email protected]>Cc Stephen Hemminger <[email protected]>Cc Wei Liu <[email protected]>Cc "Michael S. Tsirkin" <[email protected]>Cc Jason Wang <[email protected]>Cc Boris Ostrovsky <[email protected]>Cc Juergen Gross <[email protected]>Cc Stefano Stabellini <[email protected]>Cc Pankaj Gupta <[email protected]>
Quoted 8 lines
Cc Michal Hocko <[email protected]>Cc Oscar Salvador <[email protected]>Cc Anshuman Khandual <[email protected]>Cc Wei Yang <[email protected]>Signed-off-by David Hildenbrand <[email protected]>
Quoted 75 lines
--- drivers/hv/hv_balloon.c | 2 +- drivers/virtio/virtio_mem.c | 2 +- drivers/xen/balloon.c | 2 +- include/linux/memory_hotplug.h | 2 +- mm/memory_hotplug.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)drivers/hv/hv_balloon.c +1
-1@@ -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@@ -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@@ -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@@ -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@@ -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 */ Signature · 1 line
2.29.2
Quoted 17 lines · David Hildenbrand
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/[email protected]/
Cc Andrew Morton <[email protected]>Cc "K. Y. Srinivasan" <[email protected]>Cc Haiyang Zhang <[email protected]>Cc Stephen Hemminger <[email protected]>Cc Wei Liu <[email protected]>Cc "Michael S. Tsirkin" <[email protected]>Cc Jason Wang <[email protected]>Cc Boris Ostrovsky <[email protected]>Cc Juergen Gross <[email protected]>Cc Stefano Stabellini <[email protected]>Cc Pankaj Gupta <[email protected]>
Quoted 8 lines
Cc Michal Hocko <[email protected]>Cc Oscar Salvador <[email protected]>Cc Anshuman Khandual <[email protected]>Cc Wei Yang <[email protected]>Signed-off-by David Hildenbrand <[email protected]>
Signature · 2 lines
Oscar Salvador SUSE L3
Quoted 6 lines · David Hildenbrand
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.
[...]
Quoted 1 line
Signed-off-by David Hildenbrand <[email protected]>
Quoted 90 lines
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/[email protected]/
Cc Andrew Morton <[email protected]>Cc "K. Y. Srinivasan" <[email protected]>Cc Haiyang Zhang <[email protected]>Cc Stephen Hemminger <[email protected]>Cc Wei Liu <[email protected]>Cc "Michael S. Tsirkin" <[email protected]>Cc Jason Wang <[email protected]>Cc Boris Ostrovsky <[email protected]>Cc Juergen Gross <[email protected]>Cc Stefano Stabellini <[email protected]>Cc Pankaj Gupta <[email protected]>Cc Michal Hocko <[email protected]>Cc Oscar Salvador <[email protected]>Cc Anshuman Khandual <[email protected]>Cc Wei Yang <[email protected]>Signed-off-by David Hildenbrand <[email protected]>--- drivers/hv/hv_balloon.c | 2 +- drivers/virtio/virtio_mem.c | 2 +- drivers/xen/balloon.c | 2 +- include/linux/memory_hotplug.h | 2 +- mm/memory_hotplug.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)drivers/hv/hv_balloon.c +1
-1@@ -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@@ -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@@ -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@@ -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 +0
-0
mm/memory_hotplug.c int __ref add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags) · line 1159
Quoted 8 lines
mm/memory_hotplug.c +1
-1@@ -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 */