From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 224E7C433EF for ; Tue, 9 Nov 2021 12:05:23 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id E019860F58 for ; Tue, 9 Nov 2021 12:05:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E019860F58 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=KRgttoNSvy6RBIj3SrNMAEfiJGaMynVdweEhoM53qDM=; b=uWMwlfdpwcQn/A ehAa4vupTqdOFQgzT4qGyx4GrLtuOWJbI7X+QybzGi57eyiAOykEUWznWZwQV0uUCARbhd5kHV3XP 2E7HzmGEoQUFRxn/O96406sxCOVm3w/TMARRG/dkJh/JwY6ZNrVoKhwMp6tLXvllXERu3n8e71H1N OhxukkCkOUDQX3624+H0IaYeksJanu4IImUBrfFIB5TxymKoVwDUPl+YjzPY2EhNu3q3tSICeYbCc drV+059bFGeS5E7nRjKWQUvBuQrFQnJ0ftjecJl5Moh3haW8yqkcDBG8DZfkwVm32rGx4lIqss9lF XlZDh0rhN4b7/2CpovGQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mkPr8-001ti0-Sw; Tue, 09 Nov 2021 12:04:03 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mkPqu-001tfB-Lh for linux-arm-kernel@lists.infradead.org; Tue, 09 Nov 2021 12:03:51 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id EF452611F0; Tue, 9 Nov 2021 12:03:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1636459428; bh=6Ul99qkjkFXgIhBjAQv/BS9tFEnlV8gsbfpbHalI2LI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t3HPdJRdgo5Ns0un4APlI5QJgsYj+yH/gzuMMtXYFqVbd3a97ekaCRgW0MQGQN455 Ubk+ATHShwIbb6JFDAFC580J5ua3GOTE1vL/QdwUTKfpILHB2Vg92FoFKwg+12QfoC FMAVrkZNx+JZLFKdwg/b4JIcbVAPjpgpqSKIeMVoCpoIBjtGcqFbbS0IgRTwJq1FD9 WPm6lxrfosz8xtv6VFkZVqdBcqNUHqLZ4KCBd4mAZO+cO3obUhUh/vT0R2VfMf4n68 3QxKkZbqRtNMU6QkPp2tiARFt8dJJ6DHrTX97ltJTxGpNV8EZwAjS3dappZN4FxoCE 0FOPsvCdMR7Jw== From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: catalin.marinas@arm.com, will@kernel.org, Ard Biesheuvel , Mark Rutland , Peter Zijlstra Subject: [PATCH 1/2] arm64/xor: use static calls for inner NEON helpers Date: Tue, 9 Nov 2021 13:03:35 +0100 Message-Id: <20211109120336.3561463-2-ardb@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211109120336.3561463-1-ardb@kernel.org> References: <20211109120336.3561463-1-ardb@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=4625; h=from:subject; bh=6Ul99qkjkFXgIhBjAQv/BS9tFEnlV8gsbfpbHalI2LI=; b=owEB7QES/pANAwAKAcNPIjmS2Y8kAcsmYgBhimOVSmv98kKNjABI13gteb27l1YyqWgr7lWM9L6a KJOhIFmJAbMEAAEKAB0WIQT72WJ8QGnJQhU3VynDTyI5ktmPJAUCYYpjlQAKCRDDTyI5ktmPJNowC/ 9dwoZRatm5zGpi6tdO7Ke7ccU9ofuOLNxecIelUeqvRwHwzRy+ZNTMOpmXVYnFRh0Frsy8ZVulk6Ja x5wE5HXoR2Klk9UNpCBdk45Z2/eIshptbnY18YrOqWetDVnKunFLhyge4m8zEoN/7SqVUnwIDdD0bv 3FI95Azud4L9/lHnATRY8Ty82XBKQp3jqg9kkn85hh0Bj9aYAhBdeu74udW1RP5OOE+hQVghT7HePv +khEvbUMhOw6AyEnh8n/iO5jyGbIC6tlEgYPM6W/lYwGLOHfzIG8WvZJqAu0DZY7Eg7zFtruvy1jQO 6sGWVtqZ3cQY+MHPsbOWGeuC5Xam04T5Qtyrn8SUh6AMCeEDco0nnXnm1RFGhF8/P2F9ZxlXz0BBUB sJn0q2WzWTlvYP8gD3lxIdMsR2XeezEHiQkdo45CqyI+dtCwcg9tW7K+2kRAbvoxkbCAo6o/ILy+/H cTYj41YnEZ/meXx2XwbLxj3ARfPUs4QfKHSi8FmYArD6o= X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211109_040348_812547_AB18CB0D X-CRM114-Status: GOOD ( 11.07 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Call the inner NEON helpers using static calls rather than loading their addresses from a struct. This will be used in a subsequent patch to switch between NEON and SHA3 based implementations of the XOR code. Signed-off-by: Ard Biesheuvel --- arch/arm64/include/asm/xor.h | 24 ++++++++++++++++---- arch/arm64/lib/xor-neon.c | 20 +++++++++------- 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/arch/arm64/include/asm/xor.h b/arch/arm64/include/asm/xor.h index 947f6a4f1aa0..f52dbb05b4b1 100644 --- a/arch/arm64/include/asm/xor.h +++ b/arch/arm64/include/asm/xor.h @@ -7,19 +7,33 @@ */ #include +#include #include #include #include #ifdef CONFIG_KERNEL_MODE_NEON -extern struct xor_block_template const xor_block_inner_neon; +void xor_arm64_neon_2(unsigned long bytes, unsigned long *p1, + unsigned long *p2); +void xor_arm64_neon_3(unsigned long bytes, unsigned long *p1, + unsigned long *p2, unsigned long *p3); +void xor_arm64_neon_4(unsigned long bytes, unsigned long *p1, + unsigned long *p2, unsigned long *p3, + unsigned long *p4); +void xor_arm64_neon_5(unsigned long bytes, unsigned long *p1, + unsigned long *p2, unsigned long *p3, + unsigned long *p4, unsigned long *p5); + +DECLARE_STATIC_CALL(xor_arm64_3, xor_arm64_neon_3); +DECLARE_STATIC_CALL(xor_arm64_4, xor_arm64_neon_4); +DECLARE_STATIC_CALL(xor_arm64_5, xor_arm64_neon_5); static void xor_neon_2(unsigned long bytes, unsigned long *p1, unsigned long *p2) { kernel_neon_begin(); - xor_block_inner_neon.do_2(bytes, p1, p2); + xor_arm64_neon_2(bytes, p1, p2); kernel_neon_end(); } @@ -28,7 +42,7 @@ xor_neon_3(unsigned long bytes, unsigned long *p1, unsigned long *p2, unsigned long *p3) { kernel_neon_begin(); - xor_block_inner_neon.do_3(bytes, p1, p2, p3); + static_call(xor_arm64_3)(bytes, p1, p2, p3); kernel_neon_end(); } @@ -37,7 +51,7 @@ xor_neon_4(unsigned long bytes, unsigned long *p1, unsigned long *p2, unsigned long *p3, unsigned long *p4) { kernel_neon_begin(); - xor_block_inner_neon.do_4(bytes, p1, p2, p3, p4); + static_call(xor_arm64_4)(bytes, p1, p2, p3, p4); kernel_neon_end(); } @@ -46,7 +60,7 @@ xor_neon_5(unsigned long bytes, unsigned long *p1, unsigned long *p2, unsigned long *p3, unsigned long *p4, unsigned long *p5) { kernel_neon_begin(); - xor_block_inner_neon.do_5(bytes, p1, p2, p3, p4, p5); + static_call(xor_arm64_5)(bytes, p1, p2, p3, p4, p5); kernel_neon_end(); } diff --git a/arch/arm64/lib/xor-neon.c b/arch/arm64/lib/xor-neon.c index 11bf4f8aca68..ee4795f3e166 100644 --- a/arch/arm64/lib/xor-neon.c +++ b/arch/arm64/lib/xor-neon.c @@ -7,6 +7,7 @@ */ #include +#include #include #include @@ -36,6 +37,7 @@ void xor_arm64_neon_2(unsigned long bytes, unsigned long *p1, dp2 += 8; } while (--lines > 0); } +EXPORT_SYMBOL(xor_arm64_neon_2); void xor_arm64_neon_3(unsigned long bytes, unsigned long *p1, unsigned long *p2, unsigned long *p3) @@ -71,6 +73,7 @@ void xor_arm64_neon_3(unsigned long bytes, unsigned long *p1, dp3 += 8; } while (--lines > 0); } +EXPORT_SYMBOL(xor_arm64_neon_3); void xor_arm64_neon_4(unsigned long bytes, unsigned long *p1, unsigned long *p2, unsigned long *p3, unsigned long *p4) @@ -114,6 +117,7 @@ void xor_arm64_neon_4(unsigned long bytes, unsigned long *p1, dp4 += 8; } while (--lines > 0); } +EXPORT_SYMBOL(xor_arm64_neon_4); void xor_arm64_neon_5(unsigned long bytes, unsigned long *p1, unsigned long *p2, unsigned long *p3, @@ -166,15 +170,15 @@ void xor_arm64_neon_5(unsigned long bytes, unsigned long *p1, dp5 += 8; } while (--lines > 0); } +EXPORT_SYMBOL(xor_arm64_neon_5); -struct xor_block_template const xor_block_inner_neon = { - .name = "__inner_neon__", - .do_2 = xor_arm64_neon_2, - .do_3 = xor_arm64_neon_3, - .do_4 = xor_arm64_neon_4, - .do_5 = xor_arm64_neon_5, -}; -EXPORT_SYMBOL(xor_block_inner_neon); +DEFINE_STATIC_CALL(xor_arm64_3, xor_arm64_neon_3); +DEFINE_STATIC_CALL(xor_arm64_4, xor_arm64_neon_4); +DEFINE_STATIC_CALL(xor_arm64_5, xor_arm64_neon_5); + +EXPORT_STATIC_CALL(xor_arm64_3); +EXPORT_STATIC_CALL(xor_arm64_4); +EXPORT_STATIC_CALL(xor_arm64_5); MODULE_AUTHOR("Jackie Liu "); MODULE_DESCRIPTION("ARMv8 XOR Extensions"); -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel