Reworked from a patch by Alison Schofield <alison.schofield@intel.com>
Reintroduce Soft Reserved range into the iomem_resource tree for HMEM
to consume.
This restores visibility in /proc/iomem for ranges actively in use, while
avoiding the early-boot conflicts that occurred when Soft Reserved was
published into iomem before CXL window and region discovery.
Link: https://lore.kernel.org/linux-cxl/29312c0765224ae76862d59a17748c8188fb95f1.1692638817.git.alison.schofield@intel.com/
Co-developed-by: Alison Schofield <alison.schofield@intel.com>
Signed-off-by: Alison Schofield <alison.schofield@intel.com>
Co-developed-by: Zhijian Li <lizhijian@fujitsu.com>
Signed-off-by: Zhijian Li <lizhijian@fujitsu.com>
Signed-off-by: Smita Koralahalli <Smita.KoralahalliChannabasappa@amd.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
---
drivers/dax/hmem/hmem.c | 31 ++++++++++++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/drivers/dax/hmem/hmem.c b/drivers/dax/hmem/hmem.c
index 9ceda6b5cadf..b590e1251bb8 100644
--- a/drivers/dax/hmem/hmem.c
+++ b/drivers/dax/hmem/hmem.c
@@ -76,6 +76,33 @@ void dax_hmem_flush_work(void)
}
EXPORT_SYMBOL_GPL(dax_hmem_flush_work);
+static void remove_soft_reserved(void *r)
+{
+ remove_resource(r);
+ kfree(r);
+}
+
+static int add_soft_reserve_into_iomem(struct device *host,
+ const struct resource *res)
+{
+ int rc;
+
+ struct resource *soft __free(kfree) = kmalloc_obj(*soft);
+ if (!soft)
+ return -ENOMEM;
+
+ *soft = DEFINE_RES_NAMED_DESC(res->start, (res->end - res->start + 1),
+ "Soft Reserved", IORESOURCE_MEM,
+ IORES_DESC_SOFT_RESERVED);
+
+ rc = insert_resource(&iomem_resource, soft);
+ if (rc)
+ return rc;
+
+ return devm_add_action_or_reset(host, remove_soft_reserved,
+ no_free_ptr(soft));
+}
+
static int __hmem_register_device(struct device *host, int target_nid,
const struct resource *res)
{
@@ -88,7 +115,9 @@ static int __hmem_register_device(struct device *host, int target_nid,
if (rc != REGION_INTERSECTS)
return 0;
- /* TODO: Add Soft-Reserved memory back to iomem */
+ rc = add_soft_reserve_into_iomem(host, res);
+ if (rc)
+ return rc;
id = memregion_alloc(GFP_KERNEL);
if (id < 0) {
--
2.17.1