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 CB1643DEACC; Tue, 24 Mar 2026 06:43:57 +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=1774334652; cv=none; b=DBLvS1uKpYsUOXjxjnlYyRnJ/ihsae89IPYZkzDk7SAbSR3rLonNpT8iPsVwdoePVqVvHwN+h6ChygxByZ0UlNPC8U1U6x+KUMnmQedR3JVeOrKWK1sZ80rQeaWpPY6zQRo1izxLy4eeZF+twUrM2Xss1x3e4tW9nBP6TqwbcRQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774334652; c=relaxed/simple; bh=DiJqiKNyOcU3NcPb+0JayT7DlgafYL8fwRuHxQ4wEyo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dBRzKZqRMqDNdGdLJ3Cxq6Jva/8kBWR6Mjp2ZCBNtTW72HP/uOlm5wFhI6rx8N0oVKvTIDeCLPAmYLh9ITvYYs+cC+yI9falf7VQO597PjcvXywZ98KTS/k97vvBMt4g1IeaxbIYVNjAH3sBcyutY9SbSC8mmdM9RKkkcU7OeOg= 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=n5IbpnoH; 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="n5IbpnoH" 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=1Orw8RMJxkpz0Odvu04ZIdc/J2ZaluJdGdOCU/wX31U=; b=n5IbpnoH5hOF1zYXpiJTDo/N1D lxFEaNblCFVlam3qKCdLCTd3mSsPHWv7AHzbiHstGqi4Cj4sc9qkQdjQTHFMn+RESSLGwZGmhifCT yVpgTmd0JS7lUVgLumU9sA5APgnSW8fxBQ9HXrb5f3NHaZoYG6w4925LmEcQ+NJKQ+Nk4nlSmnO7r 1qHA6/AGaHP2VpuPRDkMJaRR2pL/ZpsQDT9zJk/jfAq86DWAkkVgLoGh8VLD0rR7U+2fIShqEMZxb tixejzG4CPlSVXU3jHoLCCkjqp3sh5QR0clNyqRJUPWEcq1arCfPMldaV3e0FQ3lbrKeFbYVizcNt K2wvWpWQ==; 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 1w4vUP-00000000nX3-3r20; Tue, 24 Mar 2026 06:43:46 +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 10/17] raid6: use static_call for gen_syndrom and xor_syndrom Date: Tue, 24 Mar 2026 07:40:45 +0100 Message-ID: <20260324064115.3217136-11-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 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 f9e8a8752e2d..b81c7594f6c4 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 @@ -47,7 +49,7 @@ void raid6_gen_syndrome(int disks, size_t bytes, void **ptrs) lockdep_assert_preemption_enabled(); WARN_ON_ONCE(bytes & 511); - raid6_call.gen_syndrome(disks, bytes, ptrs); + static_call(raid6_gen_syndrome_impl)(disks, bytes, ptrs); } EXPORT_SYMBOL_GPL(raid6_gen_syndrome); @@ -83,7 +85,7 @@ void raid6_xor_syndrome(int disks, int start, int stop, size_t bytes, WARN_ON_ONCE(bytes & 511); 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); @@ -94,7 +96,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); @@ -193,7 +195,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, @@ -238,7 +241,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[0]->name); - raid6_call = *raid6_algos[0]; + static_call_update(raid6_gen_syndrome_impl, + raid6_algos[0]->gen_syndrome); + static_call_update(raid6_xor_syndrome_impl, + raid6_algos[0]->xor_syndrome); return 0; } -- 2.47.3