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 B13AEC6379F for ; Fri, 10 Feb 2023 22:03:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 466B228002B; Fri, 10 Feb 2023 17:03:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3EFB3280021; Fri, 10 Feb 2023 17:03:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 269E428002B; Fri, 10 Feb 2023 17:03:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 10F4B280021 for ; Fri, 10 Feb 2023 17:03:28 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id C0FD1A0895 for ; Fri, 10 Feb 2023 22:03:27 +0000 (UTC) X-FDA: 80452759254.04.171E03C Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by imf06.hostedemail.com (Postfix) with ESMTP id 71937180005 for ; Fri, 10 Feb 2023 22:03:25 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=JJoCCN+1; spf=pass (imf06.hostedemail.com: domain of dave.jiang@intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=dave.jiang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676066605; 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=pnfusa7KOoW5xEfIGE4cGHNxWMLyhGwqE4cd3RuISeE=; b=C+R0u9FEucAZ/FqfA0etMGFZ8whCSACRYKnNMcvw8mCOZUTR7NflWlqVBTQpgnL66YewFV 9hVLRtCNXwK01Q04wcOOnERa80UAdRIFdpkiUNFBR8Mb7qvYMgdxS8xpgIzGUKxJkps83C 86WTTJzVon/R3P+j7//y/pEcRF0SbuU= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=JJoCCN+1; spf=pass (imf06.hostedemail.com: domain of dave.jiang@intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=dave.jiang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676066605; a=rsa-sha256; cv=none; b=y+nhBCe/ooGIcZBJtRYqsfUixO14Imbm/Nuw9uz9rXQFlC8c52H7BTCkS5Bp408z1umtC6 y5k/5ys+bGNuj+PB6kY82u3k8fCORmef6JxsQfCJ5fZ82uxRkpOVGFLS3LYfVb6d5S0jvH qOD+pmXii8/Uu8HPTT38FZJDsJRVNqA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676066605; x=1707602605; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=DJ4H1V+6TU5G803CMbKqoAlYJI/kGtz69jyguC5gnOM=; b=JJoCCN+1vZxf42v6yR4yoQbABhuSdW8nGUuUUcGWJdXf9+3UnnX4wZzV IeXhmhLowmqbYT1vffNsDCKthicl8c0XSyuYA5MRBljkvk5xE+ninDWVy SbKVfJmrpQSCDFwdme/ewAxjN8KEo5XaIHyQHZEdTfkwjXEJMPqR89iGp jVmw62vdtspvS3Cm+7F9wtuefr40CVyqXGPSk9RE2ZRh1ZeXQe0IXAFOq nrQFS7llQoNNiPV6/rdOcYK1QJSLMZW3DGDO6mGzR2v0/YaP0tse4LEIY hfikwFQR3Dy+auJqLxv0YmornOhKDqLLgFsnp3tZrupUBPTCY7RHQYm/J w==; X-IronPort-AV: E=McAfee;i="6500,9779,10617"; a="329168196" X-IronPort-AV: E=Sophos;i="5.97,287,1669104000"; d="scan'208";a="329168196" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Feb 2023 14:03:23 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10617"; a="792115392" X-IronPort-AV: E=Sophos;i="5.97,287,1669104000"; d="scan'208";a="792115392" Received: from djiang5-mobl3.amr.corp.intel.com (HELO [10.213.190.133]) ([10.213.190.133]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Feb 2023 14:03:22 -0800 Message-ID: <7f9303ac-1e3c-8b13-4b85-36a49baa37f1@intel.com> Date: Fri, 10 Feb 2023 15:03:21 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Firefox/102.0 Thunderbird/102.6.0 Subject: Re: [PATCH v2 17/20] dax/hmem: Convey the dax range via memregion_info() Content-Language: en-US To: Dan Williams , 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 References: <167601992097.1924368.18291887895351917895.stgit@dwillia2-xfh.jf.intel.com> <167602002217.1924368.7036275892522551624.stgit@dwillia2-xfh.jf.intel.com> From: Dave Jiang In-Reply-To: <167602002217.1924368.7036275892522551624.stgit@dwillia2-xfh.jf.intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 71937180005 X-Rspam-User: X-Stat-Signature: wwoyxebkdsnin7g1sj1xeoguwkcn8a9w X-HE-Tag: 1676066605-419645 X-HE-Meta: U2FsdGVkX1+Mrqaz5vxZVTznmQA3VBETmazjd/tNGTzQyu+aVfVEC5vydPP+RB0w7ucZzKCLU1K0IPrcl3OBPVTbgegYt5Af46MrmCWu+9mi5mVCDvQV56UdHVaNIOywngJmwGWWB5/aBfF/9Pk/haV3qYg1VrQOzDPBZm9r/qyxzurweQ79fT75jBk27l+BLW+yK78tAzq12U/3jXgphXdv/rD8vdA+Jr4x0q2cwPWq8cMJ1e8n0UKN9SzYO9sXajtEvknGmwwF+vuXSxSBbyJdDUyPh6/6QNd30jzfCX0YZtd9ekx11Ped8GkmROIfAsVWwSTheOyLhJvaHCQHXxNsvlweoOR4DMet3X7aTQ7pPeTF1zvmHYFpvlTXo8OX6Q3SPEYBdVnbK01A9JbzNA2BBhX8ZQ5/QbJDbTim6UUCXbSkMt1r0I8uc5zPAHQsr12i5zvrx6rEjGV21jceaEa3vct5j2xh1pjv4QZ/EhKL4mFWqEISn2wTw+N9c+iwBsNVCmA/EO33ijILqPUTPKsDDBeZ1bvs5uX12OSXYry/eWa+4z2zZv6odHC5APhYmxTqaBg6oyi5PBVw9jF9PuDpyU6D230A4MJYc+i6Zuw+BANPWJuxUO3IFjyhDHQvWNDb9i6y6inNDgAOgPfxARsttAzicGkguI2P+neIyRpv3KAepTMLrjXp2r3GiTh1r0s9Ta+/bGM9KmrPvEB8EtvJdF7Z4IC1rMmb+QJR7mHeYW8l+5R5RAli93yd1cJ9oi0n+eHQV0POZC008ztR7NWwnEkJPXspNM/vDJGfMtlbPSfLpQso+MVx/HyW+tVYP3KP3aUb+2JC3FF+hlHfGW1JfKSDl0arAUpJHQcwBS+7StCoj8j38VvDpVk0TaPASsCdK4y/WA0hKh+cwsZ/flwWMwlHXdJ3VF6vt0lG0JvezaIpSpdmhxzsb6w9OZwWGUndEN7iNChSdiiMj7b XnuJE+mV 4Tw2AvBjZPB3zbc4emHZMzt6kz9WupFtEuq0Yq0iRj8ahVUxFW+jb/oTsaBVpor1FvRotf11OxC3fW//XHvIXVqTaM5RyJU00B2xxipgd5it7W0XdzLjj7hbXtukAXvWpWHJkxL8/Wt00QGdiuSmi6nbIbohVx6BZkHMa44LZKxYkpWHyL+/G59LLLPVTe57giewoJdCMFQY/epx0jkrPt7TWsFUTxcnPiXQGk7ndkhVCrZJr/qNra4M6Cu+t9qwR1Mm5m4NlW2SDFdeFWF20F6iNy+C4RLKXxrg0WBhZ/uczaxw/L+scqnc6JntpP3Q6LK0iBuIYWYZV+oQnEKlPEquPSw== 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 2/10/23 2:07 AM, 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. > > 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 > --- > 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 >