XArray tests: Check mark 2 gets squashed (d69d287a) · Commits · 戴 / test

We do not currently check that the loop in xas_squash_marks() doesn't have an off-by-one error in it. It didn't, but a patch which introduced an off-by-one error wasn't caught by any existing test. Switch the roles of XA_MARK_1 and XA_MARK_2 to catch that bug. Reported-by:

Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by:

Matthew Wilcox <willy@infradead.org>

lib/test_xarray.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -199,7 +199,7 @@ static noinline void check_xa_mark_1(struct xarray *xa, unsigned long index)
		XA_BUG_ON(xa, xa_store_index(xa, index + 1, GFP_KERNEL));
		xa_set_mark(xa, index + 1, XA_MARK_0);
		XA_BUG_ON(xa, xa_store_index(xa, index + 2, GFP_KERNEL));
		xa_set_mark(xa, index + 2, XA_MARK_1);
		xa_set_mark(xa, index + 2, XA_MARK_2);
		XA_BUG_ON(xa, xa_store_index(xa, next, GFP_KERNEL));
		xa_store_order(xa, index, order, xa_mk_index(index),
		GFP_KERNEL);
		@@ -209,8 +209,8 @@ static noinline void check_xa_mark_1(struct xarray *xa, unsigned long index)
		void *entry;

		XA_BUG_ON(xa, !xa_get_mark(xa, i, XA_MARK_0));
		XA_BUG_ON(xa, !xa_get_mark(xa, i, XA_MARK_1));
		XA_BUG_ON(xa, xa_get_mark(xa, i, XA_MARK_2));
		XA_BUG_ON(xa, xa_get_mark(xa, i, XA_MARK_1));
		XA_BUG_ON(xa, !xa_get_mark(xa, i, XA_MARK_2));

		/* We should see two elements in the array */
		rcu_read_lock();

Admin message