From nobody Tue Feb 10 09:24:43 2026 Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com [209.85.219.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 80FE937B3EC for ; Wed, 14 Jan 2026 23:51:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768434673; cv=none; b=HPJ9zr4T9BeF8TPEg8tBugifAmlqJA2mQ/i0cpmSGnBtkDHUc1LR4OLW737LuHIDn8RAwvaqZy8CN+ISQFHzgxHqTljo4gVZfbQucxOCvXQqEhiRohCYHRNWGX5cKw0qLv+iDdGVzwKhbBxLSxkUGZaWakKGIBNCP8BpqJvJp+E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768434673; c=relaxed/simple; bh=0J/H8yYq5raa3wrU1wqy674f7+nMuVNxr2GjcBjuBZc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mxlyM7iARsz+v6KWM7WZNZ9cF4yrHlK37vLfmSxe+uWCAHXFcD48V/8YRyyxL6ySK6wOlj2aNRhAdkwqIHuOB1/ZwG6lAabymLrUyN7NMk/HqoLdJdU+PNf/f/BMfYLXWFXg+p/hTM+ZCOuv3nHuFnbEiSmawFttK8XufGH7Mfk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net; spf=pass smtp.mailfrom=gourry.net; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b=vRMcz7r7; arc=none smtp.client-ip=209.85.219.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gourry.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b="vRMcz7r7" Received: by mail-qv1-f51.google.com with SMTP id 6a1803df08f44-88a26ce6619so2102816d6.3 for ; Wed, 14 Jan 2026 15:51:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gourry.net; s=google; t=1768434664; x=1769039464; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=H7S5DUi0SDbWdByNH4HXVuUJVUsm+o81Wii/GbIa5ZU=; b=vRMcz7r7DSDY+i1rqD2ElBEpbzH86rokkJXcsZyVAZwXKAHCvF4H1k8liwS0jLYgjq fc5hqpHpFOohmWmAla/cix9HHC/75Alz1f8jPAYFiSBOFm7A9WVwvObucq9MaqvIf6KD JQ/4Ej15/oiXLHnyEJt0KwLg0WvOPFzg0y5zlop+7ri3a3k3Hh7JHYbKbrLm4+H21XDc hR+4fscjImW7wBS9xHscEibfygvtI/l38YLnBCWOS5tP9urA4GFYvC3vF3plQwFVSI5O qGqWSbyf32BaFcm6YRhq0yvNQw7yxN9wNJiakfHJxF1hI2SGCxePgsFrj59XUSy9nn9z AMbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768434664; x=1769039464; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=H7S5DUi0SDbWdByNH4HXVuUJVUsm+o81Wii/GbIa5ZU=; b=HyqB54s7tYCP7Vs4rPatqO9GXCTu4IysJxsoUa0CUNzPSuYNXPgr1HD5WrjgNY9vE2 q+oXaSCBYL44jq5Xc6OQvOVN1V0kd/WAE0O56Uu1zLznH4owdKIAASDMk61knEGbmEFI s3G1Gppbx2NG1XmxO3m+goE35ZWH7HgdRaOP7/EIhmlOqpH8W9uzYd112oCtJcy39kdu eSkVlY9RPgRhHt7LZciHZpTKK7RKxFqck5f3C8dgAz08rvuErH5JeYVAIl1fEqo0Nvyb loplcLsBeKNXrUT4M6e5FRmzcWt0EgtS+Y9O5BAdEXEXmlQvNnYvpyewP/uRzEL9TuRe 8zNA== X-Forwarded-Encrypted: i=1; AJvYcCWR0PhrYYuRva6Ihm2oDsHYHzUm5x2zXmi/MBlqVt/NPQOxuerWMYFO4XVpm36s8xwe1Z6joX+b7sySuwk=@vger.kernel.org X-Gm-Message-State: AOJu0YzfvAl9mIcZWm5MXrmV4umFKWhMQm+0JzOjdI0FWW7hNXG1Gmcl twUwevb54VDlLFnfxyk+Vy+nC/YGtXKWcQ/DoSFQfYqTzEYLnM1vS//V2qzbPEEUmJM= X-Gm-Gg: AY/fxX5UkE7UZjLM/TqWEW/vhlMIK88F50aiquyuPZDS4wuIj1S6TVpYo9oVYqypyw/ KhkyXElZ7OyXlyHJ8BPFpRSud1YGz7q0jDkdDcF2+LtHZ7DdQ/3g5CXfxmdi9ajm1emwjBGccf5 RV6w+QPOQ8PfmC5N7c0EK+RzhlUbvtGJ9KZQGFALLZYeUoWS/jAbvF020v1NUpUV3nsohfTSXUH 5BvX++7V7wAeMqbret/ufuyoqoxpogAZc2J8gCAjVgzVWrp3LSCc5gaGDj5MkK0gBMvrvj5Y8ln muPdkxQCnvOjopWoRaGQK0bqETmJ5HWWH+WMoptEyL8XIUyMO7p0MSb1J3meu+w47yWg+0vJKve 5UCO0bTZimBgpf8tRjAWC99GU1GhQGKnBIU4Hx0dHHAGNJpMzAv0hZODSsyZmO3ix+pJO3v4ccI /WmeEDB+sKdww34S/Zp9HQl9Jp6cFz9NgVjpMiyqfACvHCqWwiy7p81JXceDfiobQaEmjeT7WNQ OM= X-Received: by 2002:a05:6214:cc8:b0:88a:2fd1:b582 with SMTP id 6a1803df08f44-89275c28a5fmr45974356d6.47.1768434664338; Wed, 14 Jan 2026 15:51:04 -0800 (PST) Received: from gourry-fedora-PF4VCD3F.lan (pool-96-255-20-138.washdc.ftas.verizon.net. [96.255.20.138]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-890772346f8sm188449106d6.35.2026.01.14.15.51.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jan 2026 15:51:03 -0800 (PST) From: Gregory Price To: linux-mm@kvack.org Cc: linux-cxl@vger.kernel.org, nvdimm@lists.linux.dev, linux-kernel@vger.kernel.org, virtualization@lists.linux.dev, kernel-team@meta.com, dan.j.williams@intel.com, vishal.l.verma@intel.com, dave.jiang@intel.com, david@kernel.org, mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com, osalvador@suse.de, akpm@linux-foundation.org Subject: [PATCH v2 3/5] dax/kmem: extract hotplug/hotremove helper functions Date: Wed, 14 Jan 2026 18:50:19 -0500 Message-ID: <20260114235022.3437787-4-gourry@gourry.net> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260114235022.3437787-1-gourry@gourry.net> References: <20260114235022.3437787-1-gourry@gourry.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Refactor kmem _probe() _remove() by extracting init, cleanup, hotplug, and hot-remove logic into separate helper functions: - dax_kmem_init_resources: inits IO_RESOURCE w/ request_mem_region - dax_kmem_cleanup_resources: cleans up initialized IO_RESOURCE - dax_kmem_do_hotplug: handles memory region reservation and adding - dax_kmem_do_hotremove: handles memory removal and resource cleanup This is a pure refactoring with no functional change. The helpers will enable future extensions to support more granular control over memory hotplug operations. We need to split hotplug/remove and init/cleanup in order to have the resources available for hot-add. Otherwise, when probe occurs, the dax devices are never added to sysfs because the resources are never registered. Signed-off-by: Gregory Price --- drivers/dax/kmem.c | 300 +++++++++++++++++++++++++++++++-------------- 1 file changed, 206 insertions(+), 94 deletions(-) diff --git a/drivers/dax/kmem.c b/drivers/dax/kmem.c index bb13d9ced2e9..3929cb8576de 100644 --- a/drivers/dax/kmem.c +++ b/drivers/dax/kmem.c @@ -65,14 +65,185 @@ static void kmem_put_memory_types(void) mt_put_memory_types(&kmem_memory_types); } =20 +/** + * dax_kmem_do_hotplug - hotplug memory for dax kmem device + * @dev_dax: the dev_dax instance + * @data: the dax_kmem_data structure with resource tracking + * + * Hotplugs all ranges in the dev_dax region as system memory. + * + * Returns the number of successfully mapped ranges, or negative error. + */ +static int dax_kmem_do_hotplug(struct dev_dax *dev_dax, + struct dax_kmem_data *data, + int online_type) +{ + struct device *dev =3D &dev_dax->dev; + int i, rc, onlined =3D 0; + mhp_t mhp_flags; + + for (i =3D 0; i < dev_dax->nr_range; i++) { + struct range range; + + rc =3D dax_kmem_range(dev_dax, i, &range); + if (rc) + continue; + + mhp_flags =3D MHP_NID_IS_MGID; + if (dev_dax->memmap_on_memory) + mhp_flags |=3D MHP_MEMMAP_ON_MEMORY; + + /* + * Ensure that future kexec'd kernels will not treat + * this as RAM automatically. + */ + rc =3D add_memory_driver_managed(data->mgid, range.start, + range_len(&range), kmem_name, mhp_flags, + online_type); + + if (rc) { + dev_warn(dev, "mapping%d: %#llx-%#llx memory add failed\n", + i, range.start, range.end); + if (onlined) + continue; + return rc; + } + onlined++; + } + + return onlined; +} + +/** + * dax_kmem_init_resources - create memory regions for dax kmem + * @dev_dax: the dev_dax instance + * @data: the dax_kmem_data structure with resource tracking + * + * Initializes all the resources for the DAX + * + * Returns the number of successfully mapped ranges, or negative error. + */ +static int dax_kmem_init_resources(struct dev_dax *dev_dax, + struct dax_kmem_data *data) +{ + struct device *dev =3D &dev_dax->dev; + int i, rc, mapped =3D 0; + + for (i =3D 0; i < dev_dax->nr_range; i++) { + struct resource *res; + struct range range; + + rc =3D dax_kmem_range(dev_dax, i, &range); + if (rc) + continue; + + /* Skip ranges already added */ + if (data->res[i]) + continue; + + /* Region is permanently reserved if hotremove fails. */ + res =3D request_mem_region(range.start, range_len(&range), + data->res_name); + if (!res) { + dev_warn(dev, "mapping%d: %#llx-%#llx could not reserve region\n", + i, range.start, range.end); + /* + * Once some memory has been onlined we can't + * assume that it can be un-onlined safely. + */ + if (mapped) + continue; + return -EBUSY; + } + data->res[i] =3D res; + /* + * Set flags appropriate for System RAM. Leave ..._BUSY clear + * so that add_memory() can add a child resource. Do not + * inherit flags from the parent since it may set new flags + * unknown to us that will break add_memory() below. + */ + res->flags =3D IORESOURCE_SYSTEM_RAM; + mapped++; + } + return mapped; +} + +#ifdef CONFIG_MEMORY_HOTREMOVE +/** + * dax_kmem_do_hotremove - hot-remove memory for dax kmem device + * @dev_dax: the dev_dax instance + * @data: the dax_kmem_data structure with resource tracking + * + * Removes all ranges in the dev_dax region. + * + * Returns the number of successfully removed ranges. + */ +static int dax_kmem_do_hotremove(struct dev_dax *dev_dax, + struct dax_kmem_data *data) +{ + struct device *dev =3D &dev_dax->dev; + int i, success =3D 0; + + for (i =3D 0; i < dev_dax->nr_range; i++) { + struct range range; + int rc; + + rc =3D dax_kmem_range(dev_dax, i, &range); + if (rc) + continue; + + /* Skip ranges not currently added */ + if (!data->res[i]) + continue; + + rc =3D remove_memory(range.start, range_len(&range)); + if (rc =3D=3D 0) { + success++; + continue; + } + any_hotremove_failed =3D true; + dev_err(dev, "mapping%d: %#llx-%#llx hotremove failed\n", + i, range.start, range.end); + } + + return success; +} +#else +static int dax_kmem_do_hotremove(struct dev_dax *dev_dax, + struct dax_kmem_data *data) +{ + return -ENOSUPP; +} +#endif /* CONFIG_MEMORY_HOTREMOVE */ + +/** + * dax_kmem_cleanup_resources - remove the dax memory resources + * @dev_dax: the dev_dax instance + * @data: the dax_kmem_data structure with resource tracking + * + * Removes all resources in the dev_dax region. + */ +static void dax_kmem_cleanup_resources(struct dev_dax *dev_dax, + struct dax_kmem_data *data) +{ + int i; + + for (i =3D 0; i < dev_dax->nr_range; i++) { + if (!data->res[i]) + continue; + remove_resource(data->res[i]); + kfree(data->res[i]); + data->res[i] =3D NULL; + } +} + static int dev_dax_kmem_probe(struct dev_dax *dev_dax) { struct device *dev =3D &dev_dax->dev; unsigned long total_len =3D 0, orig_len =3D 0; struct dax_kmem_data *data; struct memory_dev_type *mtype; - int i, rc, mapped =3D 0; - mhp_t mhp_flags; + int i, rc; int numa_node; int adist =3D MEMTIER_DEFAULT_DAX_ADISTANCE; =20 @@ -134,68 +305,26 @@ static int dev_dax_kmem_probe(struct dev_dax *dev_dax) goto err_reg_mgid; data->mgid =3D rc; =20 - for (i =3D 0; i < dev_dax->nr_range; i++) { - struct resource *res; - struct range range; - - rc =3D dax_kmem_range(dev_dax, i, &range); - if (rc) - continue; - - /* Region is permanently reserved if hotremove fails. */ - res =3D request_mem_region(range.start, range_len(&range), data->res_nam= e); - if (!res) { - dev_warn(dev, "mapping%d: %#llx-%#llx could not reserve region\n", - i, range.start, range.end); - /* - * Once some memory has been onlined we can't - * assume that it can be un-onlined safely. - */ - if (mapped) - continue; - rc =3D -EBUSY; - goto err_request_mem; - } - data->res[i] =3D res; - - /* - * Set flags appropriate for System RAM. Leave ..._BUSY clear - * so that add_memory() can add a child resource. Do not - * inherit flags from the parent since it may set new flags - * unknown to us that will break add_memory() below. - */ - res->flags =3D IORESOURCE_SYSTEM_RAM; - - mhp_flags =3D MHP_NID_IS_MGID; - if (dev_dax->memmap_on_memory) - mhp_flags |=3D MHP_MEMMAP_ON_MEMORY; - - /* - * Ensure that future kexec'd kernels will not treat - * this as RAM automatically. - */ - rc =3D add_memory_driver_managed(data->mgid, range.start, - range_len(&range), kmem_name, mhp_flags, - mhp_get_default_online_type()); + dev_set_drvdata(dev, data); =20 - if (rc) { - dev_warn(dev, "mapping%d: %#llx-%#llx memory add failed\n", - i, range.start, range.end); - remove_resource(res); - kfree(res); - data->res[i] =3D NULL; - if (mapped) - continue; - goto err_request_mem; - } - mapped++; - } + rc =3D dax_kmem_init_resources(dev_dax, data); + if (rc < 0) + goto err_resources; =20 - dev_set_drvdata(dev, data); + /* + * Hotplug using the system default policy - this preserves backwards + * for existing users who rely on the default auto-online behavior. + */ + rc =3D dax_kmem_do_hotplug(dev_dax, data, mhp_get_default_online_type()); + if (rc < 0) + goto err_hotplug; =20 return 0; =20 -err_request_mem: +err_hotplug: + dax_kmem_cleanup_resources(dev_dax, data); +err_resources: + dev_set_drvdata(dev, NULL); memory_group_unregister(data->mgid); err_reg_mgid: kfree(data->res_name); @@ -209,7 +338,7 @@ static int dev_dax_kmem_probe(struct dev_dax *dev_dax) #ifdef CONFIG_MEMORY_HOTREMOVE static void dev_dax_kmem_remove(struct dev_dax *dev_dax) { - int i, success =3D 0; + int success; int node =3D dev_dax->target_node; struct device *dev =3D &dev_dax->dev; struct dax_kmem_data *data =3D dev_get_drvdata(dev); @@ -220,42 +349,25 @@ static void dev_dax_kmem_remove(struct dev_dax *dev_d= ax) * there is no way to hotremove this memory until reboot because device * unbind will succeed even if we return failure. */ - for (i =3D 0; i < dev_dax->nr_range; i++) { - struct range range; - int rc; - - rc =3D dax_kmem_range(dev_dax, i, &range); - if (rc) - continue; - - rc =3D remove_memory(range.start, range_len(&range)); - if (rc =3D=3D 0) { - remove_resource(data->res[i]); - kfree(data->res[i]); - data->res[i] =3D NULL; - success++; - continue; - } - any_hotremove_failed =3D true; - dev_err(dev, - "mapping%d: %#llx-%#llx cannot be hotremoved until the next reboot\n", - i, range.start, range.end); + success =3D dax_kmem_do_hotremove(dev_dax, data); + if (success < dev_dax->nr_range) { + dev_err(dev, "Hotplug regions stuck online until reboot\n"); + return; } =20 - if (success >=3D dev_dax->nr_range) { - memory_group_unregister(data->mgid); - kfree(data->res_name); - kfree(data); - dev_set_drvdata(dev, NULL); - /* - * Clear the memtype association on successful unplug. - * If not, we have memory blocks left which can be - * offlined/onlined later. We need to keep memory_dev_type - * for that. This implies this reference will be around - * till next reboot. - */ - clear_node_memory_type(node, NULL); - } + dax_kmem_cleanup_resources(dev_dax, data); + memory_group_unregister(data->mgid); + kfree(data->res_name); + kfree(data); + dev_set_drvdata(dev, NULL); + /* + * Clear the memtype association on successful unplug. + * If not, we have memory blocks left which can be + * offlined/onlined later. We need to keep memory_dev_type + * for that. This implies this reference will be around + * till next reboot. + */ + clear_node_memory_type(node, NULL); } #else static void dev_dax_kmem_remove(struct dev_dax *dev_dax) --=20 2.52.0