From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 811E3C43334 for ; Sat, 2 Jul 2022 21:45:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230045AbiGBVpZ (ORCPT ); Sat, 2 Jul 2022 17:45:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229436AbiGBVpY (ORCPT ); Sat, 2 Jul 2022 17:45:24 -0400 Received: from mail-qt1-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F579BC3C for ; Sat, 2 Jul 2022 14:45:23 -0700 (PDT) Received: by mail-qt1-x834.google.com with SMTP id l14so4692203qtx.2 for ; Sat, 02 Jul 2022 14:45:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=f6atPQGcoKxfdZ0aWpHNoh2JfqBNtBA2tGtG+xLAAE4=; b=D5AnFUpD0fWsso37gTLLYXs3f58okgWjOXO4yrM4IzgkrHzCr4Sj4Df+vAxo5svbjh ypdzdSsKSaVwD4sFtZzibCtCvmhQW5somHswlNv7G4pDNlQCiECthjdd8+wcqYNPS+Px /mrYgvOehbMpvhMGXBTLcOYfK5nyGgC96ds6PaCAJrNdkuo9uwpJUmzN1kgrLkicKDuz 3JQHIx5JnkND+H/45lmBLIbvRlB8NpYWr86H3IJSn6+7jLrVrIjOQS5RRrvuyClzPbvE uOMlxAn8KWyF6GCqlkp1zhc9/9Te9t5PmtkHHhAajww0XcWWPFIHLzaPAO35NXzUPL+Q J1eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=f6atPQGcoKxfdZ0aWpHNoh2JfqBNtBA2tGtG+xLAAE4=; b=8ElH6bQRpKAgUMMpoEW8RBula88sH73P2rZy/EhiRZO0IXoMkG/J+oZz2osg/7rOBC G/xmcIE0MXr0UQxd8wFAlHfaHkkxQhxISZu3/CXHxf6+M7SNH17YIwd3IPnvimKzShiP rbiFraOq3PRsHhFzh/P7rpMzAeQWCbFPchdaievhgSWsKio6/AcPVYk+MCwrkfD5Y6B2 qZRqq/kWki053FV4twXIspRV+bCVU44TRbBhbp+cGFr1+TnYsRgVfuaZrUKZVQy43U3s dGnLIar9rJrfNmq4bdPklDZEM+/myJE7Xro4/+0BDCd/ZOnVEmEObuG16RQ1+wMxzntK Gy/w== X-Gm-Message-State: AJIora9s12KwHY9qK9O7iRP4Pz4jRTIADAcsNbHBLTnlBnkmOHnXNi/l FPWdAjh5PID1eEfFZ3Hf4bWNFQB/h50= X-Google-Smtp-Source: AGRyM1sM4w2DFSh2jrZh3paUzwnklFNzGFDHqsA8O7NsbaN1atifOPObd2Z4ZpamroYb+FFnpaB3Yw== X-Received: by 2002:a0c:cd0a:0:b0:470:529e:d0a6 with SMTP id b10-20020a0ccd0a000000b00470529ed0a6mr23342659qvm.12.1656798322241; Sat, 02 Jul 2022 14:45:22 -0700 (PDT) Received: from localhost ([2601:4c1:c100:1230:e838:b1c2:b125:986a]) by smtp.gmail.com with ESMTPSA id x19-20020ac87ed3000000b0031bf4dd8a39sm8955463qtj.56.2022.07.02.14.45.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Jul 2022 14:45:21 -0700 (PDT) Date: Sat, 2 Jul 2022 14:45:21 -0700 From: Yury Norov To: Sander Vanheule Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Andrew Morton , Andy Shevchenko , elver@google.com, gregkh@linuxfoundation.org, Peter Zijlstra , Thomas Gleixner , vschneid@redhat.com, Ingo Molnar , Borislav Petkov , Dave Hansen , "H . Peter Anvin" Subject: Re: [PATCH v4 3/5] lib/test: Introduce cpumask KUnit test suite Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Jul 02, 2022 at 06:08:26PM +0200, Sander Vanheule wrote: > Add a basic suite of tests for cpumask, providing some tests for empty > and completely filled cpumasks. > > Signed-off-by: Sander Vanheule > Reviewed-by: Andy Shevchenko > --- > > Notes: > Changes since v3: > - Test for_each_cpu*() over empty mask and cpu_possible_mask > - Add Andy's Reviewed-by > - Use num_{online,present,possible}_cpus() for builtin masks > - Guard against CPU hotplugging during test for dynamic builtin CPU masks > > Changes since v2: > - Rework for_each_* test macros, as suggested by Yury We have a special tag for it: Suggested-by: Yury Norov > > Changes since v1: > - New patch > > lib/Kconfig.debug | 9 +++ > lib/Makefile | 1 + > lib/test_cpumask.c | 138 +++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 148 insertions(+) > create mode 100644 lib/test_cpumask.c > > diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug > index 2e24db4bff19..04aaa20d50f9 100644 > --- a/lib/Kconfig.debug > +++ b/lib/Kconfig.debug > @@ -2021,6 +2021,15 @@ config LKDTM > Documentation on how to use the module can be found in > Documentation/fault-injection/provoke-crashes.rst > > +config TEST_CPUMASK > + tristate "cpumask tests" if !KUNIT_ALL_TESTS > + depends on KUNIT > + default KUNIT_ALL_TESTS > + help > + Enable to turn on cpumask tests, running at boot or module load time. > + > + If unsure, say N. > + > config TEST_LIST_SORT > tristate "Linked list sorting test" if !KUNIT_ALL_TESTS > depends on KUNIT > diff --git a/lib/Makefile b/lib/Makefile > index bcc7e8ea0cde..de3e47453fe8 100644 > --- a/lib/Makefile > +++ b/lib/Makefile > @@ -99,6 +99,7 @@ obj-$(CONFIG_TEST_HMM) += test_hmm.o > obj-$(CONFIG_TEST_FREE_PAGES) += test_free_pages.o > obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o > obj-$(CONFIG_TEST_REF_TRACKER) += test_ref_tracker.o > +obj-$(CONFIG_TEST_CPUMASK) += test_cpumask.o > CFLAGS_test_fprobe.o += $(CC_FLAGS_FTRACE) > obj-$(CONFIG_FPROBE_SANITY_TEST) += test_fprobe.o > # > diff --git a/lib/test_cpumask.c b/lib/test_cpumask.c > new file mode 100644 > index 000000000000..a31a1622f1f6 > --- /dev/null > +++ b/lib/test_cpumask.c > @@ -0,0 +1,138 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * KUnit tests for cpumask. > + * > + * Author: Sander Vanheule > + */ > + > +#include > +#include > +#include > + > +#define EXPECT_FOR_EACH_CPU_EQ(test, mask) \ > + do { \ > + const cpumask_t *m = (mask); \ > + int mask_weight = cpumask_weight(m); \ > + int cpu, iter = 0; \ > + for_each_cpu(cpu, m) \ > + iter++; \ > + KUNIT_EXPECT_EQ((test), mask_weight, iter); \ > + } while (0) > + > +#define EXPECT_FOR_EACH_CPU_NOT_EQ(test, mask) \ > + do { \ > + const cpumask_t *m = (mask); \ > + int mask_weight = cpumask_weight(m); \ > + int cpu, iter = 0; \ > + for_each_cpu_not(cpu, m) \ > + iter++; \ > + KUNIT_EXPECT_EQ((test), nr_cpu_ids - mask_weight, iter); \ > + } while (0) > + > +#define EXPECT_FOR_EACH_CPU_WRAP_EQ(test, mask) \ > + do { \ > + const cpumask_t *m = (mask); \ > + int mask_weight = cpumask_weight(m); \ > + int cpu, iter = 0; \ > + for_each_cpu_wrap(cpu, m, nr_cpu_ids / 2) \ > + iter++; \ > + KUNIT_EXPECT_EQ((test), mask_weight, iter); \ > + } while (0) > + > +#define EXPECT_FOR_EACH_CPU_BUILTIN_EQ(test, name) \ > + do { \ > + int mask_weight = num_##name##_cpus(); \ > + int cpu, iter = 0; \ > + for_each_##name##_cpu(cpu) \ > + iter++; \ > + KUNIT_EXPECT_EQ((test), mask_weight, iter); \ > + } while (0) > + > +static cpumask_t mask_empty; > +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(cpu_possible_mask)); > + KUNIT_EXPECT_TRUE(test, cpumask_full(&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)); > +} > + > +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_EQ(test, 0, cpumask_first_zero(&mask_empty)); > + KUNIT_EXPECT_LE(test, nr_cpu_ids, cpumask_first_zero(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_cpumask_bits - 1, cpumask_last(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)); > +} > + > +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_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); > +} > + > +static void test_cpumask_iterators_builtin(struct kunit *test) > +{ > + EXPECT_FOR_EACH_CPU_BUILTIN_EQ(test, possible); > + > + /* Ensure the dynamic masks are stable while running the tests */ > + cpu_hotplug_disable(); > + > + EXPECT_FOR_EACH_CPU_BUILTIN_EQ(test, online); > + EXPECT_FOR_EACH_CPU_BUILTIN_EQ(test, present); > + > + cpu_hotplug_enable(); > +} > + > +static int test_cpumask_init(struct kunit *test) > +{ > + cpumask_clear(&mask_empty); > + cpumask_setall(&mask_all); > + > + return 0; > +} > + > +static struct kunit_case test_cpumask_cases[] = { > + KUNIT_CASE(test_cpumask_weight), > + KUNIT_CASE(test_cpumask_first), > + KUNIT_CASE(test_cpumask_last), > + KUNIT_CASE(test_cpumask_next), > + KUNIT_CASE(test_cpumask_iterators), > + KUNIT_CASE(test_cpumask_iterators_builtin), > + {} > +}; > + > +static struct kunit_suite test_cpumask_suite = { > + .name = "cpumask", > + .init = test_cpumask_init, > + .test_cases = test_cpumask_cases, > +}; > +kunit_test_suite(test_cpumask_suite); > + > +MODULE_LICENSE("GPL"); > -- > 2.36.1