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 0BAD4386C17; Tue, 12 May 2026 05:24:54 +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=1778563495; cv=none; b=O9mt00dGcWQNmYBNNmjXjk0KyEZBaUlygzDaVTb8+utGRYrvSMRgQjX+2t2trrForbKcEwPKuimNYL5+7k8IMyQOyvdWj2d4fTUkh5bYZuV91EiyT0zjGa0CIGadJzOhIzVXk5B7JlARfO4qU1ma5nZwCEIyeqcAVzRAAb0xNWM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778563495; c=relaxed/simple; bh=NkRryQ0i6ywiUMQzUxPLMC9I0mXezUpUFjm9Pwi2mqI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=haa2xyrksewvjrlKxLhpahjPAx4wSIBkX2e8pI2N2zGpnPq7JeVJxhdgJlXr8gv36PhLaPVQlQzzBQZhQJSVZDaa0XOvaBXtv9IBrYdCSgaNfUwviuvUW+pVJjk9FNZJpd8UVS8lPYM1CgB8KyyTMwc5gkJRDBVN6O+yY3zBRv4= 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=Wbe25KFs; 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="Wbe25KFs" 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=yxoWjSN0H+WtKxnq6Rp/z4kFHg7WTRKcoiSjQy5l0WM=; b=Wbe25KFs2KBjUSrTFCrt9e7roY HRn5PbrNolMtTz8VquvyEtaL6OsXkuX5lQTw5wGvhwqXK0/EDLLBWa/FubGe/TKPdTpF+RImR4EW+ TQJpbwjYlwzfC8WnWvAC9fegfL3DpIaQOddUZ9wMMlNjW941eb08T3L/Mg76D6NNzne2TZKADxkXw qCCcrUasT8jmvLIpuSvp6V46iRbPFIqqrdtpBDqDWE8V8pfK/gTYPZvBLVMqMUioLek/HEXnDHjLx hSE4poG0HRz/2L6+Q8oDhUaDy2EzfY8BwfMbYppqUE+1jo8TqG9hxsK1x/0gmad/gwlgkRr0ZFxvE lJEgEU9Q==; Received: from 2a02-8389-2341-5b80-decc-1a96-daaa-a2cc.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:decc:1a96:daaa:a2cc] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.99.1 #2 (Red Hat Linux)) id 1wMfbo-0000000Fc70-0F09; Tue, 12 May 2026 05:24:44 +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 11/19] raid6: use static_call for gen_syndrom and xor_syndrom Date: Tue, 12 May 2026 07:20:51 +0200 Message-ID: <20260512052230.2947683-12-hch@lst.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260512052230.2947683-1-hch@lst.de> References: <20260512052230.2947683-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-s390@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 Avoid indirect calls for P/Q parity generation. Signed-off-by: Christoph Hellwig --- lib/raid/raid6/algos.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/raid/raid6/algos.c b/lib/raid/raid6/algos.c index 5bd953032e55..65b75236ecf8 100644 --- a/lib/raid/raid6/algos.c +++ b/lib/raid/raid6/algos.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include "algos.h" @@ -23,7 +24,8 @@ static unsigned int raid6_nr_algos; static const struct raid6_recov_calls *raid6_recov_algo; /* Selected algorithm */ -static struct raid6_calls raid6_call; +DEFINE_STATIC_CALL_NULL(raid6_gen_syndrome_impl, *raid6_intx1.gen_syndrome); +DEFINE_STATIC_CALL_NULL(raid6_xor_syndrome_impl, *raid6_intx1.xor_syndrome); /** * raid6_gen_syndrome - generate RAID6 P/Q parity @@ -48,7 +50,7 @@ void raid6_gen_syndrome(int disks, size_t bytes, void **ptrs) WARN_ON_ONCE(bytes & 511); WARN_ON_ONCE(disks < RAID6_MIN_DISKS); - raid6_call.gen_syndrome(disks, bytes, ptrs); + static_call(raid6_gen_syndrome_impl)(disks, bytes, ptrs); } EXPORT_SYMBOL_GPL(raid6_gen_syndrome); @@ -85,7 +87,7 @@ void raid6_xor_syndrome(int disks, int start, int stop, size_t bytes, WARN_ON_ONCE(disks < RAID6_MIN_DISKS); WARN_ON_ONCE(stop < start); - raid6_call.xor_syndrome(disks, start, stop, bytes, ptrs); + static_call(raid6_xor_syndrome_impl)(disks, start, stop, bytes, ptrs); } EXPORT_SYMBOL_GPL(raid6_xor_syndrome); @@ -96,7 +98,7 @@ EXPORT_SYMBOL_GPL(raid6_xor_syndrome); */ bool raid6_can_xor_syndrome(void) { - return !!raid6_call.xor_syndrome; + return !!static_call_query(raid6_xor_syndrome_impl); } EXPORT_SYMBOL_GPL(raid6_can_xor_syndrome); @@ -195,7 +197,8 @@ static int raid6_choose_gen(void *(*const dptrs)[RAID6_TEST_DISKS], return -EINVAL; } - raid6_call = *best; + static_call_update(raid6_gen_syndrome_impl, best->gen_syndrome); + static_call_update(raid6_xor_syndrome_impl, best->xor_syndrome); pr_info("raid6: using algorithm %s gen() %ld MB/s\n", best->name, @@ -240,7 +243,10 @@ static int __init raid6_select_algo(void) if (!IS_ENABLED(CONFIG_RAID6_PQ_BENCHMARK) || raid6_nr_algos == 1) { pr_info("raid6: skipped pq benchmark and selected %s\n", raid6_algos[raid6_nr_algos - 1]->name); - raid6_call = *raid6_algos[raid6_nr_algos - 1]; + static_call_update(raid6_gen_syndrome_impl, + raid6_algos[raid6_nr_algos - 1]->gen_syndrome); + static_call_update(raid6_xor_syndrome_impl, + raid6_algos[raid6_nr_algos - 1]->xor_syndrome); return 0; } -- 2.53.0