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 11A8B3C73E0; Tue, 24 Mar 2026 06:45:03 +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=1774334713; cv=none; b=n027ccXpxNvaGTgB0E5eGDxEZ0kebl2+CbjkVrRqUNGJGHrVlugjFA71JNr17tBUO9l1uf9pUnO0aXpJpB3gu7rr4jim5u6phONk59lCz7GU44PcYPjRxiswvHAlMa5nZvxxpIXIY0mAusSYgN7PsMGcyn8VjsUTUn0m/4FeM00= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774334713; c=relaxed/simple; bh=WynC/FKVwRb0JweEg8m7a+L01JRdmhcrdj9lQwNa+4s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t1sf7RkxLsWu9taY5gpSkmMSbrX2iCivCCcMJ0DmZXJS7jOTsgFrLrdEnKerXEMuEHCm6u9YzrBKiZZ6lJMBbxx49PNo48ApU8ZCn/ca8341S28KFdOhcTreVYu8v6wOoTtq1vtsgoTNwai51pULdHAD5dQ9Qcpa62ZOlCP1sek= 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=bFnaFA2H; 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="bFnaFA2H" 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=yu7/Ka21ssnSEnKCS7BEX+6vnMLxFzOVzyjHOraql+M=; b=bFnaFA2H2H6aQe0WtP/Z+52inL vtlZuzxPDgk8FZzvQLbDNV4xaKaY6aBs1tfGBVddJmEhGtJKvoBX+3MI1Vylr109i1IIh7WN98blh wr9JE1QdoL9Vy5/wf+Fm8aqgONWhzW1AFcbswuoXZKXbiJlB2A8Odatp977H1Nw2lrXznUXBhbpf7 h8yI6H9ylI0JCIuE6FKcMnsz9kTyJHhtlXRR+tO6Wecs4KL8QJxQah1g92IsFoFY0c0sr02VJ6SIA J1ugHLEe51XT0WykZk23qVApiylwXbTb+EJpujQbnLoSCBHEPdh/q7Wb/+vo+QEigWelAimjRpIQc 9cblOQXw==; 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 1w4vVV-00000000oXD-34Uu; Tue, 24 Mar 2026 06:44:54 +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 15/17] raid6_kunit: cleanup dataptr handling Date: Tue, 24 Mar 2026 07:40:50 +0100 Message-ID: <20260324064115.3217136-16-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 Move the global dataptr array into test_recover() as all sites that fill data or parity can use test_buffers directly, and this localized the override for the failed slots to the recovery testing routine. Signed-off-by: Christoph Hellwig --- lib/raid/raid6/tests/raid6_kunit.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/lib/raid/raid6/tests/raid6_kunit.c b/lib/raid/raid6/tests/raid6_kunit.c index 1793b952a595..ba6cfabc67a4 100644 --- a/lib/raid/raid6/tests/raid6_kunit.c +++ b/lib/raid/raid6/tests/raid6_kunit.c @@ -18,7 +18,6 @@ MODULE_IMPORT_NS("EXPORTED_FOR_KUNIT_TESTING"); #define NDISKS 16 /* Including P and Q */ static struct rnd_state rng; -static void *dataptrs[NDISKS]; static void *test_buffers[NDISKS]; static void *test_recov_buffers[RAID6_KUNIT_MAX_FAILURES]; @@ -35,10 +34,8 @@ static void makedata(int start, int stop) { int i; - for (i = start; i <= stop; i++) { + for (i = start; i <= stop; i++) prandom_bytes_state(&rng, test_buffers[i], PAGE_SIZE); - dataptrs[i] = test_buffers[i]; - } } static char member_type(int d) @@ -56,11 +53,13 @@ static char member_type(int d) static void test_recover(struct kunit *test, int faila, int failb) { const struct test_args *ta = test->param_value; + void *dataptrs[NDISKS]; int i; for (i = 0; i < RAID6_KUNIT_MAX_FAILURES; i++) memset(test_recov_buffers[i], 0xf0, PAGE_SIZE); + memcpy(dataptrs, test_buffers, sizeof(dataptrs)); dataptrs[faila] = test_recov_buffers[0]; dataptrs[failb] = test_recov_buffers[1]; @@ -73,7 +72,7 @@ static void test_recover(struct kunit *test, int faila, int failb) * is equivalent to a RAID-5 failure (XOR, then recompute Q). */ if (faila != NDISKS - 2) - goto skip; + return; /* P+Q failure. Just rebuild the syndrome. */ ta->gen->gen_syndrome(NDISKS, PAGE_SIZE, dataptrs); @@ -95,10 +94,6 @@ static void test_recover(struct kunit *test, int faila, int failb) "failb miscompared: %3d[%c] (faila=%3d[%c])\n", failb, member_type(failb), faila, member_type(faila)); - -skip: - dataptrs[faila] = test_buffers[faila]; - dataptrs[failb] = test_buffers[failb]; } static void raid6_test(struct kunit *test) @@ -111,7 +106,7 @@ static void raid6_test(struct kunit *test) memset(test_buffers[NDISKS - 1], 0xee, PAGE_SIZE); /* Generate assumed good syndrome */ - ta->gen->gen_syndrome(NDISKS, PAGE_SIZE, (void **)&dataptrs); + ta->gen->gen_syndrome(NDISKS, PAGE_SIZE, test_buffers); for (i = 0; i < NDISKS - 1; i++) for (j = i + 1; j < NDISKS; j++) @@ -124,10 +119,10 @@ static void raid6_test(struct kunit *test) for (p2 = p1; p2 < NDISKS - 2; p2++) { /* Simulate rmw run */ ta->gen->xor_syndrome(NDISKS, p1, p2, PAGE_SIZE, - (void **)&dataptrs); + test_buffers); makedata(p1, p2); ta->gen->xor_syndrome(NDISKS, p1, p2, PAGE_SIZE, - (void **)&dataptrs); + test_buffers); for (i = 0; i < NDISKS - 1; i++) for (j = i + 1; j < NDISKS; j++) -- 2.47.3