Commit e6d6792a authored by Liam R. Howlett's avatar Liam R. Howlett Committed by Andrew Morton
Browse files

maple_tree: convert debug code to use MT_WARN_ON() and MAS_WARN_ON() 

Using MT_WARN_ON() allows for the removal of if statements before logging.
Using MAS_WARN_ON() will provide more information when issues are
encountered.

Link: https://lkml.kernel.org/r/20230518145544.1722059-10-Liam.Howlett@oracle.com


Signed-off-by: default avatarLiam R. Howlett <Liam.Howlett@oracle.com>
Cc: David Binderman <dcb314@hotmail.com>
Cc: Peng Zhang <zhangpeng.00@bytedance.com>
Cc: Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: Vernon Yang <vernon2gm@gmail.com>
Cc: Wei Yang <richard.weiyang@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 7f2f9dc1

lib/maple_tree.c

+14 −16
Original line number Diff line number Diff line
@@ -5693,9 +5693,9 @@ void *mas_store(struct ma_state *mas, void *entry) 


	trace_ma_write(__func__, mas, 0, entry);

#ifdef CONFIG_DEBUG_MAPLE_TREE

	if (mas->index > mas->last)

	if (MAS_WARN_ON(mas, mas->index > mas->last))

		pr_err("Error %lX > %lX %p\n", mas->index, mas->last, entry);

	MT_BUG_ON(mas->tree, mas->index > mas->last);



	if (mas->index > mas->last) {

		mas_set_err(mas, -EINVAL);

		return NULL;
@@ -6524,10 +6524,9 @@ void *mt_find(struct maple_tree *mt, unsigned long *index, unsigned long max) 
	if (likely(entry)) {

		*index = mas.last + 1;

#ifdef CONFIG_DEBUG_MAPLE_TREE

		if ((*index) && (*index) <= copy)

		if (MT_WARN_ON(mt, (*index) && ((*index) <= copy)))

			pr_err("index not increased! %lx <= %lx\n",

			       *index, copy);

		MT_BUG_ON(mt, (*index) && ((*index) <= copy));

#endif

	}
@@ -6673,7 +6672,7 @@ static inline void *mas_first_entry(struct ma_state *mas, struct maple_node *mn, 
	max = mas->max;

	mas->offset = 0;

	while (likely(!ma_is_leaf(mt))) {

		MT_BUG_ON(mas->tree, mte_dead_node(mas->node));

		MAS_WARN_ON(mas, mte_dead_node(mas->node));

		slots = ma_slots(mn, mt);

		entry = mas_slot(mas, slots, 0);

		pivots = ma_pivots(mn, mt);
@@ -6684,7 +6683,7 @@ static inline void *mas_first_entry(struct ma_state *mas, struct maple_node *mn, 
		mn = mas_mn(mas);

		mt = mte_node_type(mas->node);

	}

	MT_BUG_ON(mas->tree, mte_dead_node(mas->node));

	MAS_WARN_ON(mas, mte_dead_node(mas->node));



	mas->max = max;

	slots = ma_slots(mn, mt);
@@ -7128,18 +7127,18 @@ static void mas_validate_limits(struct ma_state *mas) 
		if (prev_piv > piv) {

			pr_err("%p[%u] piv %lu < prev_piv %lu\n",

				mas_mn(mas), i, piv, prev_piv);

			MT_BUG_ON(mas->tree, piv < prev_piv);

			MAS_WARN_ON(mas, piv < prev_piv);

		}



		if (piv < mas->min) {

			pr_err("%p[%u] %lu < %lu\n", mas_mn(mas), i,

				piv, mas->min);

			MT_BUG_ON(mas->tree, piv < mas->min);

			MAS_WARN_ON(mas, piv < mas->min);

		}

		if (piv > mas->max) {

			pr_err("%p[%u] %lu > %lu\n", mas_mn(mas), i,

				piv, mas->max);

			MT_BUG_ON(mas->tree, piv > mas->max);

			MAS_WARN_ON(mas, piv > mas->max);

		}

		prev_piv = piv;

		if (piv == mas->max)
@@ -7162,7 +7161,7 @@ static void mas_validate_limits(struct ma_state *mas) 


			pr_err("%p[%u] should not have piv %lu\n",

			       mas_mn(mas), i, piv);

			MT_BUG_ON(mas->tree, i < mt_pivots[type] - 1);

			MAS_WARN_ON(mas, i < mt_pivots[type] - 1);

		}

	}

}
@@ -7221,16 +7220,15 @@ void mt_validate(struct maple_tree *mt) 


	mas_first_entry(&mas, mas_mn(&mas), ULONG_MAX, mte_node_type(mas.node));

	while (!mas_is_none(&mas)) {

		MT_BUG_ON(mas.tree, mte_dead_node(mas.node));

		MAS_WARN_ON(&mas, mte_dead_node(mas.node));

		if (!mte_is_root(mas.node)) {

			end = mas_data_end(&mas);

			if ((end < mt_min_slot_count(mas.node)) &&

			    (mas.max != ULONG_MAX)) {

			if (MAS_WARN_ON(&mas,

					(end < mt_min_slot_count(mas.node)) &&

					(mas.max != ULONG_MAX))) {

				pr_err("Invalid size %u of %p\n", end,

				       mas_mn(&mas));

				MT_BUG_ON(mas.tree, 1);

			}



		}

		mas_validate_parent_slot(&mas);

		mas_validate_child_slot(&mas);