From patchwork Sun Feb 9 00:41:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tamir Duberstein X-Patchwork-Id: 13966555 Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8EDAC819; Sun, 9 Feb 2025 00:41:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739061701; cv=none; b=L3T2x4vkYzOf4I0IrX2zSTn9zQHCaLJZEnZx52M66L7RvjuP4nuud55Vtfka+OqAZhDW28xojJsnyfOJuJu2rXjDQ+XgY2JswlBW2x9SDlZyoSBSghcwjyR8hBmWXq5x2XldGmjD2ZjMOgl/zX0TgDc09jlMP/+alavtelFpnL8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739061701; c=relaxed/simple; bh=SpWHB4Z5KMf4LSaMFuL5WRBvdcw8Q42qJix1nneUIoE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tue0wq1KimKngAEM34zEBor/8b0oRh1Pi8k8IKphOqh3YMZixLzR72rHTMmRlnGIDnh3E4UJ6mZF7jm5ezYPmjzfOmiBesznzQ8rSpupNqdSqZVz0CAWvSql9ibQ7fSoYW+VzGOk3n7nkuo5tmpIDLtmbq1AbzCd8ZFf+StFlkg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=jTD3kuG6; arc=none smtp.client-ip=209.85.222.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jTD3kuG6" Received: by mail-qk1-f170.google.com with SMTP id af79cd13be357-7c04e462c3bso73069885a.0; Sat, 08 Feb 2025 16:41:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739061698; x=1739666498; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=vwp2Byu00e90GrZn/qF/rycqYIQg0TgfP/aWBzdBhUo=; b=jTD3kuG6xPVONUiCRketLQrGktDKcdcYot32qzXRRKM0SOqx5AbuOxPtuf22IoiiOp pN5Cv4npvKQRRxVMgRChrjNZACtaSqgTijtqs10bWRriJzI/BY+/QE8oiierXb4CMuef ExF1nR7tiXXMZPt/MJPWlPMQH86hfQvGw2dpB3eAWSyvpl6Be46X7EIWHj9xvfp3z5d+ ASQS4q3mTQ6Np8TZF1FoTCCl1gIIeyywOpXSslr8dT2A2cA9bQh6ShxSfoHXCsTp9xFC /VnqPTvBi8UJYnqLubhEEvfQKBgYEUvCpNniQGMhLsXhtaFXOXI/bqLZCbKA3amaOAX6 O5wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739061698; x=1739666498; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vwp2Byu00e90GrZn/qF/rycqYIQg0TgfP/aWBzdBhUo=; b=Ad8Fpt9Opc0HJxsOMxTcp6e/9V+KImi89nT9GWNl7UMUhbyH2be1HAcBQjJhcr6Kuq bUygv68R7ubj+gQKawjwHuVaerMTqFJ7+7ZTnqT2lqGE+5erbpA0FbgvfEWKb67WuduD YOqmQVuKW7NnsLcFYW3SyPkhpb9HYAygWK18Szq2/5tIl6GkVYHGjjyuiFLrFpVwBey2 gEzpYjvK5YLFjDAGIj9QoodiJSeHL6wkHs9sbobIkycNGmWrSzJ9HoI1dduG7ebwfMVG C6GORUhNvZ/K0jG4c05ch07Moe37KjJ9n3+VtvNBpDDZ9IdkLd5ruIdY2I+Kf0+fFhQu LB8w== X-Forwarded-Encrypted: i=1; AJvYcCWN9PZtwjmDfx2oU02iJ5XE+hM35uL4c50H4FNy2mvMIBwqXLQRrJIo3dt5cS90J3i/D2K16Xoi1ejhfHLPYVM=@vger.kernel.org X-Gm-Message-State: AOJu0YxhDzPE75dLbPPDbFuIbaHMPMfTGdv1JMvzKxikDB1zQSrkpHTi n+xEAy3BCVVK/z4iGm5eoDzVKhsQQyZWbjj1KA6+nZOXMekFihqQ X-Gm-Gg: ASbGncuI+9Jr2kyWaXcezDa4GLN992CMLn5CDPPjdXWiHZZW6R4Cj7L+tefytSinImO uc2e50gePgBHY0ALtQdN0+sj7UAbAag+nI/HfKX+lJ4WN3l5J6HF1pm46HyMLZGYfxgVc+xBCAs KE2uNClig0Df6TGLiP76wIulgETQpMOgRLWJ0WX605ueuBhLg1jRWYDGzb5gIy/KdOBvLWqob6v CWMWlPJgHMevbVh4iZXDtmDL690+hU2e2QC0V5FXWytvWDuJfXiZ2PaRzs22gPgtCZfnp9Ic9Tq m1cpigxtLwzLrWmHZMOLSvn4VEOi+YyNHeBBIv5vIHKGF7/FASi+l9hGdnMe53aR1AIvnZ+vEC+ sr2kyIkefGrMc7fcC4SP4U/fajfyCdcOa5lhVaw== X-Google-Smtp-Source: AGHT+IHU/3ZKMy93GC5XkNwM0qnXDXb4WoQ0ymaIR9ECBBjvmCz+OiUd01j/7rldo76Moa306WnFTg== X-Received: by 2002:a05:620a:4551:b0:7b7:106a:19a2 with SMTP id af79cd13be357-7c047c389c2mr1272038885a.31.1739061698341; Sat, 08 Feb 2025 16:41:38 -0800 (PST) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([2600:4041:5be7:7c00:15f6:96e9:3308:934a]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c041eb7f94sm353272885a.96.2025.02.08.16.41.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 16:41:36 -0800 (PST) From: Tamir Duberstein Date: Sat, 08 Feb 2025 19:41:28 -0500 Subject: [PATCH v4 1/2] lib/math: Hook up tests/Makefile Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250208-prime_numbers-kunit-convert-v4-1-76e36bca06a5@gmail.com> References: <20250208-prime_numbers-kunit-convert-v4-0-76e36bca06a5@gmail.com> In-Reply-To: <20250208-prime_numbers-kunit-convert-v4-0-76e36bca06a5@gmail.com> To: David Gow , Shuah Khan , Luis Felipe Hernandez , Andrew Morton , Shuah Khan Cc: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev This Makefile has been dead code since it was added in commit 7fcc9b53216c ("lib/math: Add int_pow test suite"); the tests worked because of the duplicated rules in the parent directory's Makefile. Wire up tests/Makefile and remove the duplication. Fixes: 7fcc9b53216c ("lib/math: Add int_pow test suite") Reviewed-by: David Gow Signed-off-by: Tamir Duberstein --- lib/math/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/math/Makefile b/lib/math/Makefile index 853f023ae537..d390da9a59fe 100644 --- a/lib/math/Makefile +++ b/lib/math/Makefile @@ -5,8 +5,8 @@ obj-$(CONFIG_CORDIC) += cordic.o obj-$(CONFIG_PRIME_NUMBERS) += prime_numbers.o obj-$(CONFIG_RATIONAL) += rational.o -obj-$(CONFIG_INT_POW_TEST) += tests/int_pow_kunit.o obj-$(CONFIG_TEST_DIV64) += test_div64.o obj-$(CONFIG_TEST_MULDIV64) += test_mul_u64_u64_div_u64.o obj-$(CONFIG_RATIONAL_KUNIT_TEST) += rational-test.o -obj-$(CONFIG_INT_SQRT_KUNIT_TEST) += tests/int_sqrt_kunit.o \ No newline at end of file + +obj-y += tests/ From patchwork Sun Feb 9 00:41:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tamir Duberstein X-Patchwork-Id: 13966556 Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 127BBF9FE; Sun, 9 Feb 2025 00:41:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739061703; cv=none; b=kA6mtXHbSVy6xiZZq8vou3IBCGPjX7oq+oFi7Xn52/IqJAD79SYRasdCsj5QLOPDmNHIOtIDXUL4D68eFCMggYmYzLYar2Nsbfd0xdiqUAgV62ZlN/f2CH6IBRTHP4XltXG0pg/qK87k4xxN58RPXQHzMn8VhZ+WRbXWnwyHbmA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739061703; c=relaxed/simple; bh=AxhYUtMzMenDpwHmabTxXGNRCSgVXgsIYjsOlaZcyVI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ADlvKOF8XSA9qe5QdX6QVO/IsqXhpbQkXZxwieymtypsgcGC5SPZ5j+KbMPrpp785guz5yn9ILS0k20liC6Eih2JLpk7FEOK7X7xD47aog6Lxmu7aI2DogdtCdgK6axDZ70UeVVSCg/YGAXehLO9kRPMhycvtBLsg3TDdEujOx4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=eZ4aRiJX; arc=none smtp.client-ip=209.85.222.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eZ4aRiJX" Received: by mail-qk1-f179.google.com with SMTP id af79cd13be357-7bcf32a6582so312111885a.1; Sat, 08 Feb 2025 16:41:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739061701; x=1739666501; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=xxSxhVLza0+BMhqBPuRtiRWQzX6i+1FzbVxsquN/ITo=; b=eZ4aRiJX2s+cMoNHTV+jv+r2NkUu7Y9UYQqfqzm1jFC52q3tKpzzeUS4bC/OOmI2Bb 05g9zACpuDz9+eVnfWpZ6sVWYUM6u9+26Wx4tGJdojucXeUwBQoMqZmWoFKy2PSOut/I EWLR2Z1LeaRgO5n4u34DzbSe/vo3DoGGPIRC6dHEazck955SF77S3oqBB0UKjN/YOY/k QhTbWae0YzouiiAdc0fTmqutQb45I1k6fKH0D+llGt7kA6OL2SQLtTfNE3SQE8Xei5bY Lf9h+NnMilhxkbtOWKqXnU0cYJKtep6Uy7UalOPwfncRoJxGSMXJ9/PPLiGfibaOYJ0i dK/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739061701; x=1739666501; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xxSxhVLza0+BMhqBPuRtiRWQzX6i+1FzbVxsquN/ITo=; b=BC3rUtFpDfTjrIEK3GOC4frXl7lEIEZZyt9kr1yhPYym+/hz4FSVhTNeYX7UOqmxBX 22Grk5u8qeDLf0Y99HtKEzuXJNDv7ANuHyE/vETQN6H6tnxfxu+qrNSKF4Aa4KY913ov x7/DR/ylgTwnpKalBEMMLVwvcJ5QujGutb2J+AxlkGZG11vn8zqh6zCJD0eExFA2MeAT Lgd48BrAgiuKBf+GQU9o6KC0sgwD7gHoJkWAzaVOS3/Fgnpm5/yMUq/Bw9kk+dJYacYs FA2pP/jCtaN1ypa9CGj1otoxXRRxluUOt2cDSpUl+BBe4YacqBlF8SjvzaK6ezhF726J F7cA== X-Forwarded-Encrypted: i=1; AJvYcCWf4UB9DrSk+WfFBEabhrOF7zlDNNzsI1Ze/Lem92T1SwG6ZiP4Y2G1h9FOXaXGT2Si+ZGVkp+VyVvC7WKoTHE=@vger.kernel.org X-Gm-Message-State: AOJu0YwfLwS39Y717c9JAQfbrMkpVUXJmsa8ig5PjNqYvkO7Q+wZspU1 1ha8sbOeH1KFUGv14Q+KoP3PaGLBn3fNSKmhw17oPV5A/R7rvJmo X-Gm-Gg: ASbGncspzubYF9sQwppXZmdbpFmFOh0/uNDQSDrs9Y4e7M+AWpVHMKyKm3FygxD7pFB kMxadexmVFlWNRS8d8LpLqtZl36TpT5/oMeqoBjb6Gx90oyBINqMRUmXGsZlkcEfurrbvJ9pTqv RptQTNzweYtRAxMA9RiV/kHerJ8BOS9F00olTtrwQ7OPTsPOwO70VEkgAcT+dHeA92AROnLMB/i cjhv0ZL8wP7ddjf+dKTRTywisEH1F8NMuI5jkytE9DUtrL2ZiCNjELdKlNer4UTyAQmGrW3hg7s hwTsDkmYresFhSt4YnONrgN+a0OK2cpca5iRhdesRkOtOrJ/bUSRmkkFevEpXGtoSwg0WgGeSmJ QHfvllzSpP1ZdZsjHSK8bFrWkPWtvSd2gFbubOA== X-Google-Smtp-Source: AGHT+IGVF9RsrHv0QdlpD/2lSAclUM8HESpIDKz40cuDujuZRtUnlkh7S+I6QnKniEvpvoIu7HawDg== X-Received: by 2002:a05:620a:43a6:b0:7b6:d34e:b21a with SMTP id af79cd13be357-7c047c7853emr1410983485a.37.1739061700980; Sat, 08 Feb 2025 16:41:40 -0800 (PST) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([2600:4041:5be7:7c00:15f6:96e9:3308:934a]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c041eb7f94sm353272885a.96.2025.02.08.16.41.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 16:41:39 -0800 (PST) From: Tamir Duberstein Date: Sat, 08 Feb 2025 19:41:29 -0500 Subject: [PATCH v4 2/2] lib/prime_numbers: convert self-test to KUnit Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250208-prime_numbers-kunit-convert-v4-2-76e36bca06a5@gmail.com> References: <20250208-prime_numbers-kunit-convert-v4-0-76e36bca06a5@gmail.com> In-Reply-To: <20250208-prime_numbers-kunit-convert-v4-0-76e36bca06a5@gmail.com> To: David Gow , Shuah Khan , Luis Felipe Hernandez , Andrew Morton , Shuah Khan Cc: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev Extract a private header and convert the prime_numbers self-test to a KUnit test. I considered parameterizing the test using `KUNIT_CASE_PARAM` but didn't see how it was possible since the test logic is entangled with the test parameter generation logic. Signed-off-by: Tamir Duberstein --- lib/Kconfig.debug | 14 +++++ lib/math/prime_numbers.c | 76 ++++------------------------ lib/math/prime_numbers_private.h | 17 +++++++ lib/math/tests/Makefile | 1 + lib/math/tests/prime_numbers_kunit.c | 59 +++++++++++++++++++++ tools/testing/selftests/lib/config | 1 - tools/testing/selftests/lib/prime_numbers.sh | 4 -- 7 files changed, 100 insertions(+), 72 deletions(-) diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 1af972a92d06..616beaca4a2b 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -3197,6 +3197,20 @@ config INT_SQRT_KUNIT_TEST If unsure, say N +config PRIME_NUMBERS_KUNIT_TEST + tristate "Prime number generator test" if !KUNIT_ALL_TESTS + depends on KUNIT + select PRIME_NUMBERS + default KUNIT_ALL_TESTS + help + This option enables the KUnit test suite for the {is,next}_prime_number + functions. + + Enabling this option will include tests that compare the prime number + generator functions against a brute force implementation. + + If unsure, say N + endif # RUNTIME_TESTING_MENU config ARCH_USE_MEMTEST diff --git a/lib/math/prime_numbers.c b/lib/math/prime_numbers.c index 9a17ee9af93a..1d20d068dacf 100644 --- a/lib/math/prime_numbers.c +++ b/lib/math/prime_numbers.c @@ -1,16 +1,11 @@ // SPDX-License-Identifier: GPL-2.0-only -#define pr_fmt(fmt) "prime numbers: " fmt #include #include #include #include -struct primes { - struct rcu_head rcu; - unsigned long last, sz; - unsigned long primes[]; -}; +#include "prime_numbers_private.h" #if BITS_PER_LONG == 64 static const struct primes small_primes = { @@ -62,9 +57,13 @@ static const struct primes small_primes = { static DEFINE_MUTEX(lock); static const struct primes __rcu *primes = RCU_INITIALIZER(&small_primes); -static unsigned long selftest_max; +#if IS_ENABLED(CONFIG_PRIME_NUMBERS_KUNIT_TEST) +EXPORT_SYMBOL(slow_is_prime_number); -static bool slow_is_prime_number(unsigned long x) +#else +static +#endif +bool slow_is_prime_number(unsigned long x) { unsigned long y = int_sqrt(x); @@ -239,65 +238,11 @@ bool is_prime_number(unsigned long x) } EXPORT_SYMBOL(is_prime_number); -static void dump_primes(void) +void with_primes(void *ctx, primes_fn fn) { - const struct primes *p; - char *buf; - - buf = kmalloc(PAGE_SIZE, GFP_KERNEL); - rcu_read_lock(); - p = rcu_dereference(primes); - - if (buf) - bitmap_print_to_pagebuf(true, buf, p->primes, p->sz); - pr_info("primes.{last=%lu, .sz=%lu, .primes[]=...x%lx} = %s\n", - p->last, p->sz, p->primes[BITS_TO_LONGS(p->sz) - 1], buf); - + fn(ctx, rcu_dereference(primes)); rcu_read_unlock(); - - kfree(buf); -} - -static int selftest(unsigned long max) -{ - unsigned long x, last; - - if (!max) - return 0; - - for (last = 0, x = 2; x < max; x++) { - bool slow = slow_is_prime_number(x); - bool fast = is_prime_number(x); - - if (slow != fast) { - pr_err("inconsistent result for is-prime(%lu): slow=%s, fast=%s!\n", - x, slow ? "yes" : "no", fast ? "yes" : "no"); - goto err; - } - - if (!slow) - continue; - - if (next_prime_number(last) != x) { - pr_err("incorrect result for next-prime(%lu): expected %lu, got %lu\n", - last, x, next_prime_number(last)); - goto err; - } - last = x; - } - - pr_info("%s(%lu) passed, last prime was %lu\n", __func__, x, last); - return 0; - -err: - dump_primes(); - return -EINVAL; -} - -static int __init primes_init(void) -{ - return selftest(selftest_max); } static void __exit primes_exit(void) @@ -305,11 +250,8 @@ static void __exit primes_exit(void) free_primes(); } -module_init(primes_init); module_exit(primes_exit); -module_param_named(selftest, selftest_max, ulong, 0400); - MODULE_AUTHOR("Intel Corporation"); MODULE_DESCRIPTION("Prime number library"); MODULE_LICENSE("GPL"); diff --git a/lib/math/prime_numbers_private.h b/lib/math/prime_numbers_private.h new file mode 100644 index 000000000000..4d0504459490 --- /dev/null +++ b/lib/math/prime_numbers_private.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#include + +struct primes { + struct rcu_head rcu; + unsigned long last, sz; + unsigned long primes[]; +}; + +#if IS_ENABLED(CONFIG_PRIME_NUMBERS_KUNIT_TEST) +bool slow_is_prime_number(unsigned long x); +#endif +typedef void (*primes_fn)(void *, const struct primes *); + +// Calls the callback under RCU lock. The callback must not retain the primes pointer. +void with_primes(void *ctx, primes_fn fn); diff --git a/lib/math/tests/Makefile b/lib/math/tests/Makefile index e1a79f093b2d..da21a592c75a 100644 --- a/lib/math/tests/Makefile +++ b/lib/math/tests/Makefile @@ -2,3 +2,4 @@ obj-$(CONFIG_INT_POW_TEST) += int_pow_kunit.o obj-$(CONFIG_INT_SQRT_KUNIT_TEST) += int_sqrt_kunit.o +obj-$(CONFIG_PRIME_NUMBERS_KUNIT_TEST) += prime_numbers_kunit.o diff --git a/lib/math/tests/prime_numbers_kunit.c b/lib/math/tests/prime_numbers_kunit.c new file mode 100644 index 000000000000..2f1643208c66 --- /dev/null +++ b/lib/math/tests/prime_numbers_kunit.c @@ -0,0 +1,59 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include +#include +#include + +#include "../prime_numbers_private.h" + +static void dump_primes(void *ctx, const struct primes *p) +{ + static char buf[PAGE_SIZE]; + struct kunit_suite *suite = ctx; + + bitmap_print_to_pagebuf(true, buf, p->primes, p->sz); + kunit_info(suite, "primes.{last=%lu, .sz=%lu, .primes[]=...x%lx} = %s", + p->last, p->sz, p->primes[BITS_TO_LONGS(p->sz) - 1], buf); +} + +static void prime_numbers_test(struct kunit *test) +{ + const unsigned long max = 65536; + unsigned long x, last, next; + + for (last = 0, x = 2; x < max; x++) { + const bool slow = slow_is_prime_number(x); + const bool fast = is_prime_number(x); + + KUNIT_ASSERT_EQ_MSG(test, slow, fast, "is-prime(%lu)", x); + + if (!slow) + continue; + + next = next_prime_number(last); + KUNIT_ASSERT_EQ_MSG(test, next, x, "next-prime(%lu)", last); + last = next; + } +} + +static void kunit_suite_exit(struct kunit_suite *suite) +{ + with_primes(suite, dump_primes); +} + +static struct kunit_case prime_numbers_cases[] = { + KUNIT_CASE(prime_numbers_test), + {}, +}; + +static struct kunit_suite prime_numbers_suite = { + .name = "math-prime_numbers", + .suite_exit = kunit_suite_exit, + .test_cases = prime_numbers_cases, +}; + +kunit_test_suite(prime_numbers_suite); + +MODULE_AUTHOR("Intel Corporation"); +MODULE_DESCRIPTION("Prime number library"); +MODULE_LICENSE("GPL"); diff --git a/tools/testing/selftests/lib/config b/tools/testing/selftests/lib/config index dc15aba8d0a3..306a3d4dca98 100644 --- a/tools/testing/selftests/lib/config +++ b/tools/testing/selftests/lib/config @@ -1,5 +1,4 @@ CONFIG_TEST_PRINTF=m CONFIG_TEST_SCANF=m CONFIG_TEST_BITMAP=m -CONFIG_PRIME_NUMBERS=m CONFIG_TEST_BITOPS=m diff --git a/tools/testing/selftests/lib/prime_numbers.sh b/tools/testing/selftests/lib/prime_numbers.sh deleted file mode 100755 index 370b79a9cb2e..000000000000 --- a/tools/testing/selftests/lib/prime_numbers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0 -# Checks fast/slow prime_number generation for inconsistencies -$(dirname $0)/../kselftest/module.sh "prime numbers" prime_numbers selftest=65536