From: Liam R. Howlett <Liam.Howlett@oracle.com>
Date: Mon, 24 Apr 2023 20:18:41 +0000 (-0400)
Subject: mm: Update vma_iter_store() to use MAS_WARN_ON()
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3af6cff26a902bfb3820a79e1df31f84b29a8cc4;p=users%2Fjedix%2Flinux-maple.git

mm: Update vma_iter_store() to use MAS_WARN_ON()

MAS_WARN_ON() will provide more information on the maple state and can
be more useful for debugging.  Use this version of WARN_ON() in the
debugging code when storing to the tree.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---

diff --git a/mm/internal.h b/mm/internal.h
index 8d1a8bd00124..76612a860e58 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -1047,18 +1047,17 @@ static inline void vma_iter_store(struct vma_iterator *vmi,
 {
 
 #if defined(CONFIG_DEBUG_VM_MAPLE_TREE)
-	if (WARN_ON(vmi->mas.node != MAS_START && vmi->mas.index > vma->vm_start)) {
-		printk("%lu > %lu\n", vmi->mas.index, vma->vm_start);
-		printk("store of vma %lu-%lu", vma->vm_start, vma->vm_end);
-		printk("into slot    %lu-%lu", vmi->mas.index, vmi->mas.last);
-		vma_iter_dump_tree(vmi);
+	if (MAS_WARN_ON(&vmi->mas, vmi->mas.node != MAS_START &&
+			vmi->mas.index > vma->vm_start)) {
+		printk("%lx > %lx\n", vmi->mas.index, vma->vm_start);
+		printk("store of vma %lx-%lx", vma->vm_start, vma->vm_end);
+		printk("into slot    %lx-%lx", vmi->mas.index, vmi->mas.last);
 	}
-	if (WARN_ON(vmi->mas.node != MAS_START && vmi->mas.last <  vma->vm_start)) {
-		printk("%lu < %lu\n", vmi->mas.last, vma->vm_start);
-		printk("store of vma %lu-%lu", vma->vm_start, vma->vm_end);
-		printk("into slot    %lu-%lu", vmi->mas.index, vmi->mas.last);
-		mt_dump(vmi->mas.tree, mt_dump_hex);
-		vma_iter_dump_tree(vmi);
+	if (MAS_WARN_ON(&vmi->mas, vmi->mas.node != MAS_START &&
+			vmi->mas.last <  vma->vm_start)) {
+		printk("%lx < %lx\n", vmi->mas.last, vma->vm_start);
+		printk("store of vma %lx-%lx", vma->vm_start, vma->vm_end);
+		printk("into slot    %lx-%lx", vmi->mas.index, vmi->mas.last);
 	}
 #endif