On Mon, Jun 7, 2021 at 9:55 PM David Hildenbrand <david@xxxxxxxxxx> wrote:
>
> Let's group all memory we add for a single memory device - we want a
> single node for that (which also seems to be the sane thing to do).
>
> We won't care for now about memory that was already added to the system
> (e.g., via e820) -- usually *all* memory of a memory device was already
> added and we'll fail acpi_memory_enable_device().
>
> Signed-off-by: David Hildenbrand <david@xxxxxxxxxx>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
> ---
> drivers/acpi/acpi_memhotplug.c | 35 +++++++++++++++++++++++++++++-----
> 1 file changed, 30 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
> index eb4faf7c5cad..0c7b062c0e5d 100644
> --- a/drivers/acpi/acpi_memhotplug.c
> +++ b/drivers/acpi/acpi_memhotplug.c
> @@ -54,6 +54,7 @@ struct acpi_memory_info {
> struct acpi_memory_device {
> struct acpi_device *device;
> struct list_head res_list;
> + int mgid;
> };
>
> static acpi_status
> @@ -171,10 +172,31 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
> acpi_handle handle = mem_device->device->handle;
> int result, num_enabled = 0;
> struct acpi_memory_info *info;
> - mhp_t mhp_flags = MHP_NONE;
> - int node;
> + mhp_t mhp_flags = MHP_NID_IS_MGID;
> + u64 total_length = 0;
> + int node, mgid;
>
> node = acpi_get_node(handle);
> +
> + list_for_each_entry(info, &mem_device->res_list, list) {
> + if (!info->length)
> + continue;
> + /* We want a single node for the whole memory group */
> + if (node < 0)
> + node = memory_add_physaddr_to_nid(info->start_addr);
> + total_length += info->length;
> + }
> +
> + if (!total_length) {
> + dev_err(&mem_device->device->dev, "device is empty\n");
> + return -EINVAL;
> + }
> +
> + mgid = register_static_memory_group(node, PFN_UP(total_length));
> + if (mgid < 0)
> + return mgid;
> + mem_device->mgid = mgid;
> +
> /*
> * Tell the VM there is more memory here...
> * Note: Assume that this function returns zero on success
> @@ -188,12 +210,10 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
> */
> if (!info->length)
> continue;
> - if (node < 0)
> - node = memory_add_physaddr_to_nid(info->start_addr);
>
> if (mhp_supports_memmap_on_memory(info->length))
> mhp_flags |= MHP_MEMMAP_ON_MEMORY;
> - result = __add_memory(node, info->start_addr, info->length,
> + result = __add_memory(mgid, info->start_addr, info->length,
> mhp_flags);
>
> /*
> @@ -253,6 +273,10 @@ static void acpi_memory_device_free(struct acpi_memory_device *mem_device)
> if (!mem_device)
> return;
>
> + /* In case we succeeded adding *some* memory, unregistering fails. */
> + if (mem_device->mgid >= 0)
> + unregister_memory_group(mem_device->mgid);
> +
> acpi_memory_free_device_resources(mem_device);
> mem_device->device->driver_data = NULL;
> kfree(mem_device);
> @@ -273,6 +297,7 @@ static int acpi_memory_device_add(struct acpi_device *device,
>
> INIT_LIST_HEAD(&mem_device->res_list);
> mem_device->device = device;
> + mem_device->mgid = -1;
> sprintf(acpi_device_name(device), "%s", ACPI_MEMORY_DEVICE_NAME);
> sprintf(acpi_device_class(device), "%s", ACPI_MEMORY_DEVICE_CLASS);
> device->driver_data = mem_device;
> --
> 2.31.1
>
