Commit bf541358 authored by Sander Vanheule's avatar Sander Vanheule Committed by Yury Norov
Browse files

lib/cpumask_kunit: log mask contents 

For extra context, log the contents of the masks under test.  This
should help with finding out why a certain test fails.

Link: https://lore.kernel.org/lkml/CABVgOSkPXBc-PWk1zBZRQ_Tt+Sz1ruFHBj3ixojymZF=Vi4tpQ@mail.gmail.com/


Suggested-by: default avatarDavid Gow <davidgow@google.com>
Signed-off-by: default avatarSander Vanheule <sander@svanheule.net>
Signed-off-by: default avatarYury Norov <yury.norov@gmail.com>
parent d3c0ca49

lib/cpumask_kunit.c

+31 −20
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ 
#include <linux/cpu.h>

#include <linux/cpumask.h>



#define MASK_MSG(m) \

	"%s contains %sCPUs %*pbl", #m, (cpumask_weight(m) ? "" : "no "), \

	nr_cpumask_bits, cpumask_bits(m)



#define EXPECT_FOR_EACH_CPU_EQ(test, mask)			\

	do {							\

		const cpumask_t *m = (mask);			\
@@ -16,7 +20,7 @@ 
		int cpu, iter = 0;				\

		for_each_cpu(cpu, m)				\

			iter++;					\

		KUNIT_EXPECT_EQ((test), mask_weight, iter);	\

		KUNIT_EXPECT_EQ_MSG((test), mask_weight, iter, MASK_MSG(mask));	\

	} while (0)



#define EXPECT_FOR_EACH_CPU_NOT_EQ(test, mask)					\
@@ -26,7 +30,7 @@ 
		int cpu, iter = 0;						\

		for_each_cpu_not(cpu, m)					\

			iter++;							\

		KUNIT_EXPECT_EQ((test), nr_cpu_ids - mask_weight, iter);	\

		KUNIT_EXPECT_EQ_MSG((test), nr_cpu_ids - mask_weight, iter, MASK_MSG(mask));	\

	} while (0)



#define EXPECT_FOR_EACH_CPU_WRAP_EQ(test, mask)			\
@@ -36,7 +40,7 @@ 
		int cpu, iter = 0;				\

		for_each_cpu_wrap(cpu, m, nr_cpu_ids / 2)	\

			iter++;					\

		KUNIT_EXPECT_EQ((test), mask_weight, iter);	\

		KUNIT_EXPECT_EQ_MSG((test), mask_weight, iter, MASK_MSG(mask));	\

	} while (0)



#define EXPECT_FOR_EACH_CPU_BUILTIN_EQ(test, name)		\
@@ -45,7 +49,7 @@ 
		int cpu, iter = 0;				\

		for_each_##name##_cpu(cpu)			\

			iter++;					\

		KUNIT_EXPECT_EQ((test), mask_weight, iter);	\

		KUNIT_EXPECT_EQ_MSG((test), mask_weight, iter, MASK_MSG(cpu_##name##_mask));	\

	} while (0)



static cpumask_t mask_empty;
@@ -53,36 +57,43 @@ static cpumask_t mask_all; 


static void test_cpumask_weight(struct kunit *test)

{

	KUNIT_EXPECT_TRUE(test, cpumask_empty(&mask_empty));

	KUNIT_EXPECT_TRUE(test, cpumask_full(&mask_all));

	KUNIT_EXPECT_TRUE_MSG(test, cpumask_empty(&mask_empty), MASK_MSG(&mask_empty));

	KUNIT_EXPECT_TRUE_MSG(test, cpumask_full(&mask_all), MASK_MSG(&mask_all));



	KUNIT_EXPECT_EQ(test, 0, cpumask_weight(&mask_empty));

	KUNIT_EXPECT_EQ(test, nr_cpu_ids, cpumask_weight(cpu_possible_mask));

	KUNIT_EXPECT_EQ(test, nr_cpumask_bits, cpumask_weight(&mask_all));

	KUNIT_EXPECT_EQ_MSG(test, 0, cpumask_weight(&mask_empty), MASK_MSG(&mask_empty));

	KUNIT_EXPECT_EQ_MSG(test, nr_cpu_ids, cpumask_weight(cpu_possible_mask),

			    MASK_MSG(cpu_possible_mask));

	KUNIT_EXPECT_EQ_MSG(test, nr_cpumask_bits, cpumask_weight(&mask_all), MASK_MSG(&mask_all));

}



static void test_cpumask_first(struct kunit *test)

{

	KUNIT_EXPECT_LE(test, nr_cpu_ids, cpumask_first(&mask_empty));

	KUNIT_EXPECT_EQ(test, 0, cpumask_first(cpu_possible_mask));

	KUNIT_EXPECT_LE_MSG(test, nr_cpu_ids, cpumask_first(&mask_empty), MASK_MSG(&mask_empty));

	KUNIT_EXPECT_EQ_MSG(test, 0, cpumask_first(cpu_possible_mask), MASK_MSG(cpu_possible_mask));



	KUNIT_EXPECT_EQ(test, 0, cpumask_first_zero(&mask_empty));

	KUNIT_EXPECT_LE(test, nr_cpu_ids, cpumask_first_zero(cpu_possible_mask));

	KUNIT_EXPECT_EQ_MSG(test, 0, cpumask_first_zero(&mask_empty), MASK_MSG(&mask_empty));

	KUNIT_EXPECT_LE_MSG(test, nr_cpu_ids, cpumask_first_zero(cpu_possible_mask),

			    MASK_MSG(cpu_possible_mask));

}



static void test_cpumask_last(struct kunit *test)

{

	KUNIT_EXPECT_LE(test, nr_cpumask_bits, cpumask_last(&mask_empty));

	KUNIT_EXPECT_EQ(test, nr_cpu_ids - 1, cpumask_last(cpu_possible_mask));

	KUNIT_EXPECT_LE_MSG(test, nr_cpumask_bits, cpumask_last(&mask_empty),

			    MASK_MSG(&mask_empty));

	KUNIT_EXPECT_EQ_MSG(test, nr_cpu_ids - 1, cpumask_last(cpu_possible_mask),

			    MASK_MSG(cpu_possible_mask));

}



static void test_cpumask_next(struct kunit *test)

{

	KUNIT_EXPECT_EQ(test, 0, cpumask_next_zero(-1, &mask_empty));

	KUNIT_EXPECT_LE(test, nr_cpu_ids, cpumask_next_zero(-1, cpu_possible_mask));



	KUNIT_EXPECT_LE(test, nr_cpu_ids, cpumask_next(-1, &mask_empty));

	KUNIT_EXPECT_EQ(test, 0, cpumask_next(-1, cpu_possible_mask));

	KUNIT_EXPECT_EQ_MSG(test, 0, cpumask_next_zero(-1, &mask_empty), MASK_MSG(&mask_empty));

	KUNIT_EXPECT_LE_MSG(test, nr_cpu_ids, cpumask_next_zero(-1, cpu_possible_mask),

			    MASK_MSG(cpu_possible_mask));



	KUNIT_EXPECT_LE_MSG(test, nr_cpu_ids, cpumask_next(-1, &mask_empty),

			    MASK_MSG(&mask_empty));

	KUNIT_EXPECT_EQ_MSG(test, 0, cpumask_next(-1, cpu_possible_mask),

			    MASK_MSG(cpu_possible_mask));

}



static void test_cpumask_iterators(struct kunit *test)