From mboxrd@z Thu Jan 1 00:00:00 1970 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 17890C64ED8 for ; Wed, 8 Feb 2023 17:35:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 982D86B007B; Wed, 8 Feb 2023 12:35:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 932DF6B007D; Wed, 8 Feb 2023 12:35:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7FB576B007E; Wed, 8 Feb 2023 12:35:39 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 6EB9B6B007B for ; Wed, 8 Feb 2023 12:35:39 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 0E7C11210DB for ; Wed, 8 Feb 2023 17:35:39 +0000 (UTC) X-FDA: 80444826798.10.FED5461 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) by imf24.hostedemail.com (Postfix) with ESMTP id E107518000B for ; Wed, 8 Feb 2023 17:35:36 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf24.hostedemail.com: domain of jonathan.cameron@huawei.com designates 185.176.79.56 as permitted sender) smtp.mailfrom=jonathan.cameron@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675877737; 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; bh=UArau3UgYlxZAHx+N0OQNfAbHrFuF8t0cV6/1FV0FNg=; b=yr97SBfvVquS/1o5KZu+2/6togBnCKJ7zPHYKJCzxq/HqKnD9TffPl/c++N63P7CiN1DFJ +p6pPl5w/DU9IRa2wOHYbkgUsllyxqC22uX9yNcO23tbJHkFoO/yUCvVL9TJPtNmpIYBQS Uvsvvv3AYLu4eX4GXCgtpuW6jAeDFX8= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf24.hostedemail.com: domain of jonathan.cameron@huawei.com designates 185.176.79.56 as permitted sender) smtp.mailfrom=jonathan.cameron@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675877737; a=rsa-sha256; cv=none; b=7xEV3UvGx8cy9Z0QZObk8pu+hkG2W6nY8Zdm1TdfN2cMEGPaEKW2rvFKWzDubmYFFnLY6L wpvj3WYQjHcB6rciAEaavExl6pbpUKz/AqOpK2pUoQdq+kEFlmmsdwcviLdUiGPHkTxa+Z xcr0sMRLEQkKi0Q2URu/WKB2y+Y/h1w= Received: from lhrpeml500005.china.huawei.com (unknown [172.18.147.200]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4PBn8p4F8qz6J7Hp; Thu, 9 Feb 2023 01:31:06 +0800 (CST) Received: from localhost (10.202.227.76) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.17; Wed, 8 Feb 2023 17:35:32 +0000 Date: Wed, 8 Feb 2023 17:35:31 +0000 From: Jonathan Cameron To: Dan Williams CC: , , , Subject: Re: [PATCH 15/18] dax/hmem: Convey the dax range via memregion_info() Message-ID: <20230208173531.00000687@Huawei.com> In-Reply-To: <167564543303.847146.11045895213318648441.stgit@dwillia2-xfh.jf.intel.com> References: <167564534874.847146.5222419648551436750.stgit@dwillia2-xfh.jf.intel.com> <167564543303.847146.11045895213318648441.stgit@dwillia2-xfh.jf.intel.com> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 4.1.0 (GTK 3.24.33; x86_64-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.202.227.76] X-ClientProxiedBy: lhrpeml500004.china.huawei.com (7.191.163.9) To lhrpeml500005.china.huawei.com (7.191.163.240) X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: E107518000B X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: n14ftof5pxgtgy91eqyycnfkui94ppdy X-HE-Tag: 1675877736-470932 X-HE-Meta: U2FsdGVkX1+25XU7z3cNkxnJZnRrRNZ7FhYrdt2izU4LltMttFhBrGEEUib0vULADV8zsqlElDTFVcd8G+3T6W5eYJMXHz59atHbVMaqhClS7LQQPCgJRWE9tzDkjtvhwSYHhpSJ45zkuv/vyKnA9ydojBUYG/8JKalGF7R79gsJ53UHKezDuPkETc7QGf16+YKb1Yi2bB/D0AjeKStm4QKkLV+o5DR+iJq/gjKuc6V2pXj6ANwEe606VnQIj4XuWErk1U0tdzKjwriNezYTTiMCNdQwre9z0/Z+z0sc7qSuOMXGMpL7DNxxDeN4MLGDS9dJ+zHXDwSSgGpaeTh1/DaQudI9uVQVnYTsM2SCqzp7WV5GH1LNPsF6QlrPC08taCibmluzCVwvDB5YGAx81rDF2PosIhxnNtRA1K9oyd/0W9QgPdP6KOTk8nn3sstNV/7BnLh9u9nWxH1KObbT4K5FXs9BbTr18r9s6ysssbnAAhphM3sCPWv5Gi9NdnKKR/uVptm3g3rKzX5k/KVV8VNTezrOn64/liMcUHjvcBorTsCpQCp+/ZNE3/vwin5ew6LdCk4z2l9pRTGz6t1IqHO1sB+H3Vp+3KkYF4XxdGjaxYqI+LtTrjt/NE5BmSWLTo5V4v2uC2bct1Gn6S99yEu1K5A8Jfw+qVhzGWqOiXJMHNLkcp3EIZG4ozYf6SR2/ozZjL9VwnQrPzHy6xJeK4Z7zwo/VJubCAc5KSChxuIkV+BdsdlPrHvVi+vbTmLOoTOMlc5moA/5PkatMtJEU2SgzNZN1yzMPR/LPi95IFtgqdql4yYgeQMPygsRxxP7s9rijxAn3/RdESp2INBW1LjOIuaaJcynxRW0bp7lhcOwzPcCwaRDd3KKhOPCbfyrn6fniOgqdSMLAPIrf4IXcw6+GnInb4TLqph7dNv7O9Jv+sLjTu8xvvf3WXYcohy9jACt0L/1atDTG1Ai968 y7gmQjaR 4kudWMuBQbQ8S6VOZtIqS9oBpfEJUBsWnC2pW6V4VDJBYmoKmpvOYYtsIe6SBrI7FqWbmUjykpxuZZVZxJSmbWNWlwtye/I1s8E3qK523YzEM9dmocYgxaLQGDLBJfn1v+AKxLVvBIOGi/X8aV/0qI0E2sZbkTmWI7sXqHDOTZfnGFWImRrBgDZJgLVu9Wh8WQKieFvU0TlehUJdSUhYR1r8CRHE+GGhNRiNRNOgmr5c1HIvz4LarXWgRSoEUZYhclCsVUzDMofPo9dsnC5bGdeHEqeFNsse162QLbQENFIkkowIHT9eOObE/Vg== 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: On Sun, 05 Feb 2023 17:03:53 -0800 Dan Williams wrote: > 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. > > Signed-off-by: Dan Williams Seems sensible to me. Reviewed-by: Jonathan Cameron > --- > 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 >