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.

Update the printk to a pr_warn(), but this will only be printed when
maple tree debug is enabled anyways.

Making all print statements into one will keep them together on a busy
terminal.

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

diff --git a/mm/internal.h b/mm/internal.h
index 8d1a8bd00124756f7952164b09202e940c6ead92..61121083224613bd66b0a39d9ebfaa5e733caa8f 100644 (file)
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -1047,18 +1047,23 @@ 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)) {
+               pr_warn("%lx > %lx\n"
+                      "store of vma %lx-%lx\n"
+                      "into slot    %lx-%lx\n",
+                      vmi->mas.index, vma->vm_start,
+                      vma->vm_start, vma->vm_end,
+                      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)) {
+               pr_warn("%lx < %lx\n"
+                      "store of vma %lx-%lx\n"
+                      "into slot    %lx-%lx\n",
+                      vmi->mas.last, vma->vm_start,
+                      vma->vm_start, vma->vm_end,
+                      vmi->mas.index, vmi->mas.last);
        }
 #endif