mm/memory_hotplug: selective merging of system ram resources
Subsystems (16)
v3 cover mm/memory_hotplug: selective 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.
Resources are effectively stored in a list-based tree. Having a lot of resources not only wastes memory, it also makes traversing that tree more expensive, and makes /proc/iomem explode in size (e.g., requiring kexec-tools to manually merge resources when creating a kdump header. The current kexec-tools resource count limit does not allow for more than ~100GB of memory with a memory block size of 128MB on x86-64).
Let's allow to selectively merge system ram resources by specifying a new flag for add_memory*(). Patch #5 contains a /proc/iomem example. Only tested with virtio-mem.
v2 -> v3:
- "mm/memory_hotplug: prepare passing flags to add_memory() and friends" -- Use proper __bitwise type for flags
-- Use "MHP_NONE" for empty flags
- Rebased to latest -next, added rb's
v1 -> v2:
- I had another look at v1 after vacation and didn't like it - it felt like a hack. So I want forward and added a proper flag to add_memory*(), and introduce a clean (non-racy) way to mark System RAM resources mergeable.
- "kernel/resource: move and rename IORESOURCE_MEM_DRIVER_MANAGED" -- Clean that flag up, felt wrong in the PnP section
- "mm/memory_hotplug: prepare passing flags to add_memory() and friends" -- Previously sent in other context - decided to keep Wei's ack
- "mm/memory_hotplug: MEMHP_MERGE_RESOURCE to specify merging of System RAM resources"
-- Cleaner approach to get the job done by using proper flags and only
merging the single, specified resource
- "virtio-mem: try to merge system ram resources"
"xen/balloon: try to merge system ram resources"
"hv_balloon: try to merge system ram resources"
-- Use the new flag MEMHP_MERGE_RESOURCE, much cleaner
RFC -> v1:
- Switch from rather generic "merge_child_mem_resources()" where a resource name has to be specified to "merge_system_ram_resources().
- Smaller comment/documentation/patch description changes/fixes
David Hildenbrand (7):
kernel/resource: make release_mem_region_adjustable() never fail kernel/resource: move and rename IORESOURCE_MEM_DRIVER_MANAGED mm/memory_hotplug: prepare passing flags to add_memory() and friends mm/memory_hotplug: MEMHP_MERGE_RESOURCE to specify merging of System
RAM resources
virtio-mem: try to merge system ram resources xen/balloon: try to merge system ram resources
hv_balloon: try to merge system ram resources
arch/powerpc/platforms/powernv/memtrace.c | 2 +- .../platforms/pseries/hotplug-memory.c | 2 +- drivers/acpi/acpi_memhotplug.c | 3 +- drivers/base/memory.c | 3 +- drivers/dax/kmem.c | 2 +- drivers/hv/hv_balloon.c | 2 +- drivers/s390/char/sclp_cmd.c | 2 +- drivers/virtio/virtio_mem.c | 3 +- drivers/xen/balloon.c | 2 +- include/linux/ioport.h | 12 +- include/linux/memory_hotplug.h | 23 +++- kernel/kexec_file.c | 2 +- kernel/resource.c | 109 ++++++++++++++---- mm/memory_hotplug.c | 47 +++----- 14 files changed, 146 insertions(+), 68 deletions(-)
Signature · 1 line
2.26.2
PATCH v3 1/7 kernel/resource: make release_mem_region_adjustable() never fail
Let's make sure splitting a resource on memory hotunplug will never fail. This will become more relevant once we merge selected System RAM resources - then, we'll trigger that case more often on memory hotunplug.
In general, this function is already unlikely to fail. When we remove memory, we free up quite a lot of metadata (memmap, page tables, memory block device, etc.). The only reason it could really fail would be when injecting allocation errors.
All other error cases inside release_mem_region_adjustable() seem to be sanity checks if the function would be abused in different context - let's add WARN_ON_ONCE() in these cases so we can catch them.
--- include/linux/ioport.h | 4 ++-- kernel/resource.c | 49 ++++++++++++++++++++++++------------------ mm/memory_hotplug.c | 22 +------------------ 3 files changed, 31 insertions(+), 44 deletions(-)
include/linux/ioport.h +2 -2
@@ -248,8 +248,8 @@ extern struct resource * __request_region(struct resource *,extern void __release_region (struct resource *,resource_size_t ,resource_size_t );#ifdef CONFIG_MEMORY_HOTREMOVE -extern int release_mem_region_adjustable (struct resource *,resource_size_t , -resource_size_t ); +extern void release_mem_region_adjustable (struct resource *,resource_size_t , +resource_size_t );#endif /* Wrappers for managed devices */
kernel/resource.c +28 -21
92 lines not on this page · raw message
mm/memory_hotplug.c +1 -21
@@ -1724,26 +1724,6 @@ void try_offline_node(int nid) }EXPORT_SYMBOL (try_offline_node); -static void __release_memory_resource (resource_size_t start, -resource_size_t size) -{ -int ret; - -/* -* When removing memory in the same granularity as it was added, -* this function never fails. It might only fail if resources -* have to be adjusted or split. We'll ignore the error, as -* removing of memory cannot fail. -*/ - ret =release_mem_region_adjustable (&iomem_resource, start, size); -if (ret) { -resource_size_t endres = start + size -1 ; - -pr_warn ("Unable to release resource <%pa-%pa> (%d)\n" , - &start, &endres, ret); - } -} -static int __ref try_remove_memory (int nid,u64 start,u64 size) {int rc =0 ;
@@ -1777,7 +1757,7 @@ static int __ref try_remove_memory(int nid, u64 start, u64 size)memblock_remove (start, size); } -__release_memory_resource (start, size); +release_mem_region_adjustable (&iomem_resource, start, size);try_offline_node (nid);
Signature · 1 line
2.26.2
PATCH v3 2/7 kernel/resource: move and rename IORESOURCE_MEM_DRIVER_MANAGED
In reply to David HildenbrandIORESOURCE_MEM_DRIVER_MANAGED currently uses an unused PnP bit, which is always set to 0 by hardware. This is far from beautiful (and confusing), and the bit only applies to SYSRAM. So let's move it out of the bus-specific (PnP) defined bits.
We'll add another SYSRAM specific bit soon. If we ever need more bits for other purposes, we can steal some from "desc", or reshuffle/regroup what we have.
--- include/linux/ioport.h | 4 +++- kernel/kexec_file.c | 2 +- mm/memory_hotplug.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-)
include/linux/ioport.h +3 -1
@@ -58,6 +58,9 @@ struct resource {#define IORESOURCE_EXT_TYPE_BITS 0x01000000/* Resource extended types */ #define IORESOURCE_SYSRAM 0x01000000/* System RAM (modifier) */ +/* IORESOURCE_SYSRAM specific bits. */ +#define IORESOURCE_SYSRAM_DRIVER_MANAGED 0x02000000/* Always detected via a driver. */ +#define IORESOURCE_EXCLUSIVE 0x08000000/* Userland may not map this resource */ #define IORESOURCE_DISABLED 0x10000000
@@ -103,7 +106,6 @@ struct resource {#define IORESOURCE_MEM_32BIT (3<<3)#define IORESOURCE_MEM_SHADOWABLE (1<<5)/* dup: IORESOURCE_SHADOWABLE */ #define IORESOURCE_MEM_EXPANSIONROM (1<<6) -#define IORESOURCE_MEM_DRIVER_MANAGED (1<<7)/* PnP I/O specific bits (IORESOURCE_BITS) */ #define IORESOURCE_IO_16BIT_ADDR (1<<0)
kernel/kexec_file.c +1 -1
@@ -520,7 +520,7 @@ static int locate_mem_hole_callback(struct resource *res, void *arg)/* Returning 0 will take to next memory range */ /* Don't use memory that will be detected and handled by a driver. */ -if (res->flags &IORESOURCE_MEM_DRIVER_MANAGED ) +if (res->flags &IORESOURCE_SYSRAM_DRIVER_MANAGED )return 0 ;if (sz < kbuf->memsz)
mm/memory_hotplug.c +2 -2
@@ -105,7 +105,7 @@ static struct resource *register_memory_resource(u64 start, u64 size,unsigned long flags =IORESOURCE_SYSTEM_RAM |IORESOURCE_BUSY ;if (strcmp (resource_name,"System RAM" )) - flags |=IORESOURCE_MEM_DRIVER_MANAGED ; + flags |=IORESOURCE_SYSRAM_DRIVER_MANAGED ;/* * Make sure value parsed from 'mem=' only restricts memory adding
@@ -1160,7 +1160,7 @@ EXPORT_SYMBOL_GPL(add_memory);* * For this memory, no entries in /sys/firmware/memmap ("raw firmware-provided * memory map") are created. Also, the created memory resource is flagged -* with IORESOURCE_MEM_DRIVER_MANAGED, so in-kernel users can special-case +* with IORESOURCE_SYSRAM_DRIVER_MANAGED, so in-kernel users can special-case * this memory as well (esp., not place kexec images onto it). * * The resource_name (visible via /proc/iomem) has to have the format
Signature · 7 lines
2.26.2 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
PATCH v3 3/7 mm/memory_hotplug: prepare passing flags to add_memory() and friends
In reply to David HildenbrandWe soon want to pass flags, e.g., to mark added System RAM resources. mergeable. Prepare for that.
This patch is based on a similar patch by Oscar Salvador:
https://lkml.kernel.org/r/[email protected]
--- arch/powerpc/platforms/powernv/memtrace.c | 2 +- arch/powerpc/platforms/pseries/hotplug-memory.c | 2 +- drivers/acpi/acpi_memhotplug.c | 3 ++- drivers/base/memory.c | 3 ++- drivers/dax/kmem.c | 2 +- drivers/hv/hv_balloon.c | 2 +- drivers/s390/char/sclp_cmd.c | 2 +- drivers/virtio/virtio_mem.c | 2 +- drivers/xen/balloon.c | 2 +- include/linux/memory_hotplug.h | 16 ++++++++++++---- mm/memory_hotplug.c | 14 +++++++------- 11 files changed, 30 insertions(+), 20 deletions(-)
arch/powerpc/platforms/powernv/memtrace.c +1 -1
@@ -224,7 +224,7 @@ static int memtrace_online(void) ent->mem =0 ; } -if (add_memory (ent->nid, ent->start, ent->size)) { +if (add_memory (ent->nid, ent->start, ent->size,MHP_NONE )) {pr_err ("Failed to add trace memory to node %d\n" , ent->nid); ret +=1 ;
arch/powerpc/platforms/pseries/hotplug-memory.c +1 -1
@@ -615,7 +615,7 @@ static int dlpar_add_lmb(struct drmem_lmb *lmb) nid =memory_add_physaddr_to_nid (lmb->base_addr);/* Add the memory */ - rc =__add_memory (nid, lmb->base_addr, block_sz); + rc =__add_memory (nid, lmb->base_addr, block_sz,MHP_NONE );if (rc) {invalidate_lmb_associativity_index (lmb);return rc;
drivers/acpi/acpi_memhotplug.c +2 -1
@@ -207,7 +207,8 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)if (node <0 ) node =memory_add_physaddr_to_nid (info->start_addr); - result =__add_memory (node, info->start_addr, info->length); + result =__add_memory (node, info->start_addr, info->length, +MHP_NONE );/* * If the memory block has been used by the kernel, add_memory()
drivers/base/memory.c +2 -1
@@ -432,7 +432,8 @@ static ssize_t probe_store(struct device *dev, struct device_attribute *attr, nid =memory_add_physaddr_to_nid (phys_addr); ret =__add_memory (nid, phys_addr, -MIN_MEMORY_BLOCK_SIZE * sections_per_block); +MIN_MEMORY_BLOCK_SIZE * sections_per_block, +MHP_NONE );if (ret) goto out;
drivers/dax/kmem.c +1 -1
@@ -95,7 +95,7 @@ int dev_dax_kmem_probe(struct dev_dax *dev_dax)* this as RAM automatically. */ rc =add_memory_driver_managed (numa_node, range.start, -range_len (&range), kmem_name); +range_len (&range), kmem_name,MHP_NONE ); res->flags |=IORESOURCE_BUSY ;if (rc) {
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 )); + (HA_CHUNK <<PAGE_SHIFT ),MHP_NONE );if (ret) {pr_err ("hot_add memory failed error is %d\n" , ret);
drivers/s390/char/sclp_cmd.c +1 -1
@@ -406,7 +406,7 @@ static void __init add_memory_merged(u16 rn)if (!size) goto skip_add;for (addr = start; addr < start + size; addr += block_size) -add_memory (0 , addr, block_size); +add_memory (0 , addr, block_size,MHP_NONE ); skip_add: first_rn = rn; num =1 ;
drivers/virtio/virtio_mem.c +1 -1
@@ -424,7 +424,7 @@ static int virtio_mem_mb_add(struct virtio_mem *vm, unsigned long mb_id)dev_dbg (&vm->vdev->dev,"adding memory block: %lu\n" , mb_id);return add_memory_driver_managed (nid, addr,memory_block_size_bytes (), - vm->resource_name); + vm->resource_name,MHP_NONE ); }/*
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); + rc =add_memory_resource (nid, resource,MHP_NONE );unlock_device_hotplug ();mutex_lock (&balloon_mutex);
include/linux/memory_hotplug.h +12 -4
@@ -57,6 +57,12 @@ enum { MMOP_ONLINE_MOVABLE, }; +/* Flags for add_memory() and friends to specify memory hotplug details. */ +typedef int __bitwise mhp_t ; + +/* No special request */ +#define MHP_NONE ((__force mhp_t)0) +/* * Extended parameters for memory hotplug: * altmap: alternative allocator for memmap array (optional)
@@ -345,11 +351,13 @@ extern void set_zone_contiguous(struct zone *zone);extern void clear_zone_contiguous (struct zone *zone);extern void __ref free_area_init_core_hotplug (int nid); -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 __add_memory (int nid,u64 start,u64 size,mhp_t mhp_flags); +extern int add_memory (int nid,u64 start,u64 size,mhp_t mhp_flags); +extern int add_memory_resource (int nid,struct resource *resource, +mhp_t mhp_flags);extern int add_memory_driver_managed (int nid,u64 start,u64 size, -const char *resource_name); +const char *resource_name, +mhp_t mhp_flags);extern void move_pfn_range_to_zone (struct zone *zone,unsigned long start_pfn,unsigned long nr_pages,struct vmem_altmap *altmap,int migratetype);
mm/memory_hotplug.c +7 -7
@@ -1039,7 +1039,7 @@ static int online_memory_block(struct memory_block *mem, void *arg)* * we are OK calling __meminit stuff here - we have CONFIG_MEMORY_HOTPLUG */ -int __ref add_memory_resource (int nid,struct resource *res) +int __ref add_memory_resource (int nid,struct resource *res,mhp_t mhp_flags) {struct mhp_params params = { .pgprot =PAGE_KERNEL };u64 start, size;
@@ -1118,7 +1118,7 @@ int __ref add_memory_resource(int nid, struct resource *res) }/* requires device_hotplug_lock, see add_memory_resource() */ -int __ref __add_memory (int nid,u64 start,u64 size) +int __ref __add_memory (int nid,u64 start,u64 size,mhp_t mhp_flags) {struct resource *res;int ret;
@@ -1127,18 +1127,18 @@ int __ref __add_memory(int nid, u64 start, u64 size)if (IS_ERR (res))return PTR_ERR (res); - ret =add_memory_resource (nid, res); + ret =add_memory_resource (nid, res, mhp_flags);if (ret <0 )release_memory_resource (res);return ret; } -int add_memory (int nid,u64 start,u64 size) +int add_memory (int nid,u64 start,u64 size,mhp_t mhp_flags) {int rc;lock_device_hotplug (); - rc =__add_memory (nid, start, size); + rc =__add_memory (nid, start, size, mhp_flags);unlock_device_hotplug ();return rc;
@@ -1167,7 +1167,7 @@ EXPORT_SYMBOL_GPL(add_memory);* "System RAM ($DRIVER)". */ int add_memory_driver_managed (int nid,u64 start,u64 size, -const char *resource_name) +const char *resource_name,mhp_t mhp_flags) {struct resource *res;int rc;
@@ -1185,7 +1185,7 @@ int add_memory_driver_managed(int nid, u64 start, u64 size, goto out_unlock; } - rc =add_memory_resource (nid, res); + rc =add_memory_resource (nid, res, mhp_flags);if (rc <0 )release_memory_resource (res);
Signature · 1 line
2.26.2
PATCH v3 4/7 mm/memory_hotplug: MEMHP_MERGE_RESOURCE to specify merging of System RAM resources
In reply to David HildenbrandSome 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 +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 resource *, resource_size_t,extern 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 +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 +60 -0
66 lines not on this page · raw message
mm/memory_hotplug.c +7 -0
@@ -1102,6 +1102,13 @@ int __ref add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags)/* 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);
Signature · 1 line
2.26.2
PATCH v3 5/7 virtio-mem: try to merge system ram resources
In reply to David Hildenbrandvirtio-mem adds memory in memory block granularity, to be able to remove it in the same granularity again later, and to grow slowly on demand. This, however, results in quite a lot of resources when adding a lot of memory. Resources are effectively stored in a list-based tree. Having a lot of resources not only wastes memory, it also makes traversing that tree more expensive, and makes /proc/iomem explode in size (e.g., requiring kexec-tools to manually merge resources later when e.g., trying to create a kdump header).
Before this patch, we get (/proc/iomem) when hotplugging 2G via virtio-mem on x86-64:
[...]
100000000-13fffffff : System RAM
140000000-33fffffff : virtio0
140000000-147ffffff : System RAM (virtio_mem)
148000000-14fffffff : System RAM (virtio_mem)
150000000-157ffffff : System RAM (virtio_mem)
158000000-15fffffff : System RAM (virtio_mem)
160000000-167ffffff : System RAM (virtio_mem)
168000000-16fffffff : System RAM (virtio_mem)
170000000-177ffffff : System RAM (virtio_mem)
178000000-17fffffff : System RAM (virtio_mem)
180000000-187ffffff : System RAM (virtio_mem)
188000000-18fffffff : System RAM (virtio_mem)
190000000-197ffffff : System RAM (virtio_mem)
198000000-19fffffff : System RAM (virtio_mem)
1a0000000-1a7ffffff : System RAM (virtio_mem)
1a8000000-1afffffff : System RAM (virtio_mem)
1b0000000-1b7ffffff : System RAM (virtio_mem)
1b8000000-1bfffffff : System RAM (virtio_mem)
3280000000-32ffffffff : PCI Bus 0000:00With this patch, we get (/proc/iomem):
[...]
fffc0000-ffffffff : Reserved
100000000-13fffffff : System RAM
140000000-33fffffff : virtio0
140000000-1bfffffff : System RAM (virtio_mem)
3280000000-32ffffffff : PCI Bus 0000:00Of course, with more hotplugged memory, it gets worse. When unplugging memory blocks again, try_remove_memory() (via offline_and_remove_memory()) will properly split the resource up again.
--- drivers/virtio/virtio_mem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/virtio/virtio_mem.c +2 -1
@@ -424,7 +424,8 @@ static int virtio_mem_mb_add(struct virtio_mem *vm, unsigned long mb_id)dev_dbg (&vm->vdev->dev,"adding memory block: %lu\n" , mb_id);return add_memory_driver_managed (nid, addr,memory_block_size_bytes (), - vm->resource_name,MHP_NONE ); + vm->resource_name, +MEMHP_MERGE_RESOURCE ); }/*
Signature · 4 lines
2.26.2 _______________________________________________ Linux-nvdimm mailing list -- [email protected] To unsubscribe send an email to [email protected]
PATCH v3 6/7 xen/balloon: try to merge system ram resources
In reply to David HildenbrandLet's try to merge system ram resources we add, to minimize the number of resources in /proc/iomem. We don't care about the boundaries of individual chunks we added.
--- drivers/xen/balloon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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,MHP_NONE ); + rc =add_memory_resource (nid, resource,MEMHP_MERGE_RESOURCE );unlock_device_hotplug ();mutex_lock (&balloon_mutex);
Signature · 1 line
2.26.2
PATCH v3 7/7 hv_balloon: try to merge system ram resources
In reply to David HildenbrandLet's try to merge system ram resources we add, to minimize the number of resources in /proc/iomem. We don't care about the boundaries of individual chunks we added.
--- drivers/hv/hv_balloon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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 ),MHP_NONE ); + (HA_CHUNK <<PAGE_SHIFT ),MEMHP_MERGE_RESOURCE );if (ret) {pr_err ("hot_add memory failed error is %d\n" , ret);
Signature · 1 line
2.26.2
Re: [PATCH v3 3/7] mm/memory_hotplug: prepare passing flags to add_memory() and friends
In reply to David HildenbrandQuoted 273 lines
We soon want to pass flags, e.g., to mark added System RAM resources. mergeable. Prepare for that.
This patch is based on a similar patch by Oscar Salvador:
https://lkml.kernel.org/r/[email protected]
Acked-by Wei Liu <[email protected]>Cc Andrew Morton <[email protected]>Cc Michal Hocko <[email protected]>Cc Dan Williams <[email protected]>Cc Jason Gunthorpe <[email protected]>Cc Pankaj Gupta <[email protected]>Cc Baoquan He <[email protected]>Cc Wei Yang <[email protected]>Cc Michael Ellerman <[email protected]>Cc Benjamin Herrenschmidt <[email protected]>Cc Paul Mackerras <[email protected]>Cc "Rafael J. Wysocki" <[email protected]>Cc Len Brown <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Vishal Verma <[email protected]>Cc Dave Jiang <[email protected]>Cc "K. Y. Srinivasan" <[email protected]>Cc Haiyang Zhang <[email protected]>Cc Stephen Hemminger <[email protected]>Cc Wei Liu <[email protected]>Cc Heiko Carstens <[email protected]>Cc Vasily Gorbik <[email protected]>Cc Christian Borntraeger <[email protected]>Cc David Hildenbrand <[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 "Oliver O'Halloran" <[email protected]>Cc Pingfan Liu <[email protected]>Cc Nathan Lynch <[email protected]>Cc Libor Pechacek <[email protected]>Cc Anton Blanchard <[email protected]>Cc Leonardo Bras <[email protected]>Signed-off-by David Hildenbrand <[email protected]>--- arch/powerpc/platforms/powernv/memtrace.c | 2 +- arch/powerpc/platforms/pseries/hotplug-memory.c | 2 +- drivers/acpi/acpi_memhotplug.c | 3 ++- drivers/base/memory.c | 3 ++- drivers/dax/kmem.c | 2 +- drivers/hv/hv_balloon.c | 2 +- drivers/s390/char/sclp_cmd.c | 2 +- drivers/virtio/virtio_mem.c | 2 +- drivers/xen/balloon.c | 2 +- include/linux/memory_hotplug.h | 16 ++++++++++++---- mm/memory_hotplug.c | 14 +++++++------- 11 files changed, 30 insertions(+), 20 deletions(-)arch/powerpc/platforms/powernv/memtrace.c +1
-1@@ -224,7 +224,7 @@ static int memtrace_online(void) ent->mem =0 ; } -if (add_memory (ent->nid, ent->start, ent->size)) { +if (add_memory (ent->nid, ent->start, ent->size,MHP_NONE )) {pr_err ("Failed to add trace memory to node %d\n" , ent->nid); ret +=1 ;arch/powerpc/platforms/pseries/hotplug-memory.c +1
-1@@ -615,7 +615,7 @@ static int dlpar_add_lmb(struct drmem_lmb *lmb) nid =memory_add_physaddr_to_nid (lmb->base_addr);/* Add the memory */ - rc =__add_memory (nid, lmb->base_addr, block_sz); + rc =__add_memory (nid, lmb->base_addr, block_sz,MHP_NONE );if (rc) {invalidate_lmb_associativity_index (lmb);return rc;drivers/acpi/acpi_memhotplug.c +2
-1@@ -207,7 +207,8 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)if (node <0 ) node =memory_add_physaddr_to_nid (info->start_addr); - result =__add_memory (node, info->start_addr, info->length); + result =__add_memory (node, info->start_addr, info->length, +MHP_NONE );/* * If the memory block has been used by the kernel, add_memory() drivers/base/memory.c +2
-1@@ -432,7 +432,8 @@ static ssize_t probe_store(struct device *dev, struct device_attribute *attr, nid =memory_add_physaddr_to_nid (phys_addr); ret =__add_memory (nid, phys_addr, -MIN_MEMORY_BLOCK_SIZE * sections_per_block); +MIN_MEMORY_BLOCK_SIZE * sections_per_block, +MHP_NONE );if (ret) goto out;drivers/dax/kmem.c +1
-1@@ -95,7 +95,7 @@ int dev_dax_kmem_probe(struct dev_dax *dev_dax)* this as RAM automatically. */ rc =add_memory_driver_managed (numa_node, range.start, -range_len (&range), kmem_name); +range_len (&range), kmem_name,MHP_NONE ); res->flags |=IORESOURCE_BUSY ;if (rc) {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 )); + (HA_CHUNK <<PAGE_SHIFT ),MHP_NONE );if (ret) {pr_err ("hot_add memory failed error is %d\n" , ret);drivers/s390/char/sclp_cmd.c +1
-1@@ -406,7 +406,7 @@ static void __init add_memory_merged(u16 rn)if (!size) goto skip_add;for (addr = start; addr < start + size; addr += block_size) -add_memory (0 , addr, block_size); +add_memory (0 , addr, block_size,MHP_NONE ); skip_add: first_rn = rn; num =1 ;drivers/virtio/virtio_mem.c +1
-1@@ -424,7 +424,7 @@ static int virtio_mem_mb_add(struct virtio_mem *vm, unsigned long mb_id)dev_dbg (&vm->vdev->dev,"adding memory block: %lu\n" , mb_id);return add_memory_driver_managed (nid, addr,memory_block_size_bytes (), - vm->resource_name); + vm->resource_name,MHP_NONE ); }/* 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); + rc =add_memory_resource (nid, resource,MHP_NONE );unlock_device_hotplug ();mutex_lock (&balloon_mutex);include/linux/memory_hotplug.h +12
-4@@ -57,6 +57,12 @@ enum { MMOP_ONLINE_MOVABLE, }; +/* Flags for add_memory() and friends to specify memory hotplug details. */ +typedef int __bitwise mhp_t ; + +/* No special request */ +#define MHP_NONE ((__force mhp_t)0) +/* * Extended parameters for memory hotplug: * altmap: alternative allocator for memmap array (optional) @@ -345,11 +351,13 @@ extern void set_zone_contiguous(struct zone *zone);extern void clear_zone_contiguous (struct zone *zone);extern void __ref free_area_init_core_hotplug (int nid); -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 __add_memory (int nid,u64 start,u64 size,mhp_t mhp_flags); +extern int add_memory (int nid,u64 start,u64 size,mhp_t mhp_flags); +extern int add_memory_resource (int nid,struct resource *resource, +mhp_t mhp_flags);extern int add_memory_driver_managed (int nid,u64 start,u64 size, -const char *resource_name); +const char *resource_name, +mhp_t mhp_flags);extern void move_pfn_range_to_zone (struct zone *zone,unsigned long start_pfn,unsigned long nr_pages,struct vmem_altmap *altmap,int migratetype);mm/memory_hotplug.c +6
-6@@ -1039,7 +1039,7 @@ static int online_memory_block(struct memory_block *mem, void *arg)* * we are OK calling __meminit stuff here - we have CONFIG_MEMORY_HOTPLUG */ -int __ref add_memory_resource (int nid,struct resource *res) +int __ref add_memory_resource (int nid,struct resource *res,mhp_t mhp_flags) {struct mhp_params params = { .pgprot =PAGE_KERNEL };u64 start, size;@@ -1118,7 +1118,7 @@ int __ref add_memory_resource(int nid, struct resource *res) }/* requires device_hotplug_lock, see add_memory_resource() */ -int __ref __add_memory (int nid,u64 start,u64 size) +int __ref __add_memory (int nid,u64 start,u64 size,mhp_t mhp_flags) {struct resource *res;int ret;@@ -1127,18 +1127,18 @@ int __ref __add_memory(int nid, u64 start, u64 size)if (IS_ERR (res))return PTR_ERR (res); - ret =add_memory_resource (nid, res); + ret =add_memory_resource (nid, res, mhp_flags);if (ret <0 )release_memory_resource (res);return ret; } -int add_memory (int nid,u64 start,u64 size) +int add_memory (int nid,u64 start,u64 size,mhp_t mhp_flags) {int rc;lock_device_hotplug (); - rc =__add_memory (nid, start, size); + rc =__add_memory (nid, start, size, mhp_flags);unlock_device_hotplug ();return rc;@@ -1167,7 +1167,7 @@ EXPORT_SYMBOL_GPL(add_memory);* "System RAM ($DRIVER)". */ int add_memory_driver_managed (int nid,u64 start,u64 size, -const char *resource_name) +const char *resource_name,mhp_t mhp_flags) {struct resource *res;int rc;
mm/memory_hotplug.c int add_memory_driver_managed(int nid, u64 start, u64 size,
Quoted 9 lines
mm/memory_hotplug.c +1
-2@@ -1185,7 +1185,7 @@ int add_memory_driver_managed(int nid, u64 start, u64 size, goto out_unlock; } - rc =add_memory_resource (nid, res); + rc =add_memory_resource (nid, res, mhp_flags);if (rc <0 )release_memory_resource (res); --
Quoted 2 lines
2.26.2
Re: [PATCH v3 4/7] mm/memory_hotplug: MEMHP_MERGE_RESOURCE to specify merging of System RAM resources
In reply to David HildenbrandLooks good to me.
Re: [PATCH v3 5/7] virtio-mem: try to merge system ram resources
In reply to David Hildenbrandkernel test robot
build botRe: [PATCH v3 3/7] mm/memory_hotplug: prepare passing flags to add_memory() and friends
In reply to David HildenbrandI love your patch! Yet something to improve:
Hi David,
I love your patch! Yet something to improve:
[auto build test ERROR on next-20200909]
[cannot apply to mmotm/master hnaz-linux-mm/master xen-tip/linux-next powerpc/next linus/master v5.9-rc4 v5.9-rc3 v5.9-rc2 v5.9-rc4] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/David-Hildenbrand/mm-memory_hotplug-selective-merging-of-system-ram-resources/20200910-171630 base: 7204eaa2c1f509066486f488c9dcb065d7484494 config: x86_64-randconfig-a016-20200909 (attached as .config) compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project 0a5dc7effb191eff740e0e7ae7bd8e1f6bdb3ad9)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
WARNING: unmet direct dependencies detected for PHY_SAMSUNG_UFS
Depends on OF && (ARCH_EXYNOS || COMPILE_TEST
Selected by
- SCSI_UFS_EXYNOS && SCSI_LOWLEVEL && SCSI && SCSI_UFSHCD_PLATFORM && (ARCH_EXYNOS || COMPILE_TEST In file included from arch/x86/kernel/asm-offsets.c:9:
In file included from include/linux/crypto.h:20:
In file included from include/linux/slab.h:15:
In file included from include/linux/gfp.h:6:
In file included from include/linux/mmzone.h:853:
>> include/linux/memory_hotplug.h:354:55: error: unknown type name 'mhp_t'
extern int __add_memory(int nid, u64 start, u64 size, mhp_t mhp_flags);
^
include/linux/memory_hotplug.h:355:53: error: unknown type name 'mhp_t'
extern int add_memory(int nid, u64 start, u64 size, mhp_t mhp_flags);
^
include/linux/memory_hotplug.h:357:11: error: unknown type name 'mhp_t'
mhp_t mhp_flags);
^
include/linux/memory_hotplug.h:360:10: error: unknown type name 'mhp_t'
mhp_t mhp_flags);
^
4 errors generated.
Makefile Module.symvers System.map arch block certs crypto drivers fs include init ipc kernel lib mm modules.builtin modules.builtin.modinfo modules.order net scripts security sound source tools usr virt vmlinux vmlinux.o vmlinux.symvers [scripts/Makefile.build:117: arch/x86/kernel/asm-offsets.s] Error 1 Target '__build' not remade because of errors.
Makefile Module.symvers System.map arch block certs crypto drivers fs include init ipc kernel lib mm modules.builtin modules.builtin.modinfo modules.order net scripts security sound source tools usr virt vmlinux vmlinux.o vmlinux.symvers [Makefile:1196: prepare0] Error 2 Target 'prepare' not remade because of errors.
make: Makefile Module.symvers System.map arch block certs crypto drivers fs include init ipc kernel lib mm modules.builtin modules.builtin.modinfo modules.order net scripts security sound source tools usr virt vmlinux vmlinux.o vmlinux.symvers [Makefile:185: __sub-make] Error 2
make: Target 'prepare' not remade because of errors.
# https://github.com/0day-ci/linux/commit/d88270d1c0783a7f99f24a85692be90fd2ae0d7d
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review David-Hildenbrand/mm-memory_hotplug-selective-merging-of-system-ram-resources/20200910-171630 git checkout d88270d1c0783a7f99f24a85692be90fd2ae0d7d
vim +/mhp_t +354 include/linux/memory_hotplug.h
352
353 extern void __ref free_area_init_core_hotplug(int nid);
> 354 extern int __add_memory(int nid, u64 start, u64 size, mhp_t mhp_flags);
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]
Re: [PATCH v3 3/7] mm/memory_hotplug: prepare passing flags to add_memory() and friends
Quoted 56 lines · kernel test robot
Hi David,
I love your patch! Yet something to improve:
[auto build test ERROR on next-20200909]
[cannot apply to mmotm/master hnaz-linux-mm/master xen-tip/linux-next powerpc/next linus/master v5.9-rc4 v5.9-rc3 v5.9-rc2 v5.9-rc4] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]url: https://github.com/0day-ci/linux/commits/David-Hildenbrand/mm-memory_hotplug-selective-merging-of-system-ram-resources/20200910-171630 base: 7204eaa2c1f509066486f488c9dcb065d7484494 config: x86_64-randconfig-a016-20200909 (attached as .config) compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project 0a5dc7effb191eff740e0e7ae7bd8e1f6bdb3ad9)reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# installx86_64cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64If you fix the issue, kindly add following tag as appropriate
Reported-by kernel test robot <[email protected]>All errors (new ones prefixed by >>):
WARNING: unmet direct dependencies detected for
PHY_SAMSUNG_UFS
Depends on OF && (ARCH_EXYNOS||COMPILE_TEST
Selected by
-SCSI_UFS_EXYNOS&&SCSI_LOWLEVEL&& SCSI &&SCSI_UFSHCD_PLATFORM&& (ARCH_EXYNOS||COMPILE_TESTIn file included fromarch/x86/kernel/asm-offsets.c:9:
In file included frominclude/linux/crypto.h:20:
In file included frominclude/linux/slab.h:15:
In file included frominclude/linux/gfp.h:6:
In file included frominclude/linux/mmzone.h:853:Quoted 1 line
Quoted 1 line
include/linux/memory_hotplug.h:354:55: error: unknown type name 'mhp_t'extern int
__add_memory(int nid, u64 start, u64 size, mhp_t mhp_flags);
^
include/linux/memory_hotplug.h:355:53: error: unknown type name 'mhp_t'
extern intadd_memory(int nid, u64 start, u64 size, mhp_t mhp_flags);
^
include/linux/memory_hotplug.h:357:11: error: unknown type name 'mhp_t'
mhp_tmhp_flags);
^
include/linux/memory_hotplug.h:360:10: error: unknown type name 'mhp_t'
mhp_tmhp_flags);
^
4 errors generated.
MakefileModule.symvers System.map arch block certs crypto drivers fs include init ipc kernel lib mm modules.builtin modules.builtin.modinfo modules.order net scripts security sound source tools usr virt vmlinux vmlinux.o vmlinux.symvers [scripts/Makefile.build:117:arch/x86/kernel/asm-offsets.s] Error 1 Target '__build' not remade because of errors.
MakefileModule.symvers System.map arch block certs crypto drivers fs include init ipc kernel lib mm modules.builtin modules.builtin.modinfo modules.order net scripts security sound source tools usr virt vmlinux vmlinux.o vmlinux.symvers [Makefile:1196: prepare0] Error 2 Target 'prepare' not remade because of errors.
make:MakefileModule.symvers System.map arch block certs crypto drivers fs include init ipc kernel lib mm modules.builtin modules.builtin.modinfo modules.order net scripts security sound source tools usr virt vmlinux vmlinux.o vmlinux.symvers [Makefile:185: __sub-make] Error 2
make: Target 'prepare' not remade because of errors.
Quoted 10 lines
# https://github.com/0day-ci/linux/commit/d88270d1c0783a7f99f24a85692be90fd2ae0d7d
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review David-Hildenbrand/mm-memory_hotplug-selective-merging-of-system-ram-resources/20200910-171630 git checkoutd88270d1c0783a7f99f24a85692be90fd2ae0d7d
vim +/mhp_t +354include/linux/memory_hotplug.h352 353 extern void __ref free_area_init_core_hotplug(int nid);Quoted 1 line
354 extern int
__add_memory(int nid, u64 start, u64 size, mhp_t mhp_flags);
add_memory() and not protected by CONFIG_MEMORY_HOTPLUG, but the new type is. Will look into it.
Signature · 3 lines
Thanks, David / dhildenb
kernel test robot
build botRe: [PATCH v3 3/7] mm/memory_hotplug: prepare passing flags to add_memory() and friends
In reply to David HildenbrandI love your patch! Perhaps something to improve:
Hi David,
I love your patch! Perhaps something to improve:
[auto build test WARNING on next-20200909]
[cannot apply to mmotm/master hnaz-linux-mm/master xen-tip/linux-next powerpc/next linus/master v5.9-rc4 v5.9-rc3 v5.9-rc2 v5.9-rc4] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/David-Hildenbrand/mm-memory_hotplug-selective-merging-of-system-ram-resources/20200910-171630 base: 7204eaa2c1f509066486f488c9dcb065d7484494
:::::: branch date: 9 hours ago
:::::: commit date: 9 hours ago
config: powerpc-randconfig-r011-20200909 (attached as .config)
compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project 0a5dc7effb191eff740e0e7ae7bd8e1f6bdb3ad9) reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install powerpc cross compiling tool for clang build
# apt-get install binutils-powerpc-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=powerpc
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
In file included from arch/powerpc/kernel/asm-offsets.c:14:
In file included from include/linux/compat.h:17:
In file included from include/linux/fs.h:15:
In file included from include/linux/radix-tree.h:18:
In file included from include/linux/xarray.h:14:
In file included from include/linux/gfp.h:6:
In file included from include/linux/mmzone.h:853:
include/linux/memory_hotplug.h:354:55: error: unknown type name 'mhp_t'
extern int __add_memory(int nid, u64 start, u64 size, mhp_t mhp_flags);
^
include/linux/memory_hotplug.h:355:53: error: unknown type name 'mhp_t'
extern int add_memory(int nid, u64 start, u64 size, mhp_t mhp_flags);
^
include/linux/memory_hotplug.h:357:11: error: unknown type name 'mhp_t'
mhp_t mhp_flags);
^
include/linux/memory_hotplug.h:360:10: error: unknown type name 'mhp_t'
mhp_t mhp_flags);
^
In file included from arch/powerpc/kernel/asm-offsets.c:21:
>> include/linux/mman.h:137:9: warning: division by zero is undefined [-Wdivision-by-zero]
_calc_vm_trans(flags, MAP_LOCKED, VM_LOCKED ) |
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/mman.h:115:21: note: expanded from macro '_calc_vm_trans'
: ((x) & (bit1)) / ((bit1) / (bit2))))
^ ~~~~~~~~~~~~~~~~~
include/linux/mman.h:138:9: warning: division by zero is undefined [-Wdivision-by-zero]
_calc_vm_trans(flags, MAP_SYNC, VM_SYNC );
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/mman.h:115:21: note: expanded from macro '_calc_vm_trans'
: ((x) & (bit1)) / ((bit1) / (bit2))))
^ ~~~~~~~~~~~~~~~~~ 2 warnings and 4 errors generated.
make[2]: *** [scripts/Makefile.build:117: arch/powerpc/kernel/asm-offsets.s] Error 1 make[2]: Target '__build' not remade because of errors.
make[1]: *** [Makefile:1196: prepare0] Error 2
make[1]: Target 'prepare' not remade because of errors.
make: *** [Makefile:185: __sub-make] Error 2
make: Target 'prepare' not remade because of errors.
# https://github.com/0day-ci/linux/commit/d88270d1c0783a7f99f24a85692be90fd2ae0d7d
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review David-Hildenbrand/mm-memory_hotplug-selective-merging-of-system-ram-resources/20200910-171630 git checkout d88270d1c0783a7f99f24a85692be90fd2ae0d7d
vim +137 include/linux/mman.h
^1da177e4c3f41 Linus Torvalds 2005-04-16 128
^1da177e4c3f41 Linus Torvalds 2005-04-16 129 /*
^1da177e4c3f41 Linus Torvalds 2005-04-16 130 * Combine the mmap "flags" argument into "vm_flags" used internally.
^1da177e4c3f41 Linus Torvalds 2005-04-16 131 */
^1da177e4c3f41 Linus Torvalds 2005-04-16 132 static inline unsigned long
^1da177e4c3f41 Linus Torvalds 2005-04-16 133 calc_vm_flag_bits(unsigned long flags)
^1da177e4c3f41 Linus Torvalds 2005-04-16 134 {
^1da177e4c3f41 Linus Torvalds 2005-04-16 135 return _calc_vm_trans(flags, MAP_GROWSDOWN, VM_GROWSDOWN ) |
^1da177e4c3f41 Linus Torvalds 2005-04-16 136 _calc_vm_trans(flags, MAP_DENYWRITE, VM_DENYWRITE ) |
b6fb293f2497a9 Jan Kara 2017-11-01 @137 _calc_vm_trans(flags, MAP_LOCKED, VM_LOCKED ) |
b6fb293f2497a9 Jan Kara 2017-11-01 138 _calc_vm_trans(flags, MAP_SYNC, VM_SYNC );
^1da177e4c3f41 Linus Torvalds 2005-04-16 139 }00619bcc44d6b7 Jerome Marchand 2013-11-12 140
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]
_______________________________________________
Linux-nvdimm mailing list -- [email protected] To unsubscribe send an email to [email protected]