lib/test_cpumask: Add for_each_cpu_and(not) tests

Following the recent introduction of for_each_andnot(), add some tests to
ensure for_each_cpu_and(not) results in the same as iterating over the
result of cpumask_and(not)().

Suggested-by: Yury Norov <yury.norov@gmail.com>
Signed-off-by: Valentin Schneider <vschneid@redhat.com>

diff --git a/lib/cpumask_kunit.c b/lib/cpumask_kunit.c
index ecbeec72221ea5c1af15730127650653182f2c62..d1fc6ece21f3704566f9296b47bf47d3f04c8296 100644 (file)
--- a/lib/cpumask_kunit.c
+++ b/lib/cpumask_kunit.c
@@ -33,6 +33,19 @@
                KUNIT_EXPECT_EQ_MSG((test), nr_cpu_ids - mask_weight, iter, MASK_MSG(mask));    \
        } while (0)
 
+#define EXPECT_FOR_EACH_CPU_OP_EQ(test, op, mask1, mask2)                      \
+       do {                                                                    \
+               const cpumask_t *m1 = (mask1);                                  \
+               const cpumask_t *m2 = (mask2);                                  \
+               int weight;                                                     \
+               int cpu, iter = 0;                                              \
+               cpumask_##op(&mask_tmp, m1, m2);                                \
+               weight = cpumask_weight(&mask_tmp);                             \
+               for_each_cpu_##op(cpu, mask1, mask2)                            \
+                       iter++;                                                 \
+               KUNIT_EXPECT_EQ((test), weight, iter);                          \
+       } while (0)
+
 #define EXPECT_FOR_EACH_CPU_WRAP_EQ(test, mask)                        \
        do {                                                    \
                const cpumask_t *m = (mask);                    \
@@ -54,6 +67,7 @@
 
 static cpumask_t mask_empty;
 static cpumask_t mask_all;
+static cpumask_t mask_tmp;
 
 static void test_cpumask_weight(struct kunit *test)
 {
@@ -101,10 +115,15 @@ static void test_cpumask_iterators(struct kunit *test)
        EXPECT_FOR_EACH_CPU_EQ(test, &mask_empty);
        EXPECT_FOR_EACH_CPU_NOT_EQ(test, &mask_empty);
        EXPECT_FOR_EACH_CPU_WRAP_EQ(test, &mask_empty);
+       EXPECT_FOR_EACH_CPU_OP_EQ(test, and, &mask_empty, &mask_empty);
+       EXPECT_FOR_EACH_CPU_OP_EQ(test, and, cpu_possible_mask, &mask_empty);
+       EXPECT_FOR_EACH_CPU_OP_EQ(test, andnot, &mask_empty, &mask_empty);
 
        EXPECT_FOR_EACH_CPU_EQ(test, cpu_possible_mask);
        EXPECT_FOR_EACH_CPU_NOT_EQ(test, cpu_possible_mask);
        EXPECT_FOR_EACH_CPU_WRAP_EQ(test, cpu_possible_mask);
+       EXPECT_FOR_EACH_CPU_OP_EQ(test, and, cpu_possible_mask, cpu_possible_mask);
+       EXPECT_FOR_EACH_CPU_OP_EQ(test, andnot, cpu_possible_mask, &mask_empty);
 }
 
 static void test_cpumask_iterators_builtin(struct kunit *test)