Skip to content

Commit

Permalink
resource: avoid unnecessary resource tree walking in __region_interse…
Browse files Browse the repository at this point in the history
…cts()

Currently, if __region_intersects() finds any overlapped but unmatched
resource, it walks the descendant resource tree to check for overlapped
and matched descendant resources using for_each_resource().  However, in
current kernel, for_each_resource() iterates not only the descendant tree,
but also subsequent sibling trees in certain scenarios.  While this
doesn't introduce bugs, it makes code hard to be understood and
potentially inefficient.

So, the patch revises next_resource() and for_each_resource() and makes
for_each_resource() traverse the subtree under the specified subtree root
only.  Test shows that this avoids unnecessary resource tree walking in
__region_intersects().

For the example resource tree as follows,

  X
  |
  A----D----E
  |
  B--C

if 'A' is the overlapped but unmatched resource, original kernel
iterates 'B', 'C', 'D', 'E' when it walks the descendant tree.  While
the patched kernel iterates only 'B', 'C'.

Thanks David Hildenbrand for providing a good resource tree example.

Link: https://lkml.kernel.org/r/20241029122735.79164-1-ying.huang@intel.com
Signed-off-by: "Huang, Ying" <ying.huang@intel.com>
Acked-by: Dan Williams <dan.j.williams@intel.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Jonathan Cameron <jonathan.cameron@huawei.com>
Cc: Alistair Popple <apopple@nvidia.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Baoquan He <bhe@redhat.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Alison Schofield <alison.schofield@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  • Loading branch information
Huang Ying authored and Andrew Morton committed Nov 6, 2024
1 parent 77e94b0 commit d7ce9c7
Showing 1 changed file with 22 additions and 4 deletions.
26 changes: 22 additions & 4 deletions kernel/resource.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,35 @@ EXPORT_SYMBOL(iomem_resource);

static DEFINE_RWLOCK(resource_lock);

static struct resource *next_resource(struct resource *p, bool skip_children)
/*
* Return the next node of @p in pre-order tree traversal. If
* @skip_children is true, skip the descendant nodes of @p in
* traversal. If @p is a descendant of @subtree_root, only traverse
* the subtree under @subtree_root.
*/
static struct resource *next_resource(struct resource *p, bool skip_children,
struct resource *subtree_root)
{
if (!skip_children && p->child)
return p->child;
while (!p->sibling && p->parent)
while (!p->sibling && p->parent) {
p = p->parent;
if (p == subtree_root)
return NULL;
}
return p->sibling;
}

/*
* Traverse the resource subtree under @_root in pre-order, excluding
* @_root itself.
*
* NOTE: '__p' is introduced to avoid shadowing '_p' outside of loop.
* And it is referenced to avoid unused variable warning.
*/
#define for_each_resource(_root, _p, _skip_children) \
for ((_p) = (_root)->child; (_p); (_p) = next_resource(_p, _skip_children))
for (typeof(_root) __root = (_root), __p = _p = __root->child; \
__p && _p; _p = next_resource(_p, _skip_children, __root))

#ifdef CONFIG_PROC_FS

Expand Down Expand Up @@ -88,7 +106,7 @@ static void *r_next(struct seq_file *m, void *v, loff_t *pos)

(*pos)++;

return (void *)next_resource(p, false);
return (void *)next_resource(p, false, NULL);
}

static void r_stop(struct seq_file *m, void *v)
Expand Down

0 comments on commit d7ce9c7

Please sign in to comment.