From: Nathan Fontenot <nathan.fontenot@amd.com>
Add a release_Sam_region_adjustable() interface to allow for
removing SOFT RESERVE memory resources. This extracts out the code
to remove a mem region into a common __release_mem_region_adjustable()
routine, this routine takes additional parameters of an IORES
descriptor type to add checks for IORES_DESC_* and a flag to check
for IORESOURCE_BUSY to control it's behavior.
The existing release_mem_region_adjustable() is a front end to the
common code and a new release_srmem_region_adjustable() is added to
release SOFT RESERVE resources.
Signed-off-by: Nathan Fontenot <nathan.fontenot@amd.com>
Signed-off-by: Terry Bowman <terry.bowman@amd.com>
---
include/linux/ioport.h | 3 +++
kernel/resource.c | 55 +++++++++++++++++++++++++++++++++++++++---
2 files changed, 54 insertions(+), 4 deletions(-)
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index 5385349f0b8a..718360c9c724 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -357,6 +357,9 @@ extern void __release_region(struct resource *, resource_size_t,
#ifdef CONFIG_MEMORY_HOTREMOVE
extern void release_mem_region_adjustable(resource_size_t, resource_size_t);
#endif
+#ifdef CONFIG_CXL_REGION
+extern void release_srmem_region_adjustable(resource_size_t, resource_size_t);
+#endif
#ifdef CONFIG_MEMORY_HOTPLUG
extern void merge_system_ram_resource(struct resource *res);
#endif
diff --git a/kernel/resource.c b/kernel/resource.c
index 12004452d999..0195b31064b0 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -1387,7 +1387,7 @@ void __release_region(struct resource *parent, resource_size_t start,
}
EXPORT_SYMBOL(__release_region);
-#ifdef CONFIG_MEMORY_HOTREMOVE
+#if defined(CONFIG_MEMORY_HOTREMOVE) || defined(CONFIG_CXL_REGION)
/**
* release_mem_region_adjustable - release a previously reserved memory region
* @start: resource start address
@@ -1407,7 +1407,10 @@ EXPORT_SYMBOL(__release_region);
* assumes that all children remain in the lower address entry for
* simplicity. Enhance this logic when necessary.
*/
-void release_mem_region_adjustable(resource_size_t start, resource_size_t size)
+static void __release_mem_region_adjustable(resource_size_t start,
+ resource_size_t size,
+ bool busy_check,
+ int res_desc)
{
struct resource *parent = &iomem_resource;
struct resource *new_res = NULL;
@@ -1446,7 +1449,12 @@ void release_mem_region_adjustable(resource_size_t start, resource_size_t size)
if (!(res->flags & IORESOURCE_MEM))
break;
- if (!(res->flags & IORESOURCE_BUSY)) {
+ if (busy_check && !(res->flags & IORESOURCE_BUSY)) {
+ p = &res->child;
+ continue;
+ }
+
+ if (res_desc != IORES_DESC_NONE && res->desc != res_desc) {
p = &res->child;
continue;
}
@@ -1496,7 +1504,46 @@ void release_mem_region_adjustable(resource_size_t start, resource_size_t size)
write_unlock(&resource_lock);
free_resource(new_res);
}
-#endif /* CONFIG_MEMORY_HOTREMOVE */
+#endif
+
+#ifdef CONFIG_MEMORY_HOTREMOVE
+/**
+ * release_mem_region_adjustable - release a previously reserved memory region
+ * @start: resource start address
+ * @size: resource region size
+ *
+ * This interface is intended for memory hot-delete. The requested region
+ * is released from a currently busy memory resource. The requested region
+ * must either match exactly or fit into a single busy resource entry. In
+ * the latter case, the remaining resource is adjusted accordingly.
+ * Existing children of the busy memory resource must be immutable in the
+ * request.
+ *
+ * Note:
+ * - Additional release conditions, such as overlapping region, can be
+ * supported after they are confirmed as valid cases.
+ * - When a busy memory resource gets split into two entries, the code
+ * assumes that all children remain in the lower address entry for
+ * simplicity. Enhance this logic when necessary.
+ */
+void release_mem_region_adjustable(resource_size_t start, resource_size_t size)
+{
+ return __release_mem_region_adjustable(start, size,
+ true, IORES_DESC_NONE);
+}
+EXPORT_SYMBOL(release_mem_region_adjustable);
+#endif
+
+#ifdef CONFIG_CXL_REGION
+void release_srmem_region_adjustable(resource_size_t start,
+ resource_size_t size)
+{
+ return __release_mem_region_adjustable(start, size,
+ false, IORES_DESC_SOFT_RESERVED);
+}
+EXPORT_SYMBOL(release_srmem_region_adjustable);
+#endif
+
#ifdef CONFIG_MEMORY_HOTPLUG
static bool system_ram_resources_mergeable(struct resource *r1,
--
2.34.1On Thu, 3 Apr 2025 13:33:12 -0500
Terry Bowman <terry.bowman@amd.com> wrote:
> From: Nathan Fontenot <nathan.fontenot@amd.com>
>
> Add a release_Sam_region_adjustable() interface to allow for
Who is Sam? (typo)
> removing SOFT RESERVE memory resources. This extracts out the code
> to remove a mem region into a common __release_mem_region_adjustable()
> routine, this routine takes additional parameters of an IORES
> descriptor type to add checks for IORES_DESC_* and a flag to check
> for IORESOURCE_BUSY to control it's behavior.
>
> The existing release_mem_region_adjustable() is a front end to the
> common code and a new release_srmem_region_adjustable() is added to
> release SOFT RESERVE resources.
>
> Signed-off-by: Nathan Fontenot <nathan.fontenot@amd.com>
> Signed-off-by: Terry Bowman <terry.bowman@amd.com>
> ---
> include/linux/ioport.h | 3 +++
> kernel/resource.c | 55 +++++++++++++++++++++++++++++++++++++++---
> 2 files changed, 54 insertions(+), 4 deletions(-)
>
> diff --git a/include/linux/ioport.h b/include/linux/ioport.h
> index 5385349f0b8a..718360c9c724 100644
> --- a/include/linux/ioport.h
> +++ b/include/linux/ioport.h
> @@ -357,6 +357,9 @@ extern void __release_region(struct resource *, resource_size_t,
> #ifdef CONFIG_MEMORY_HOTREMOVE
> extern void release_mem_region_adjustable(resource_size_t, resource_size_t);
> #endif
> +#ifdef CONFIG_CXL_REGION
> +extern void release_srmem_region_adjustable(resource_size_t, resource_size_t);
I'm not sure the srmem is obvious enough. Maybe it's worth the long
name to spell it out some more.. e.g. something like
extern void release_softresv_mem_region_adjustable() ?
> +#endif
> #ifdef CONFIG_MEMORY_HOTPLUG
> extern void merge_system_ram_resource(struct resource *res);
> #endif
> diff --git a/kernel/resource.c b/kernel/resource.c
> index 12004452d999..0195b31064b0 100644
> --- a/kernel/resource.c
> +++ b/kernel/resource.c
> @@ -1387,7 +1387,7 @@ void __release_region(struct resource *parent, resource_size_t start,
> }
> EXPORT_SYMBOL(__release_region);
>
> -#ifdef CONFIG_MEMORY_HOTREMOVE
> +#if defined(CONFIG_MEMORY_HOTREMOVE) || defined(CONFIG_CXL_REGION)
> /**
> * release_mem_region_adjustable - release a previously reserved memory region
Looks like you left the old docs which I'm guessing is not the intent.
> * @start: resource start address
> @@ -1407,7 +1407,10 @@ EXPORT_SYMBOL(__release_region);
> * assumes that all children remain in the lower address entry for
> * simplicity. Enhance this logic when necessary.
> */
> -void release_mem_region_adjustable(resource_size_t start, resource_size_t size)
> +static void __release_mem_region_adjustable(resource_size_t start,
> + resource_size_t size,
> + bool busy_check,
> + int res_desc)
> {
> struct resource *parent = &iomem_resource;
> struct resource *new_res = NULL;
> @@ -1446,7 +1449,12 @@ void release_mem_region_adjustable(resource_size_t start, resource_size_t size)
> if (!(res->flags & IORESOURCE_MEM))
> break;
>
> - if (!(res->flags & IORESOURCE_BUSY)) {
> + if (busy_check && !(res->flags & IORESOURCE_BUSY)) {
> + p = &res->child;
> + continue;
> + }
> +
> + if (res_desc != IORES_DESC_NONE && res->desc != res_desc) {
> p = &res->child;
> continue;
> }
> @@ -1496,7 +1504,46 @@ void release_mem_region_adjustable(resource_size_t start, resource_size_t size)
> write_unlock(&resource_lock);
> free_resource(new_res);
> }
> -#endif /* CONFIG_MEMORY_HOTREMOVE */
> +#endif
> +
> +#ifdef CONFIG_MEMORY_HOTREMOVE
> +/**
> + * release_mem_region_adjustable - release a previously reserved memory region
As above. I was surprised to see new docs in here for an existing function.
I think you forgot to delete the now wrongly placed ones above.
Jonathan
On 4/4/2025 8:16 AM, Jonathan Cameron wrote:
> On Thu, 3 Apr 2025 13:33:12 -0500
> Terry Bowman <terry.bowman@amd.com> wrote:
>
>> From: Nathan Fontenot <nathan.fontenot@amd.com>
>>
>> Add a release_Sam_region_adjustable() interface to allow for
>
> Who is Sam? (typo)
>
Hi Jonathan,
It is a typo. I will fix.
>> removing SOFT RESERVE memory resources. This extracts out the code
>> to remove a mem region into a common __release_mem_region_adjustable()
>> routine, this routine takes additional parameters of an IORES
>> descriptor type to add checks for IORES_DESC_* and a flag to check
>> for IORESOURCE_BUSY to control it's behavior.
>>
>> The existing release_mem_region_adjustable() is a front end to the
>> common code and a new release_srmem_region_adjustable() is added to
>> release SOFT RESERVE resources.
>>
>> Signed-off-by: Nathan Fontenot <nathan.fontenot@amd.com>
>> Signed-off-by: Terry Bowman <terry.bowman@amd.com>
>> ---
>> include/linux/ioport.h | 3 +++
>> kernel/resource.c | 55 +++++++++++++++++++++++++++++++++++++++---
>> 2 files changed, 54 insertions(+), 4 deletions(-)
>>
>> diff --git a/include/linux/ioport.h b/include/linux/ioport.h
>> index 5385349f0b8a..718360c9c724 100644
>> --- a/include/linux/ioport.h
>> +++ b/include/linux/ioport.h
>> @@ -357,6 +357,9 @@ extern void __release_region(struct resource *, resource_size_t,
>> #ifdef CONFIG_MEMORY_HOTREMOVE
>> extern void release_mem_region_adjustable(resource_size_t, resource_size_t);
>> #endif
>> +#ifdef CONFIG_CXL_REGION
>> +extern void release_srmem_region_adjustable(resource_size_t, resource_size_t);
> I'm not sure the srmem is obvious enough. Maybe it's worth the long
> name to spell it out some more.. e.g. something like
>
Yes, I'll update with a re name.
> extern void release_softresv_mem_region_adjustable() ?
>> +#endif
>> #ifdef CONFIG_MEMORY_HOTPLUG
>> extern void merge_system_ram_resource(struct resource *res);
>> #endif
>> diff --git a/kernel/resource.c b/kernel/resource.c
>> index 12004452d999..0195b31064b0 100644
>> --- a/kernel/resource.c
>> +++ b/kernel/resource.c
>> @@ -1387,7 +1387,7 @@ void __release_region(struct resource *parent, resource_size_t start,
>> }
>> EXPORT_SYMBOL(__release_region);
>>
>> -#ifdef CONFIG_MEMORY_HOTREMOVE
>> +#if defined(CONFIG_MEMORY_HOTREMOVE) || defined(CONFIG_CXL_REGION)
>> /**
>> * release_mem_region_adjustable - release a previously reserved memory region
>
> Looks like you left the old docs which I'm guessing is not the intent.
>
Correct, this is not intended. Ill remove.
>> * @start: resource start address
>> @@ -1407,7 +1407,10 @@ EXPORT_SYMBOL(__release_region);
>> * assumes that all children remain in the lower address entry for
>> * simplicity. Enhance this logic when necessary.
>> */
>> -void release_mem_region_adjustable(resource_size_t start, resource_size_t size)
>> +static void __release_mem_region_adjustable(resource_size_t start,
>> + resource_size_t size,
>> + bool busy_check,
>> + int res_desc)
>> {
>> struct resource *parent = &iomem_resource;
>> struct resource *new_res = NULL;
>> @@ -1446,7 +1449,12 @@ void release_mem_region_adjustable(resource_size_t start, resource_size_t size)
>> if (!(res->flags & IORESOURCE_MEM))
>> break;
>>
>> - if (!(res->flags & IORESOURCE_BUSY)) {
>> + if (busy_check && !(res->flags & IORESOURCE_BUSY)) {
>> + p = &res->child;
>> + continue;
>> + }
>> +
>> + if (res_desc != IORES_DESC_NONE && res->desc != res_desc) {
>> p = &res->child;
>> continue;
>> }
>> @@ -1496,7 +1504,46 @@ void release_mem_region_adjustable(resource_size_t start, resource_size_t size)
>> write_unlock(&resource_lock);
>> free_resource(new_res);
>> }
>> -#endif /* CONFIG_MEMORY_HOTREMOVE */
>> +#endif
>> +
>> +#ifdef CONFIG_MEMORY_HOTREMOVE
>> +/**
>> + * release_mem_region_adjustable - release a previously reserved memory region
> As above. I was surprised to see new docs in here for an existing function.
> I think you forgot to delete the now wrongly placed ones above.
>
> Jonathan
>
Right, I'll remove the now old function comment.
-Terry
On Fri, Apr 04, 2025 at 02:16:39PM +0100, Jonathan Cameron wrote: > On Thu, 3 Apr 2025 13:33:12 -0500 Terry Bowman <terry.bowman@amd.com> wrote: > > Add a release_Sam_region_adjustable() interface to allow for > > Who is Sam? (typo) Somebody's uncle? ... > > #ifdef CONFIG_MEMORY_HOTREMOVE > > extern void release_mem_region_adjustable(resource_size_t, resource_size_t); > > #endif > > +#ifdef CONFIG_CXL_REGION > > +extern void release_srmem_region_adjustable(resource_size_t, resource_size_t); > I'm not sure the srmem is obvious enough. Maybe it's worth the long > name to spell it out some more.. e.g. something like And perhaps drop 'extern' as it's not needed. > extern void release_softresv_mem_region_adjustable() ? > > #ifdef CONFIG_MEMORY_HOTPLUG > > extern void merge_system_ram_resource(struct resource *res); > > #endif -- With Best Regards, Andy Shevchenko
On 4/4/2025 8:25 AM, Andy Shevchenko wrote: > On Fri, Apr 04, 2025 at 02:16:39PM +0100, Jonathan Cameron wrote: >> On Thu, 3 Apr 2025 13:33:12 -0500 Terry Bowman <terry.bowman@amd.com> wrote: > >>> Add a release_Sam_region_adjustable() interface to allow for >> >> Who is Sam? (typo) > > Somebody's uncle? > > ... > >>> #ifdef CONFIG_MEMORY_HOTREMOVE >>> extern void release_mem_region_adjustable(resource_size_t, resource_size_t); >>> #endif >>> +#ifdef CONFIG_CXL_REGION >>> +extern void release_srmem_region_adjustable(resource_size_t, resource_size_t); >> I'm not sure the srmem is obvious enough. Maybe it's worth the long >> name to spell it out some more.. e.g. something like > > And perhaps drop 'extern' as it's not needed. > Got it. -Terry >> extern void release_softresv_mem_region_adjustable() ? > >>> #ifdef CONFIG_MEMORY_HOTPLUG >>> extern void merge_system_ram_resource(struct resource *res); >>> #endif >
Hi Terry,
kernel test robot noticed the following build warnings:
[auto build test WARNING on aae0594a7053c60b82621136257c8b648c67b512]
url: https://github.com/intel-lab-lkp/linux/commits/Terry-Bowman/kernel-resource-Provide-mem-region-release-for-SOFT-RESERVES/20250404-023601
base: aae0594a7053c60b82621136257c8b648c67b512
patch link: https://lore.kernel.org/r/20250403183315.286710-2-terry.bowman%40amd.com
patch subject: [PATCH v3 1/4] kernel/resource: Provide mem region release for SOFT RESERVES
config: i386-buildonly-randconfig-003-20250404 (https://download.01.org/0day-ci/archive/20250404/202504042030.Rs5G4dWd-lkp@intel.com/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250404/202504042030.Rs5G4dWd-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202504042030.Rs5G4dWd-lkp@intel.com/
All warnings (new ones prefixed by >>):
>> kernel/resource.c:1414: warning: Function parameter or struct member 'busy_check' not described in '__release_mem_region_adjustable'
>> kernel/resource.c:1414: warning: Function parameter or struct member 'res_desc' not described in '__release_mem_region_adjustable'
>> kernel/resource.c:1414: warning: expecting prototype for release_mem_region_adjustable(). Prototype was for __release_mem_region_adjustable() instead
vim +1414 kernel/resource.c
^1da177e4c3f41 Linus Torvalds 2005-04-16 1389
e4ebc182a59bbb Nathan Fontenot 2025-04-03 1390 #if defined(CONFIG_MEMORY_HOTREMOVE) || defined(CONFIG_CXL_REGION)
825f787bb49676 Toshi Kani 2013-04-29 1391 /**
825f787bb49676 Toshi Kani 2013-04-29 1392 * release_mem_region_adjustable - release a previously reserved memory region
825f787bb49676 Toshi Kani 2013-04-29 1393 * @start: resource start address
825f787bb49676 Toshi Kani 2013-04-29 1394 * @size: resource region size
825f787bb49676 Toshi Kani 2013-04-29 1395 *
825f787bb49676 Toshi Kani 2013-04-29 1396 * This interface is intended for memory hot-delete. The requested region
825f787bb49676 Toshi Kani 2013-04-29 1397 * is released from a currently busy memory resource. The requested region
825f787bb49676 Toshi Kani 2013-04-29 1398 * must either match exactly or fit into a single busy resource entry. In
825f787bb49676 Toshi Kani 2013-04-29 1399 * the latter case, the remaining resource is adjusted accordingly.
825f787bb49676 Toshi Kani 2013-04-29 1400 * Existing children of the busy memory resource must be immutable in the
825f787bb49676 Toshi Kani 2013-04-29 1401 * request.
825f787bb49676 Toshi Kani 2013-04-29 1402 *
825f787bb49676 Toshi Kani 2013-04-29 1403 * Note:
825f787bb49676 Toshi Kani 2013-04-29 1404 * - Additional release conditions, such as overlapping region, can be
825f787bb49676 Toshi Kani 2013-04-29 1405 * supported after they are confirmed as valid cases.
825f787bb49676 Toshi Kani 2013-04-29 1406 * - When a busy memory resource gets split into two entries, the code
825f787bb49676 Toshi Kani 2013-04-29 1407 * assumes that all children remain in the lower address entry for
825f787bb49676 Toshi Kani 2013-04-29 1408 * simplicity. Enhance this logic when necessary.
825f787bb49676 Toshi Kani 2013-04-29 1409 */
e4ebc182a59bbb Nathan Fontenot 2025-04-03 1410 static void __release_mem_region_adjustable(resource_size_t start,
e4ebc182a59bbb Nathan Fontenot 2025-04-03 1411 resource_size_t size,
e4ebc182a59bbb Nathan Fontenot 2025-04-03 1412 bool busy_check,
e4ebc182a59bbb Nathan Fontenot 2025-04-03 1413 int res_desc)
825f787bb49676 Toshi Kani 2013-04-29 @1414 {
cb8e3c8b4f45e4 David Hildenbrand 2020-10-15 1415 struct resource *parent = &iomem_resource;
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1416 struct resource *new_res = NULL;
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1417 bool alloc_nofail = false;
825f787bb49676 Toshi Kani 2013-04-29 1418 struct resource **p;
825f787bb49676 Toshi Kani 2013-04-29 1419 struct resource *res;
825f787bb49676 Toshi Kani 2013-04-29 1420 resource_size_t end;
825f787bb49676 Toshi Kani 2013-04-29 1421
825f787bb49676 Toshi Kani 2013-04-29 1422 end = start + size - 1;
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1423 if (WARN_ON_ONCE((start < parent->start) || (end > parent->end)))
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1424 return;
825f787bb49676 Toshi Kani 2013-04-29 1425
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1426 /*
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1427 * We free up quite a lot of memory on memory hotunplug (esp., memap),
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1428 * just before releasing the region. This is highly unlikely to
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1429 * fail - let's play save and make it never fail as the caller cannot
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1430 * perform any error handling (e.g., trying to re-add memory will fail
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1431 * similarly).
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1432 */
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1433 retry:
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1434 new_res = alloc_resource(GFP_KERNEL | (alloc_nofail ? __GFP_NOFAIL : 0));
825f787bb49676 Toshi Kani 2013-04-29 1435
825f787bb49676 Toshi Kani 2013-04-29 1436 p = &parent->child;
825f787bb49676 Toshi Kani 2013-04-29 1437 write_lock(&resource_lock);
825f787bb49676 Toshi Kani 2013-04-29 1438
825f787bb49676 Toshi Kani 2013-04-29 1439 while ((res = *p)) {
825f787bb49676 Toshi Kani 2013-04-29 1440 if (res->start >= end)
825f787bb49676 Toshi Kani 2013-04-29 1441 break;
825f787bb49676 Toshi Kani 2013-04-29 1442
825f787bb49676 Toshi Kani 2013-04-29 1443 /* look for the next resource if it does not fit into */
825f787bb49676 Toshi Kani 2013-04-29 1444 if (res->start > start || res->end < end) {
825f787bb49676 Toshi Kani 2013-04-29 1445 p = &res->sibling;
825f787bb49676 Toshi Kani 2013-04-29 1446 continue;
825f787bb49676 Toshi Kani 2013-04-29 1447 }
825f787bb49676 Toshi Kani 2013-04-29 1448
825f787bb49676 Toshi Kani 2013-04-29 1449 if (!(res->flags & IORESOURCE_MEM))
825f787bb49676 Toshi Kani 2013-04-29 1450 break;
825f787bb49676 Toshi Kani 2013-04-29 1451
e4ebc182a59bbb Nathan Fontenot 2025-04-03 1452 if (busy_check && !(res->flags & IORESOURCE_BUSY)) {
e4ebc182a59bbb Nathan Fontenot 2025-04-03 1453 p = &res->child;
e4ebc182a59bbb Nathan Fontenot 2025-04-03 1454 continue;
e4ebc182a59bbb Nathan Fontenot 2025-04-03 1455 }
e4ebc182a59bbb Nathan Fontenot 2025-04-03 1456
e4ebc182a59bbb Nathan Fontenot 2025-04-03 1457 if (res_desc != IORES_DESC_NONE && res->desc != res_desc) {
825f787bb49676 Toshi Kani 2013-04-29 1458 p = &res->child;
825f787bb49676 Toshi Kani 2013-04-29 1459 continue;
825f787bb49676 Toshi Kani 2013-04-29 1460 }
825f787bb49676 Toshi Kani 2013-04-29 1461
825f787bb49676 Toshi Kani 2013-04-29 1462 /* found the target resource; let's adjust accordingly */
825f787bb49676 Toshi Kani 2013-04-29 1463 if (res->start == start && res->end == end) {
825f787bb49676 Toshi Kani 2013-04-29 1464 /* free the whole entry */
825f787bb49676 Toshi Kani 2013-04-29 1465 *p = res->sibling;
ebff7d8f270d04 Yasuaki Ishimatsu 2013-04-29 1466 free_resource(res);
825f787bb49676 Toshi Kani 2013-04-29 1467 } else if (res->start == start && res->end != end) {
825f787bb49676 Toshi Kani 2013-04-29 1468 /* adjust the start */
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1469 WARN_ON_ONCE(__adjust_resource(res, end + 1,
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1470 res->end - end));
825f787bb49676 Toshi Kani 2013-04-29 1471 } else if (res->start != start && res->end == end) {
825f787bb49676 Toshi Kani 2013-04-29 1472 /* adjust the end */
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1473 WARN_ON_ONCE(__adjust_resource(res, res->start,
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1474 start - res->start));
825f787bb49676 Toshi Kani 2013-04-29 1475 } else {
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1476 /* split into two entries - we need a new resource */
825f787bb49676 Toshi Kani 2013-04-29 1477 if (!new_res) {
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1478 new_res = alloc_resource(GFP_ATOMIC);
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1479 if (!new_res) {
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1480 alloc_nofail = true;
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1481 write_unlock(&resource_lock);
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1482 goto retry;
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1483 }
825f787bb49676 Toshi Kani 2013-04-29 1484 }
825f787bb49676 Toshi Kani 2013-04-29 1485 new_res->name = res->name;
825f787bb49676 Toshi Kani 2013-04-29 1486 new_res->start = end + 1;
825f787bb49676 Toshi Kani 2013-04-29 1487 new_res->end = res->end;
825f787bb49676 Toshi Kani 2013-04-29 1488 new_res->flags = res->flags;
43ee493bde78da Toshi Kani 2016-01-26 1489 new_res->desc = res->desc;
825f787bb49676 Toshi Kani 2013-04-29 1490 new_res->parent = res->parent;
825f787bb49676 Toshi Kani 2013-04-29 1491 new_res->sibling = res->sibling;
825f787bb49676 Toshi Kani 2013-04-29 1492 new_res->child = NULL;
825f787bb49676 Toshi Kani 2013-04-29 1493
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1494 if (WARN_ON_ONCE(__adjust_resource(res, res->start,
ec62d04e3fdc4b David Hildenbrand 2020-10-15 1495 start - res->start)))
825f787bb49676 Toshi Kani 2013-04-29 1496 break;
825f787bb49676 Toshi Kani 2013-04-29 1497 res->sibling = new_res;
825f787bb49676 Toshi Kani 2013-04-29 1498 new_res = NULL;
825f787bb49676 Toshi Kani 2013-04-29 1499 }
825f787bb49676 Toshi Kani 2013-04-29 1500
825f787bb49676 Toshi Kani 2013-04-29 1501 break;
825f787bb49676 Toshi Kani 2013-04-29 1502 }
825f787bb49676 Toshi Kani 2013-04-29 1503
825f787bb49676 Toshi Kani 2013-04-29 1504 write_unlock(&resource_lock);
ebff7d8f270d04 Yasuaki Ishimatsu 2013-04-29 1505 free_resource(new_res);
825f787bb49676 Toshi Kani 2013-04-29 1506 }
e4ebc182a59bbb Nathan Fontenot 2025-04-03 1507 #endif
e4ebc182a59bbb Nathan Fontenot 2025-04-03 1508
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
On Thu, Apr 03, 2025 at 01:33:12PM -0500, Terry Bowman wrote:
> From: Nathan Fontenot <nathan.fontenot@amd.com>
>
> Add a release_Sam_region_adjustable() interface to allow for
> removing SOFT RESERVE memory resources. This extracts out the code
> to remove a mem region into a common __release_mem_region_adjustable()
> routine, this routine takes additional parameters of an IORES
> descriptor type to add checks for IORES_DESC_* and a flag to check
> for IORESOURCE_BUSY to control it's behavior.
>
> The existing release_mem_region_adjustable() is a front end to the
> common code and a new release_srmem_region_adjustable() is added to
> release SOFT RESERVE resources.
...
> +void release_mem_region_adjustable(resource_size_t start, resource_size_t size)
> +{
> + return __release_mem_region_adjustable(start, size,
You have still room on the previous line for the parameters.
> + true, IORES_DESC_NONE);
Return on void?! Interesting... What do you want to do here?
> +}
> +EXPORT_SYMBOL(release_mem_region_adjustable);
> +#endif
> +
> +#ifdef CONFIG_CXL_REGION
> +void release_srmem_region_adjustable(resource_size_t start,
> + resource_size_t size)
This can be put on a single line.
> +{
> + return __release_mem_region_adjustable(start, size,
> + false, IORES_DESC_SOFT_RESERVED);
Same comments as per above function.
> +}
> +EXPORT_SYMBOL(release_srmem_region_adjustable);
> +#endif
--
With Best Regards,
Andy Shevchenko
Hi Andy,
Thanks for reviewing this. I'll make updates for all you pointed out below.
Regards,
Terry
On 4/3/2025 1:40 PM, Andy Shevchenko wrote:
> On Thu, Apr 03, 2025 at 01:33:12PM -0500, Terry Bowman wrote:
>> From: Nathan Fontenot <nathan.fontenot@amd.com>
>>
>> Add a release_Sam_region_adjustable() interface to allow for
>> removing SOFT RESERVE memory resources. This extracts out the code
>> to remove a mem region into a common __release_mem_region_adjustable()
>> routine, this routine takes additional parameters of an IORES
>> descriptor type to add checks for IORES_DESC_* and a flag to check
>> for IORESOURCE_BUSY to control it's behavior.
>>
>> The existing release_mem_region_adjustable() is a front end to the
>> common code and a new release_srmem_region_adjustable() is added to
>> release SOFT RESERVE resources.
> ...
>
>> +void release_mem_region_adjustable(resource_size_t start, resource_size_t size)
>> +{
>> + return __release_mem_region_adjustable(start, size,
> You have still room on the previous line for the parameters.
>
>> + true, IORES_DESC_NONE);
> Return on void?! Interesting... What do you want to do here?
>
>> +}
>> +EXPORT_SYMBOL(release_mem_region_adjustable);
>> +#endif
>> +
>> +#ifdef CONFIG_CXL_REGION
>> +void release_srmem_region_adjustable(resource_size_t start,
>> + resource_size_t size)
> This can be put on a single line.
>
>> +{
>> + return __release_mem_region_adjustable(start, size,
>> + false, IORES_DESC_SOFT_RESERVED);
> Same comments as per above function.
>
>> +}
>> +EXPORT_SYMBOL(release_srmem_region_adjustable);
>> +#endif
© 2016 - 2026 Red Hat, Inc.