mm-memory_hotplug-memhp_merge_resource-to-specify-merging-of-system-ram-resources.patch removed from -mm tree
The patch titled
Subject: mm/memory_hotplug: MEMHP_MERGE_RESOURCE to specify merging of System RAM resources
has been removed from the -mm tree. Its filename was
mm-memory_hotplug-memhp_merge_resource-to-specify-merging-of-system-ram-resources.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: David Hildenbrand <[email protected]>
Subject: mm/memory_hotplug: MEMHP_MERGE_RESOURCE to specify merging of System RAM resources
Some add_memory*() users add memory in small, contiguous memory blocks. Examples include virtio-mem, hyper-v balloon, and the XEN balloon.
This can quickly result in a lot of memory resources, whereby the actual resource boundaries are not of interest (e.g., it might be relevant for DIMMs, exposed via /proc/iomem to user space). We really want to merge added resources in this scenario where possible.
Let's provide a flag (MEMHP_MERGE_RESOURCE) to specify that a resource either created within add_memory*() or passed via add_memory_resource() shall be marked mergeable and merged with applicable siblings.
To implement that, we need a kernel/resource interface to mark selected System RAM resources mergeable (IORESOURCE_SYSRAM_MERGEABLE) and trigger merging.
Note: We really want to merge after the whole operation succeeded, not directly when adding a resource to the resource tree (it would break add_memory_resource() and require splitting resources again when the operation failed - e.g., due to -ENOMEM).
---
include/linux/ioport.h | 4 ++ include/linux/memory_hotplug.h | 7 +++ kernel/resource.c | 60 +++++++++++++++++++++++++++++++ mm/memory_hotplug.c | 7 +++ 4 files changed, 78 insertions(+)
include/linux/ioport.h renamed from include/linux/ioport.h~mm-memory_hotplug-memhp_merge_resource-to-specify-merging-of-system-ram-resources +4 -0
@@ -60,6 +60,7 @@ struct resource {/* IORESOURCE_SYSRAM specific bits. */ #define IORESOURCE_SYSRAM_DRIVER_MANAGED 0x02000000/* Always detected via a driver. */ +#define IORESOURCE_SYSRAM_MERGEABLE 0x04000000/* Resource can be merged. */ #define IORESOURCE_EXCLUSIVE 0x08000000/* Userland may not map this resource */
@@ -253,6 +254,9 @@ extern void __release_region(struct resoextern void release_mem_region_adjustable (struct resource *,resource_size_t ,resource_size_t );#endif +#ifdef CONFIG_MEMORY_HOTPLUG +extern void merge_system_ram_resource (struct resource *res); +#endif /* Wrappers for managed devices */ struct device ;
include/linux/memory_hotplug.h renamed from include/linux/memory_hotplug.h~mm-memory_hotplug-memhp_merge_resource-to-specify-merging-of-system-ram-resources +7 -0
@@ -62,6 +62,13 @@ typedef int __bitwise mhp_t;/* No special request */ #define MHP_NONE ((__force mhp_t)0) +/* +* Allow merging of the added System RAM resource with adjacent, +* mergeable resources. After a successful call to add_memory_resource() +* 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))/* * Extended parameters for memory hotplug:
kernel/resource.c renamed from kernel/resource.c~mm-memory_hotplug-memhp_merge_resource-to-specify-merging-of-system-ram-resources +60 -0
66 lines not on this page · raw message
mm/memory_hotplug.c renamed from mm/memory_hotplug.c~mm-memory_hotplug-memhp_merge_resource-to-specify-merging-of-system-ram-resources +7 -0
@@ -1103,6 +1103,13 @@ int __ref add_memory_resource(int nid, s/* device_online() will take the lock when calling online_pages() */ mem_hotplug_done (); +/* +* In case we're allowed to merge the resource, flag it and trigger +* merging now that adding succeeded. +*/ +if (mhp_flags &MEMHP_MERGE_RESOURCE ) +merge_system_ram_resource (res); +/* online pages if requested */ if (memhp_default_online_type !=MMOP_OFFLINE )walk_memory_blocks (start, size,NULL , online_memory_block);
_
Patches currently in -mm which might be from [email protected] are