resource: introduce union(), intersection() API
v4 cover resource: introduce union(), intersection() API
Some users may want to use resource library to manage their own resources, besides existing users that open code union() and intersection() implementations.
Provide a generic API for wider use.
Changelog v4:
- added Rb tag (Rafael)
- Cc'ed to LKML and Greg (Rafael)
Changelog v3:
- rebased on top of v5.10-rc1
- dropped upstreamed dependencies
- added Rb tag to the last patch (Mika)
Andy Shevchenko (6):
resource: Simplify region_intersects() by reducing conditionals
resource: Group resource_overlaps() with other inline helpers
resource: Introduce resource_union() for overlapping resources
resource: Introduce resource_intersection() for overlapping resources PCI/ACPI: Replace open coded variant of resource_union()
ACPI: watchdog: Replace open coded variant of resource_union()
drivers/acpi/acpi_watchdog.c | 6 +----- drivers/acpi/pci_root.c | 4 +--- include/linux/ioport.h | 34 +++++++++++++++++++++++++++------- kernel/resource.c | 10 +++++----- 4 files changed, 34 insertions(+), 20 deletions(-)
Signature · 1 line
2.28.0
PATCH v4 1/6 resource: Simplify region_intersects() by reducing conditionals
Now we have for 'other' and 'type' variables
other type return
0 0 REGION_DISJOINT 0 x REGION_INTERSECTS x 0 REGION_DISJOINT x x REGION_MIXED
Obviously it's easier to check 'type' for 0 first instead of currently checked 'other'.
--- kernel/resource.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
kernel/resource.c +5 -5
@@ -557,13 +557,13 @@ int region_intersects(resource_size_t start, size_t size, unsigned long flags, }read_unlock (&resource_lock); -if (other ==0 ) -return type ?REGION_INTERSECTS :REGION_DISJOINT ; +if (type ==0 ) +return REGION_DISJOINT ; -if (type) -return REGION_MIXED ; +if (other ==0 ) +return REGION_INTERSECTS ; -return REGION_DISJOINT ; +return REGION_MIXED ; }EXPORT_SYMBOL_GPL (region_intersects);
Signature · 1 line
2.28.0
PATCH v4 2/6 resource: Group resource_overlaps() with other inline helpers
In reply to Andy ShevchenkoFor better maintenance group resource_overlaps() with other inline helpers. While at it, drop extra parentheses.
--- include/linux/ioport.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
include/linux/ioport.h +5 -6
@@ -229,6 +229,11 @@ static inline bool resource_contains(struct resource *r1, struct resource *r2)return r1->start <= r2->start && r1->end >= r2->end; } +/* True if any part of r1 overlaps r2 */ +static inline bool resource_overlaps (struct resource *r1,struct resource *r2) +{ +return r1->start <= r2->end && r1->end >= r2->start; +}/* Convenience shorthand with allocation */ #define request_region (start,n,name) __request_region(&ioport_resource, (start), (n), (name), 0)
@@ -296,12 +301,6 @@ extern int walk_iomem_res_desc(unsigned long desc, unsigned long flags, u64 start, u64 end, void *arg, int (*func)(struct resource *, void *)); -/* True if any part of r1 overlaps r2 */ -static inline bool resource_overlaps (struct resource *r1,struct resource *r2) -{ -return (r1->start <= r2->end && r1->end >= r2->start); -} -struct resource *devm_request_free_mem_region (struct device *dev,struct resource *base,unsigned long size); struct resource *request_free_mem_region(struct resource *base,
Signature · 1 line
2.28.0
PATCH v4 3/6 resource: Introduce resource_union() for overlapping resources
In reply to Andy ShevchenkoSome already present users may utilize resource_union() helper. Provide it for them and for wider use in the future.
--- include/linux/ioport.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
include/linux/ioport.h +12 -1
@@ -10,9 +10,10 @@#define _LINUX_IOPORT_H#ifndef __ASSEMBLY__ +#include <linux/bits.h> #include <linux/compiler.h> +#include <linux/minmax.h> #include <linux/types.h> -#include <linux/bits.h> /* * Resources are tree-like, allowing * nesting etc..
@@ -235,6 +236,16 @@ static inline bool resource_overlaps(struct resource *r1, struct resource *r2)return r1->start <= r2->end && r1->end >= r2->start; } +static inline bool +resource_union (struct resource *r1,struct resource *r2,struct resource *r) +{ +if (!resource_overlaps (r1, r2)) +return false; + r->start =min (r1->start, r2->start); + r->end =max (r1->end, r2->end); +return true; +} +/* Convenience shorthand with allocation */ #define request_region (start,n,name) __request_region(&ioport_resource, (start), (n), (name), 0)#define request_muxed_region (start,n,name) __request_region(&ioport_resource, (start), (n), (name), IORESOURCE_MUXED)
Signature · 1 line
2.28.0
PATCH v4 4/6 resource: Introduce resource_intersection() for overlapping resources
In reply to Andy ShevchenkoThere will be at least one user that can utilize new helper. Provide the helper for future user and for wider use.
--- include/linux/ioport.h | 10 ++++++++++ 1 file changed, 10 insertions(+)
include/linux/ioport.h +10 -0
@@ -236,6 +236,16 @@ static inline bool resource_overlaps(struct resource *r1, struct resource *r2)return r1->start <= r2->end && r1->end >= r2->start; } +static inline bool +resource_intersection (struct resource *r1,struct resource *r2,struct resource *r) +{ +if (!resource_overlaps (r1, r2)) +return false; + r->start =max (r1->start, r2->start); + r->end =min (r1->end, r2->end); +return true; +} +static inline bool resource_union (struct resource *r1,struct resource *r2,struct resource *r) {
Signature · 1 line
2.28.0
PATCH v4 5/6 PCI/ACPI: Replace open coded variant of resource_union()
In reply to Andy ShevchenkoSince we have resource_union() helper, let's utilize it here.
--- drivers/acpi/pci_root.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/acpi/pci_root.c +1 -3
@@ -722,9 +722,7 @@ static void acpi_pci_root_validate_resources(struct device *dev,* our resources no longer match the ACPI _CRS, but * the kernel resource tree doesn't allow overlaps. */ -if (resource_overlaps (res1, res2)) { - res2->start =min (res1->start, res2->start); - res2->end =max (res1->end, res2->end); +if (resource_union (res1, res2, res2)) {dev_info (dev,"host bridge window expanded to %pR; %pR ignored\n" , res2, res1); free = true;
Signature · 1 line
2.28.0
Re: [PATCH v4 5/6] PCI/ACPI: Replace open coded variant of resource_union()
Quoted 7 lines · Andy Shevchenko
Since we have
resource_union()helper, let's utilize it here.Signed-off-by Andy Shevchenko <[email protected]>Cc Kuppuswamy Sathyanarayanan <[email protected]>Cc Bjorn Helgaas <[email protected]>Reviewed-by Rafael J. Wysocki <[email protected]>
Quoted 20 lines
--- drivers/acpi/pci_root.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)drivers/acpi/pci_root.c +1
-3@@ -722,9 +722,7 @@ static void acpi_pci_root_validate_resources(struct device *dev,* our resources no longer match the ACPI _CRS, but * the kernel resource tree doesn't allow overlaps. */ -if (resource_overlaps (res1, res2)) { - res2->start =min (res1->start, res2->start); - res2->end =max (res1->end, res2->end); +if (resource_union (res1, res2, res2)) {dev_info (dev,"host bridge window expanded to %pR; %pR ignored\n" , res2, res1); free = true;
Signature · 2 lines
Sathyanarayanan Kuppuswamy Linux Kernel Developer
PATCH v4 6/6 ACPI: watchdog: Replace open coded variant of resource_union()
In reply to Andy ShevchenkoSince we have resource_union() helper, let's utilize it here.
--- drivers/acpi/acpi_watchdog.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/acpi/acpi_watchdog.c +1 -5
@@ -151,11 +151,7 @@ void __init acpi_watchdog_init(void) found = false;resource_list_for_each_entry (rentry, &resource_list) {if (rentry->res->flags == res.flags && -resource_overlaps (rentry->res, &res)) { -if (res.start < rentry->res->start) - rentry->res->start = res.start; -if (res.end > rentry->res->end) - rentry->res->end = res.end; +resource_union (rentry->res, &res, rentry->res)) { found = true;break ; }
Signature · 1 line
2.28.0
Quoted 27 lines · Andy Shevchenko
Some users may want to use resource library to manage their own resources, besides existing users that open code
union()andintersection()implementations.Provide a generic API for wider use.
Changelog v4:
- added Rb tag (Rafael)
- Cc'ed to LKML and Greg (Rafael)Changelog v3:
- rebased on top of v5.10-rc1
- dropped upstreamed dependencies
- added Rb tag to the last patch (Mika)Cc Kuppuswamy Sathyanarayanan <[email protected]>Cc Bjorn Helgaas <[email protected]>Andy Shevchenko (6):
resource: Simplifyregion_intersects()by reducing conditionals
resource: Groupresource_overlaps()with other inline helpers
resource: Introduceresource_union()for overlapping resources
resource: Introduceresource_intersection()for overlapping resources PCI/ACPI: Replace open coded variant ofresource_union()
ACPI: watchdog: Replace open coded variant ofresource_union()
Quoted 5 lines
drivers/acpi/acpi_watchdog.c | 6 +----- drivers/acpi/pci_root.c | 4 +--- include/linux/ioport.h | 34 +++++++++++++++++++++++++++------- kernel/resource.c | 10 +++++----- 4 files changed, 34 insertions(+), 20 deletions(-)
Quoted 29 lines · Hanjun Guo
Quoted 27 lines · Andy Shevchenko
Some users may want to use resource library to manage their own resources, besides existing users that open code
union()andintersection()implementations.Provide a generic API for wider use.
Changelog v4:
- added Rb tag (Rafael)
- Cc'ed to LKML and Greg (Rafael)Changelog v3:
- rebased on top of v5.10-rc1
- dropped upstreamed dependencies
- added Rb tag to the last patch (Mika)Cc Kuppuswamy Sathyanarayanan <[email protected]>Cc Bjorn Helgaas <[email protected]>Andy Shevchenko (6):
resource: Simplifyregion_intersects()by reducing conditionals
resource: Groupresource_overlaps()with other inline helpers
resource: Introduceresource_union()for overlapping resources
resource: Introduceresource_intersection()for overlapping resources PCI/ACPI: Replace open coded variant ofresource_union()
ACPI: watchdog: Replace open coded variant ofresource_union()
Quoted 7 lines
Quoted 5 lines
drivers/acpi/acpi_watchdog.c | 6 +----- drivers/acpi/pci_root.c | 4 +--- include/linux/ioport.h | 34 +++++++++++++++++++++++++++------- kernel/resource.c | 10 +++++----- 4 files changed, 34 insertions(+), 20 deletions(-)Reviewed-by Hanjun Guo <[email protected]>
Thanks. Is it for the entire series?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 36 lines · Andy Shevchenko
Quoted 35 lines · Hanjun Guo
Quoted 32 lines · Andy Shevchenko
Some users may want to use resource library to manage their own resources, besides existing users that open code
union()andintersection()implementations.Provide a generic API for wider use.
Changelog v4:
- added Rb tag (Rafael)
- Cc'ed to LKML and Greg (Rafael)Changelog v3:
- rebased on top of v5.10-rc1
- dropped upstreamed dependencies
- added Rb tag to the last patch (Mika)Cc Kuppuswamy Sathyanarayanan <[email protected]>Cc Bjorn Helgaas <[email protected]>Andy Shevchenko (6):
resource: Simplifyregion_intersects()by reducing conditionals
resource: Groupresource_overlaps()with other inline helpers
resource: Introduceresource_union()for overlapping resources
resource: Introduceresource_intersection()for overlapping resources PCI/ACPI: Replace open coded variant ofresource_union()
ACPI: watchdog: Replace open coded variant ofresource_union()drivers/acpi/acpi_watchdog.c | 6 +----- drivers/acpi/pci_root.c | 4 +--- include/linux/ioport.h | 34 +++++++++++++++++++++++++++------- kernel/resource.c | 10 +++++----- 4 files changed, 34 insertions(+), 20 deletions(-)
Quoted 3 lines
Quoted 1 line
Reviewed-by Hanjun Guo <[email protected]>Thanks. Is it for the entire series?
Yes.
By the way, I tested this patch set on a ARM64 machine booting with ACPI against 5.10-rc2, and no regressions with PCI, so feel free to add my Tested-by tag for patch [1,2,3,5/6].
Thanks
Hanjun
Quoted 9 lines · Andy Shevchenko
Some users may want to use resource library to manage their own resources, besides existing users that open code
union()andintersection()implementations.Provide a generic API for wider use.
Changelog v4:
- added Rb tag (Rafael)
- Cc'ed to LKML and Greg (Rafael)
Didn't we have some tests for this code somewhere? Have you added tests for the new functions you have added? If not, can you do that so that we "know" these work properly?
thanks,
greg k-h
Quoted 8 lines · Greg Kroah-Hartman
Quoted 6 lines · Andy Shevchenko
Some users may want to use resource library to manage their own resources, besides existing users that open code
union()andintersection()implementations.Provide a generic API for wider use.
Quoted 7 lines
Quoted 3 lines
Changelog v4:
- added Rb tag (Rafael)
- Cc'ed to LKML and Greg (Rafael)Didn't we have some tests for this code somewhere? Have you added tests for the new functions you have added? If not, can you do that so that we "know" these work properly?
Sure, I'll add for v5. Thanks for the hint!
Signature · 2 lines
With Best Regards, Andy Shevchenko