From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 145A43E6DEA; Tue, 24 Mar 2026 06:44:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774334688; cv=none; b=i+ucHegxe2HQBc/OcS50WLo7AaAk0uPMzhQLHstyLte5cxtVTyGSZDje8AhspwxRC0mWCKwh32++KfYcOtbGAXDwXYKVoyRckWXH+slKWIL1Ecre3y/0ds93tmjuEJlOwSmwJrwikxng5O5EARAO+c8lYDIlizHwJW8fOO5VfHY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774334688; c=relaxed/simple; bh=byUwHEbtDy0h6WpjNfWOEv2oW49Taqyy5u6Hwa6QKNw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H8kmFdMYyO90jjJh6ZMoDEFb22CMOrvNGCGywT+0RJNYryi9mcYwQ9H1gbsrDccLog5/20DH3xEdddag/AfiJo/MLKa2QIwQrKA8OJMALVwR2+vOxRpL4ROXIC2El5CpmXtnw2QpT+Go7XUHDR2uWN9MzOdre9z+sTafhgYNbUE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=TeKq56tp; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="TeKq56tp" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=d5pfyRkCL6UBpVyH22oNsv600en31GzFI3N/5vNKjvw=; b=TeKq56tpEKqDQEPe2aTSmUmWGB I+1AWdfNrXT8/YBmMh5qqOIkkxyAz8KwrxsNNqgNsPaOmL4Q23zzNCZbolpO5BZQgy7V7KYQjOknx C21RcfVASMG4Ez4ao0W9Nu2UgnSkpIc2b5FozBssAZGj0xidBANzsFjWevtzgys7akz+Mb4CASZ5O UXDpp2bO98fIQt6r9Lqr2K6hCpUdt3FD+IF/T//iv0fiiVgWHIyN6cNAD9E4a2PVigqGITCumIP5A tcYCTwtMYZqCCj83ClI+q1S8xSECS9xfFYaTGDpOkD77ap0UwslwSUQJcs87d3w608l1jzcFAMpOA 9TnquQ9Q==; Received: from 2a02-8389-2341-5b80-d601-7564-c2e0-491c.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:d601:7564:c2e0:491c] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98.2 #2 (Red Hat Linux)) id 1w4vV6-00000000o4Y-0DC7; Tue, 24 Mar 2026 06:44:28 +0000 From: Christoph Hellwig To: Andrew Morton Cc: Catalin Marinas , Will Deacon , Ard Biesheuvel , Huacai Chen , WANG Xuerui , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , "Christophe Leroy (CS GROUP)" , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Herbert Xu , Dan Williams , Chris Mason , David Sterba , Arnd Bergmann , Song Liu , Yu Kuai , Li Nan , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-crypto@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-arch@vger.kernel.org, linux-raid@vger.kernel.org Subject: [PATCH 13/17] raid6_kunit: use KUNIT_CASE_PARAM Date: Tue, 24 Mar 2026 07:40:48 +0100 Message-ID: <20260324064115.3217136-14-hch@lst.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260324064115.3217136-1-hch@lst.de> References: <20260324064115.3217136-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html The raid6 test combines various generation and recovery algorithms. Use KUNIT_CASE_PARAM and provide a generator that iterates over the possible combinations instead of looping inside a single test instance. Signed-off-by: Christoph Hellwig --- lib/raid/raid6/tests/raid6_kunit.c | 120 ++++++++++++++++------------- 1 file changed, 68 insertions(+), 52 deletions(-) diff --git a/lib/raid/raid6/tests/raid6_kunit.c b/lib/raid/raid6/tests/raid6_kunit.c index abc854cf4a98..7095952ad8e3 100644 --- a/lib/raid/raid6/tests/raid6_kunit.c +++ b/lib/raid/raid6/tests/raid6_kunit.c @@ -21,6 +21,15 @@ static char data[NDISKS][PAGE_SIZE] __attribute__((aligned(PAGE_SIZE))); static char recovi[PAGE_SIZE] __attribute__((aligned(PAGE_SIZE))); static char recovj[PAGE_SIZE] __attribute__((aligned(PAGE_SIZE))); +struct test_args { + unsigned int recov_idx; + const struct raid6_recov_calls *recov; + unsigned int gen_idx; + const struct raid6_calls *gen; +}; + +static struct test_args args; + static void makedata(int start, int stop) { int i; @@ -43,9 +52,10 @@ static char member_type(int d) } } -static void test_disks(struct kunit *test, const struct raid6_calls *calls, - const struct raid6_recov_calls *ra, int faila, int failb) +static void test_recover(struct kunit *test, int faila, int failb) { + const struct test_args *ta = test->param_value; + memset(recovi, 0xf0, PAGE_SIZE); memset(recovj, 0xba, PAGE_SIZE); @@ -64,25 +74,23 @@ static void test_disks(struct kunit *test, const struct raid6_calls *calls, goto skip; /* P+Q failure. Just rebuild the syndrome. */ - calls->gen_syndrome(NDISKS, PAGE_SIZE, dataptrs); + ta->gen->gen_syndrome(NDISKS, PAGE_SIZE, dataptrs); } else if (failb == NDISKS - 2) { /* data+P failure. */ - ra->datap(NDISKS, PAGE_SIZE, faila, dataptrs); + ta->recov->datap(NDISKS, PAGE_SIZE, faila, dataptrs); } else { /* data+data failure. */ - ra->data2(NDISKS, PAGE_SIZE, faila, failb, dataptrs); + ta->recov->data2(NDISKS, PAGE_SIZE, faila, failb, dataptrs); } KUNIT_EXPECT_MEMEQ_MSG(test, data[faila], recovi, PAGE_SIZE, - "algo=%-8s/%-8s faila miscompared: %3d[%c] (failb=%3d[%c])\n", - calls->name, ra->name, - faila, member_type(faila), - failb, member_type(failb)); + "faila miscompared: %3d[%c] (failb=%3d[%c])\n", + faila, member_type(faila), + failb, member_type(failb)); KUNIT_EXPECT_MEMEQ_MSG(test, data[failb], recovj, PAGE_SIZE, - "algo=%-8s/%-8s failb miscompared: %3d[%c] (faila=%3d[%c])\n", - calls->name, ra->name, - failb, member_type(failb), - faila, member_type(faila)); + "failb miscompared: %3d[%c] (faila=%3d[%c])\n", + failb, member_type(failb), + faila, member_type(faila)); skip: dataptrs[faila] = data[faila]; @@ -91,58 +99,65 @@ static void test_disks(struct kunit *test, const struct raid6_calls *calls, static void raid6_test(struct kunit *test) { + const struct test_args *ta = test->param_value; int i, j, p1, p2; - unsigned int r, g; - - for (r = 0; ; r++) { - const struct raid6_recov_calls *ra = raid6_recov_algo_find(r); - - if (!ra) - break; - - for (g = 0; ; g++) { - const struct raid6_calls *calls = raid6_algo_find(g); - - if (!calls) - break; - /* Nuke syndromes */ - memset(data[NDISKS - 2], 0xee, PAGE_SIZE); - memset(data[NDISKS - 1], 0xee, PAGE_SIZE); + /* Nuke syndromes */ + memset(data[NDISKS - 2], 0xee, PAGE_SIZE); + memset(data[NDISKS - 1], 0xee, PAGE_SIZE); - /* Generate assumed good syndrome */ - calls->gen_syndrome(NDISKS, PAGE_SIZE, - (void **)&dataptrs); + /* Generate assumed good syndrome */ + ta->gen->gen_syndrome(NDISKS, PAGE_SIZE, (void **)&dataptrs); - for (i = 0; i < NDISKS-1; i++) - for (j = i+1; j < NDISKS; j++) - test_disks(test, calls, ra, i, j); + for (i = 0; i < NDISKS - 1; i++) + for (j = i + 1; j < NDISKS; j++) + test_recover(test, i, j); - if (!calls->xor_syndrome) - continue; + if (!ta->gen->xor_syndrome) + return; - for (p1 = 0; p1 < NDISKS-2; p1++) - for (p2 = p1; p2 < NDISKS-2; p2++) { + for (p1 = 0; p1 < NDISKS - 2; p1++) { + for (p2 = p1; p2 < NDISKS - 2; p2++) { + /* Simulate rmw run */ + ta->gen->xor_syndrome(NDISKS, p1, p2, PAGE_SIZE, + (void **)&dataptrs); + makedata(p1, p2); + ta->gen->xor_syndrome(NDISKS, p1, p2, PAGE_SIZE, + (void **)&dataptrs); - /* Simulate rmw run */ - calls->xor_syndrome(NDISKS, p1, p2, PAGE_SIZE, - (void **)&dataptrs); - makedata(p1, p2); - calls->xor_syndrome(NDISKS, p1, p2, PAGE_SIZE, - (void **)&dataptrs); + for (i = 0; i < NDISKS - 1; i++) + for (j = i + 1; j < NDISKS; j++) + test_recover(test, i, j); + } + } +} - for (i = 0; i < NDISKS-1; i++) - for (j = i+1; j < NDISKS; j++) - test_disks(test, calls, - ra, i, j); - } +static const void *raid6_gen_params(struct kunit *test, const void *prev, + char *desc) +{ + if (!args.gen) { +next_algo: + args.recov_idx = 0; + args.gen = raid6_algo_find(args.gen_idx); + if (!args.gen) + return NULL; + } - } + if (args.recov) + args.recov_idx++; + args.recov = raid6_recov_algo_find(args.recov_idx); + if (!args.recov) { + args.gen_idx++; + goto next_algo; } + + snprintf(desc, KUNIT_PARAM_DESC_SIZE, "gen=%s recov=%s", + args.gen->name, args.recov->name); + return &args; } static struct kunit_case raid6_test_cases[] = { - KUNIT_CASE(raid6_test), + KUNIT_CASE_PARAM(raid6_test, raid6_gen_params), {}, }; @@ -150,6 +165,7 @@ static int raid6_suite_init(struct kunit_suite *suite) { prandom_seed_state(&rng, RAID6_KUNIT_SEED); makedata(0, NDISKS - 1); + memset(&args, 0, sizeof(args)); return 0; } -- 2.47.3