mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-31 16:38:12 +00:00
mm/memory_hotplug: prepare passing flags to add_memory() and friends
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/20190625075227.15193-3-osalvador@suse.de Signed-off-by: David Hildenbrand <david@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Reviewed-by: Juergen Gross <jgross@suse.com> # Xen related part Reviewed-by: Pankaj Gupta <pankaj.gupta.linux@gmail.com> Acked-by: Wei Liu <wei.liu@kernel.org> Cc: Michal Hocko <mhocko@suse.com> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Jason Gunthorpe <jgg@ziepe.ca> Cc: Baoquan He <bhe@redhat.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> Cc: Len Brown <lenb@kernel.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Vishal Verma <vishal.l.verma@intel.com> Cc: Dave Jiang <dave.jiang@intel.com> Cc: "K. Y. Srinivasan" <kys@microsoft.com> Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Stephen Hemminger <sthemmin@microsoft.com> Cc: Wei Liu <wei.liu@kernel.org> Cc: Heiko Carstens <hca@linux.ibm.com> Cc: Vasily Gorbik <gor@linux.ibm.com> Cc: Christian Borntraeger <borntraeger@de.ibm.com> Cc: David Hildenbrand <david@redhat.com> Cc: "Michael S. Tsirkin" <mst@redhat.com> Cc: Jason Wang <jasowang@redhat.com> Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> Cc: Stefano Stabellini <sstabellini@kernel.org> Cc: "Oliver O'Halloran" <oohall@gmail.com> Cc: Pingfan Liu <kernelfans@gmail.com> Cc: Nathan Lynch <nathanl@linux.ibm.com> Cc: Libor Pechacek <lpechacek@suse.cz> Cc: Anton Blanchard <anton@ozlabs.org> Cc: Leonardo Bras <leobras.c@gmail.com> Cc: Ard Biesheuvel <ardb@kernel.org> Cc: Eric Biederman <ebiederm@xmission.com> Cc: Julien Grall <julien@xen.org> Cc: Kees Cook <keescook@chromium.org> Cc: Roger Pau Monné <roger.pau@citrix.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Wei Yang <richardw.yang@linux.intel.com> Link: https://lkml.kernel.org/r/20200911103459.10306-5-david@redhat.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
3a0aaefe41
commit
b611719978
11 changed files with 30 additions and 20 deletions
|
@ -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;
|
||||
|
|
|
@ -606,7 +606,7 @@ static int dlpar_add_lmb(struct drmem_lmb *lmb)
|
|||
block_sz = memory_block_size_bytes();
|
||||
|
||||
/* Add the memory */
|
||||
rc = __add_memory(lmb->nid, lmb->base_addr, block_sz);
|
||||
rc = __add_memory(lmb->nid, lmb->base_addr, block_sz, MHP_NONE);
|
||||
if (rc) {
|
||||
invalidate_lmb_associativity_index(lmb);
|
||||
return rc;
|
||||
|
|
|
@ -194,7 +194,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()
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -109,7 +109,7 @@ static 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);
|
||||
|
||||
if (rc) {
|
||||
dev_warn(dev, "mapping%d: %#llx-%#llx memory add failed\n",
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
@ -339,11 +345,13 @@ extern void clear_zone_contiguous(struct zone *zone);
|
|||
|
||||
#ifdef CONFIG_MEMORY_HOTPLUG
|
||||
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);
|
||||
|
|
|
@ -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;
|
||||
|
@ -1119,7 +1119,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;
|
||||
|
@ -1128,18 +1128,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;
|
||||
|
@ -1168,7 +1168,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;
|
||||
|
@ -1186,7 +1186,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);
|
||||
|
||||
|
|
Loading…
Reference in a new issue