]> www.infradead.org Git - nvme.git/commitdiff
dma-debug: use memory_intersects() directly
authorKefeng Wang <wangkefeng.wang@huawei.com>
Thu, 22 Jul 2021 10:55:12 +0000 (18:55 +0800)
committerChristoph Hellwig <hch@lst.de>
Mon, 9 Aug 2021 15:03:17 +0000 (17:03 +0200)
There is already a memory_intersects() helper in sections.h,
use memory_intersects() directly instead of private overlap().

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
kernel/dma/debug.c

index dadae6255d0552643b54dc35b31339690cee770e..fe6efd1816146b17215a46835b016afd6f9d3808 100644 (file)
@@ -1064,20 +1064,10 @@ static void check_for_stack(struct device *dev,
        }
 }
 
-static inline bool overlap(void *addr, unsigned long len, void *start, void *end)
-{
-       unsigned long a1 = (unsigned long)addr;
-       unsigned long b1 = a1 + len;
-       unsigned long a2 = (unsigned long)start;
-       unsigned long b2 = (unsigned long)end;
-
-       return !(b1 <= a2 || a1 >= b2);
-}
-
 static void check_for_illegal_area(struct device *dev, void *addr, unsigned long len)
 {
-       if (overlap(addr, len, _stext, _etext) ||
-           overlap(addr, len, __start_rodata, __end_rodata))
+       if (memory_intersects(_stext, _etext, addr, len) ||
+           memory_intersects(__start_rodata, __end_rodata, addr, len))
                err_printk(dev, NULL, "device driver maps memory from kernel text or rodata [addr=%p] [len=%lu]\n", addr, len);
 }