From patchwork Fri Feb 10 09:07:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 13135564 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C1DBC05027 for ; Fri, 10 Feb 2023 09:07:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0E4F26B0132; Fri, 10 Feb 2023 04:07:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 071246B0134; Fri, 10 Feb 2023 04:07:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E4FCD6B0135; Fri, 10 Feb 2023 04:07:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id B99646B0132 for ; Fri, 10 Feb 2023 04:07:05 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 796E0413F0 for ; Fri, 10 Feb 2023 09:07:05 +0000 (UTC) X-FDA: 80450802810.14.5633DFF Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by imf20.hostedemail.com (Postfix) with ESMTP id 54C921C0005 for ; Fri, 10 Feb 2023 09:07:03 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=JpzUwbbI; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf20.hostedemail.com: domain of dan.j.williams@intel.com designates 192.55.52.93 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676020023; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=fWZIGDEV/0CAjDraCP4eeSVsFl8hwSA/coPiht4uvQM=; b=m2NM5pf4Bl3NkVnV5LQz2OBitycTrIuWlthimHDl3i682jqwykKd22jqHLiqSBLGltpQLG iINWAZiFC0cyUWTFB6fpPUQJlEse+wz13aCOB5kmGZKneRfjHdcvX2bbiuiQuhwVsELwi1 3/vXDJ/bb1CaZ23XTfVtqCmEHTT7RK8= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=JpzUwbbI; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf20.hostedemail.com: domain of dan.j.williams@intel.com designates 192.55.52.93 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676020023; a=rsa-sha256; cv=none; b=Rx6yIGgL+YF8JkO0oszEps52NJ4+s9SexwtC6Hlb/MMCdufZi8hzaK43I/EC0E6eWtGQaA sj4gxy7OGMEt+v5+kCgBFcB8S7SplGUCh659syE0UC2ie7SlIboMIJZ1BTQe57tSXx4W5U T+ji85yq2CY8L1sNXMnBzFERDjUwrr0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676020023; x=1707556023; h=subject:from:to:cc:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fsFyJVK/yMU8PeF2io/JqvsaT5S0XIoYNB1iom5H8o0=; b=JpzUwbbIq7mBgQ76cYlGttvVrllYFRZIMo2utqs504MfwtOzmIKGk11s 9zvC9MDsNi3qJaHVmgZMRyLPlUnDrQhJ03Kv127dIlpjhFW65/EAeem3L 9FLvsfClekL6jF6VFRsRJdaPjAmXbnuNjgQQX2NnNAjjDXkaXuwv5MQ1X nsp+nMGUelTNnT4+autqwJzpZRMsq7PHYjD8kQsCf7kX+77vvJJIMm5Rv CE2voMLjtpZny5aR37vgxgQWqMEJu5H4ejPdjBE2G6B41jWxKKS9s2cKI 9dsrk7Z/dXQvQBLj+cMXJpBiAgojgurO9G2qYBVaA09CAPY757JJ7wXRi w==; X-IronPort-AV: E=McAfee;i="6500,9779,10616"; a="328062622" X-IronPort-AV: E=Sophos;i="5.97,286,1669104000"; d="scan'208";a="328062622" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Feb 2023 01:07:02 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10616"; a="700392901" X-IronPort-AV: E=Sophos;i="5.97,286,1669104000"; d="scan'208";a="700392901" Received: from hrchavan-mobl.amr.corp.intel.com (HELO dwillia2-xfh.jf.intel.com) ([10.209.46.42]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Feb 2023 01:07:02 -0800 Subject: [PATCH v2 17/20] dax/hmem: Convey the dax range via memregion_info() From: Dan Williams To: linux-cxl@vger.kernel.org Cc: Jonathan Cameron , Fan Ni , vishal.l.verma@intel.com, dave.hansen@linux.intel.com, linux-mm@kvack.org, linux-acpi@vger.kernel.org Date: Fri, 10 Feb 2023 01:07:02 -0800 Message-ID: <167602002217.1924368.7036275892522551624.stgit@dwillia2-xfh.jf.intel.com> In-Reply-To: <167601992097.1924368.18291887895351917895.stgit@dwillia2-xfh.jf.intel.com> References: <167601992097.1924368.18291887895351917895.stgit@dwillia2-xfh.jf.intel.com> User-Agent: StGit/0.18-3-g996c MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 54C921C0005 X-Stat-Signature: ibe8jsaoxwr1xuxhiwznmszw3jb9rgh6 X-HE-Tag: 1676020023-984168 X-HE-Meta: U2FsdGVkX1+gCADtonhlkCAvjnWAWy+vPGuwpjxz0Zehm5XN83nHMHHs2oCUoEM5b9vSQlfVx+pVOy5z9LkpLE/eSKRC2w/4SptP1e+wEfhyMQ+RwpvwHREBfhMSmbX4ubLX3je4i57tCb7X3tJ1N+/WSsmUAqem9dXV7A8MTCy7UAZ+PBAPIl4BkRglSEl+r0SFAJd8wO3u2fdVW1Ry4TKAnaDsVdmS9HOJYcajiNFsuspE1gvPybR6nH8ihuC6nkAyYWThFLHX0uxNO8d+9x9CWcWiMd+dhkTHy+rnkfC5ri2zhHLifhCqSWZPDqf8qpqFy1Unx2QaQFyoNdd8Xk8x6y07xqEM8In2C+69JdXMgiMacQAOEPlj+l1VAwlJC+QhZFOgIUBliQC+EoHPfTY1gd6QzNBPRQyC5wrqLXYCIhYniEIHWiLG3vs2/dlTJhtJO0Zs9d0R1bJOvAu+dRYEV/rxoyWYQiVNcCIPLl6gTHOYYUZr39wC2Mv9TlmcsARZxdJv/PPLX5Afy75h+PKQUksNhTBFN6U228I7+ClO1Whd1NkDuzfoQotB7uDhMyl9fStS/CEse+x7yk/Vtd6V8hKpx4i8YHhyEotocggH0Vka9iPHFGt12NDAU3Z7TXDBAb03cUp9lxhvPXxId6W4mHYMyPr0UkrefHxJBtBwUuhTK+qWF6xeIHP8ZNP0mIei+JSCu84l6Lx1K1ao9cyN6tnjiwEGBrLBQYqm0fLz80y7rPdtICDel64LgslaAX5Fu4269asvLWUnQ8nGM5cf+3IIEEibayvXKeGRJ0r8vlIfW6ghUYekrAHeGsVlKwj9p139Iyqix34S+ogY+Nt7i4CgCEGYU2y2jLYqnUJ4bK10H7Qj+5Im51kX5//5OMIJdurKY84jESxH4bEinP/RpyqcdPw097xkWJLbSAhF5bJjvL/wxPm35p4gR4upqKXE6xQGF3dM8Yexf6o HfGcpdiz PZrtWA7VeME4jmEQM890ZinTSgGuABOoJO+Iog5hvghvWiKi3ZWbHfI9OsMEZFyfX/CpJCWPsNVUVuJsvn9nJAkvV5S/c8i3I8LcymSeIHVj6B9q2v9ZSksPqKANQiz6n7z7FFzYwfp8JeyfllpcCeLjeaTPTrvbuFEDHb9+uJ4Kia2u9yA1jFfAT7/lfMf3O9O3GV2QjbWsQ81IQYSnKk3n6sZSzPdnO3M1xirhEZ87sfN0ziqC+lcR744qXeXgQ1INR0P6jaqJ6IMwZUH6EIIc0jKEqm/ce15peu7p63v3OHvpCDWDe/zjORzs71A/sescYIYshJKJRQCEArh+6fS9qlw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: In preparation for hmem platform devices to be unregistered, stop using platform_device_add_resources() to convey the address range. The platform_device_add_resources() API causes an existing "Soft Reserved" iomem resource to be re-parented under an inserted platform device resource. When that platform device is deleted it removes the platform device resource and all children. Instead, it is sufficient to convey just the address range and let request_mem_region() insert resources to indicate the devices active in the range. This allows the "Soft Reserved" resource to be re-enumerated upon the next probe event. Reviewed-by: Jonathan Cameron Tested-by: Fan Ni Link: https://lore.kernel.org/r/167564543303.847146.11045895213318648441.stgit@dwillia2-xfh.jf.intel.com Signed-off-by: Dan Williams Reviewed-by: Dave Jiang Reviewed-by: Vishal Verma --- drivers/dax/hmem/device.c | 37 ++++++++++++++----------------------- drivers/dax/hmem/hmem.c | 14 +++----------- include/linux/memregion.h | 2 ++ 3 files changed, 19 insertions(+), 34 deletions(-) diff --git a/drivers/dax/hmem/device.c b/drivers/dax/hmem/device.c index 20749c7fab81..b1b339bccfe5 100644 --- a/drivers/dax/hmem/device.c +++ b/drivers/dax/hmem/device.c @@ -15,15 +15,8 @@ static struct resource hmem_active = { .flags = IORESOURCE_MEM, }; -void hmem_register_device(int target_nid, struct resource *r) +void hmem_register_device(int target_nid, struct resource *res) { - /* define a clean / non-busy resource for the platform device */ - struct resource res = { - .start = r->start, - .end = r->end, - .flags = IORESOURCE_MEM, - .desc = IORES_DESC_SOFT_RESERVED, - }; struct platform_device *pdev; struct memregion_info info; int rc, id; @@ -31,55 +24,53 @@ void hmem_register_device(int target_nid, struct resource *r) if (nohmem) return; - rc = region_intersects(res.start, resource_size(&res), IORESOURCE_MEM, - IORES_DESC_SOFT_RESERVED); + rc = region_intersects(res->start, resource_size(res), IORESOURCE_MEM, + IORES_DESC_SOFT_RESERVED); if (rc != REGION_INTERSECTS) return; id = memregion_alloc(GFP_KERNEL); if (id < 0) { - pr_err("memregion allocation failure for %pr\n", &res); + pr_err("memregion allocation failure for %pr\n", res); return; } pdev = platform_device_alloc("hmem", id); if (!pdev) { - pr_err("hmem device allocation failure for %pr\n", &res); + pr_err("hmem device allocation failure for %pr\n", res); goto out_pdev; } - if (!__request_region(&hmem_active, res.start, resource_size(&res), + if (!__request_region(&hmem_active, res->start, resource_size(res), dev_name(&pdev->dev), 0)) { - dev_dbg(&pdev->dev, "hmem range %pr already active\n", &res); + dev_dbg(&pdev->dev, "hmem range %pr already active\n", res); goto out_active; } pdev->dev.numa_node = numa_map_to_online_node(target_nid); info = (struct memregion_info) { .target_node = target_nid, + .range = { + .start = res->start, + .end = res->end, + }, }; rc = platform_device_add_data(pdev, &info, sizeof(info)); if (rc < 0) { - pr_err("hmem memregion_info allocation failure for %pr\n", &res); - goto out_resource; - } - - rc = platform_device_add_resources(pdev, &res, 1); - if (rc < 0) { - pr_err("hmem resource allocation failure for %pr\n", &res); + pr_err("hmem memregion_info allocation failure for %pr\n", res); goto out_resource; } rc = platform_device_add(pdev); if (rc < 0) { - dev_err(&pdev->dev, "device add failed for %pr\n", &res); + dev_err(&pdev->dev, "device add failed for %pr\n", res); goto out_resource; } return; out_resource: - __release_region(&hmem_active, res.start, resource_size(&res)); + __release_region(&hmem_active, res->start, resource_size(res)); out_active: platform_device_put(pdev); out_pdev: diff --git a/drivers/dax/hmem/hmem.c b/drivers/dax/hmem/hmem.c index c7351e0dc8ff..5025a8c9850b 100644 --- a/drivers/dax/hmem/hmem.c +++ b/drivers/dax/hmem/hmem.c @@ -15,25 +15,17 @@ static int dax_hmem_probe(struct platform_device *pdev) struct memregion_info *mri; struct dev_dax_data data; struct dev_dax *dev_dax; - struct resource *res; - struct range range; - - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) - return -ENOMEM; mri = dev->platform_data; - range.start = res->start; - range.end = res->end; - dax_region = alloc_dax_region(dev, pdev->id, &range, mri->target_node, - PMD_SIZE, 0); + dax_region = alloc_dax_region(dev, pdev->id, &mri->range, + mri->target_node, PMD_SIZE, 0); if (!dax_region) return -ENOMEM; data = (struct dev_dax_data) { .dax_region = dax_region, .id = -1, - .size = region_idle ? 0 : resource_size(res), + .size = region_idle ? 0 : range_len(&mri->range), }; dev_dax = devm_create_dev_dax(&data); if (IS_ERR(dev_dax)) diff --git a/include/linux/memregion.h b/include/linux/memregion.h index bf83363807ac..c01321467789 100644 --- a/include/linux/memregion.h +++ b/include/linux/memregion.h @@ -3,10 +3,12 @@ #define _MEMREGION_H_ #include #include +#include #include struct memregion_info { int target_node; + struct range range; }; #ifdef CONFIG_MEMREGION