Skip to content

Commit b78dfa0

Browse files
davidhildenbrandtorvalds
authored andcommitted
kernel/resource: clean up and optimize iomem_is_exclusive()
Patch series "virtio-mem: disallow mapping virtio-mem memory via /dev/mem", v5. Let's add the basic infrastructure to exclude some physical memory regions marked as "IORESOURCE_SYSTEM_RAM" completely from /dev/mem access, even though they are not marked IORESOURCE_BUSY and even though "iomem=relaxed" is set. Resource IORESOURCE_EXCLUSIVE for that purpose instead of adding new flags to express something similar to "soft-busy" or "not busy yet, but already prepared by a driver and not to be mapped by user space". Use it for virtio-mem, to disallow mapping any virtio-mem memory via /dev/mem to user space after the virtio-mem driver was loaded. This patch (of 3): We end up traversing subtrees of ranges we are not interested in; let's optimize this case, skipping such subtrees, cleaning up the function a bit. For example, in the following configuration (/proc/iomem): 00000000-00000fff : Reserved 00001000-00057fff : System RAM 00058000-00058fff : Reserved 00059000-0009cfff : System RAM 0009d000-000fffff : Reserved 000a0000-000bffff : PCI Bus 0000:00 000c0000-000c3fff : PCI Bus 0000:00 000c4000-000c7fff : PCI Bus 0000:00 000c8000-000cbfff : PCI Bus 0000:00 000cc000-000cffff : PCI Bus 0000:00 000d0000-000d3fff : PCI Bus 0000:00 000d4000-000d7fff : PCI Bus 0000:00 000d8000-000dbfff : PCI Bus 0000:00 000dc000-000dffff : PCI Bus 0000:00 000e0000-000e3fff : PCI Bus 0000:00 000e4000-000e7fff : PCI Bus 0000:00 000e8000-000ebfff : PCI Bus 0000:00 000ec000-000effff : PCI Bus 0000:00 000f0000-000fffff : PCI Bus 0000:00 000f0000-000fffff : System ROM 00100000-3fffffff : System RAM 40000000-403fffff : Reserved 40000000-403fffff : pnp 00:00 40400000-80a79fff : System RAM ... We don't have to look at any children of "0009d000-000fffff : Reserved" if we can just skip these 15 items directly because the parent range is not of interest. Link: https://lkml.kernel.org/r/[email protected] Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: David Hildenbrand <[email protected]> Reviewed-by: Dan Williams <[email protected]> Cc: Arnd Bergmann <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Cc: "Michael S. Tsirkin" <[email protected]> Cc: Jason Wang <[email protected]> Cc: "Rafael J. Wysocki" <[email protected]> Cc: Hanjun Guo <[email protected]> Cc: Andy Shevchenko <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 3b29411 commit b78dfa0

File tree

1 file changed

+20
-5
lines changed

1 file changed

+20
-5
lines changed

kernel/resource.c

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,18 @@ static struct resource *next_resource(struct resource *p)
7373
return p->sibling;
7474
}
7575

76+
static struct resource *next_resource_skip_children(struct resource *p)
77+
{
78+
while (!p->sibling && p->parent)
79+
p = p->parent;
80+
return p->sibling;
81+
}
82+
83+
#define for_each_resource(_root, _p, _skip_children) \
84+
for ((_p) = (_root)->child; (_p); \
85+
(_p) = (_skip_children) ? next_resource_skip_children(_p) : \
86+
next_resource(_p))
87+
7688
static void *r_next(struct seq_file *m, void *v, loff_t *pos)
7789
{
7890
struct resource *p = v;
@@ -1712,26 +1724,29 @@ static int strict_iomem_checks;
17121724
*/
17131725
bool iomem_is_exclusive(u64 addr)
17141726
{
1715-
struct resource *p = &iomem_resource;
1716-
bool err = false;
1717-
loff_t l;
1727+
bool skip_children = false, err = false;
17181728
int size = PAGE_SIZE;
1729+
struct resource *p;
17191730

17201731
if (!strict_iomem_checks)
17211732
return false;
17221733

17231734
addr = addr & PAGE_MASK;
17241735

17251736
read_lock(&resource_lock);
1726-
for (p = p->child; p ; p = r_next(NULL, p, &l)) {
1737+
for_each_resource(&iomem_resource, p, skip_children) {
17271738
/*
17281739
* We can probably skip the resources without
17291740
* IORESOURCE_IO attribute?
17301741
*/
17311742
if (p->start >= addr + size)
17321743
break;
1733-
if (p->end < addr)
1744+
if (p->end < addr) {
1745+
skip_children = true;
17341746
continue;
1747+
}
1748+
skip_children = false;
1749+
17351750
/*
17361751
* A resource is exclusive if IORESOURCE_EXCLUSIVE is set
17371752
* or CONFIG_IO_STRICT_DEVMEM is enabled and the

0 commit comments

Comments
 (0)