Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

lib/mpi: Fix umul_ppmm() for MIPS64r6

Current MIPS64r6 toolchains aren't able to generate efficient
DMULU/DMUHU based code for the C implementation of umul_ppmm(), which
performs an unsigned 64 x 64 bit multiply and returns the upper and
lower 64-bit halves of the 128-bit result. Instead it widens the 64-bit
inputs to 128-bits and emits a __multi3 intrinsic call to perform a 128
x 128 multiply. This is both inefficient, and it results in a link error
since we don't include __multi3 in MIPS linux.

For example commit 90a53e4432b1 ("cfg80211: implement regdb signature
checking") merged in v4.15-rc1 recently broke the 64r6_defconfig and
64r6el_defconfig builds by indirectly selecting MPILIB. The same build
errors can be reproduced on older kernels by enabling e.g. CRYPTO_RSA:

lib/mpi/generic_mpih-mul1.o: In function `mpihelp_mul_1':
lib/mpi/generic_mpih-mul1.c:50: undefined reference to `__multi3'
lib/mpi/generic_mpih-mul2.o: In function `mpihelp_addmul_1':
lib/mpi/generic_mpih-mul2.c:49: undefined reference to `__multi3'
lib/mpi/generic_mpih-mul3.o: In function `mpihelp_submul_1':
lib/mpi/generic_mpih-mul3.c:49: undefined reference to `__multi3'
lib/mpi/mpih-div.o In function `mpihelp_divrem':
lib/mpi/mpih-div.c:205: undefined reference to `__multi3'
lib/mpi/mpih-div.c:142: undefined reference to `__multi3'

Therefore add an efficient MIPS64r6 implementation of umul_ppmm() using
inline assembly and the DMULU/DMUHU instructions, to prevent __multi3
calls being emitted.

Fixes: 7fd08ca58ae6 ("MIPS: Add build support for the MIPS R6 ISA")
Signed-off-by: James Hogan <jhogan@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linux-mips@linux-mips.org
Cc: linux-crypto@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

James Hogan and committed by
Herbert Xu
bbc25bee d76c6810

+17 -1
+17 -1
lib/mpi/longlong.h
··· 671 671 ************** MIPS/64 ************** 672 672 ***************************************/ 673 673 #if (defined(__mips) && __mips >= 3) && W_TYPE_SIZE == 64 674 - #if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4) 674 + #if defined(__mips_isa_rev) && __mips_isa_rev >= 6 675 + /* 676 + * GCC ends up emitting a __multi3 intrinsic call for MIPS64r6 with the plain C 677 + * code below, so we special case MIPS64r6 until the compiler can do better. 678 + */ 679 + #define umul_ppmm(w1, w0, u, v) \ 680 + do { \ 681 + __asm__ ("dmulu %0,%1,%2" \ 682 + : "=d" ((UDItype)(w0)) \ 683 + : "d" ((UDItype)(u)), \ 684 + "d" ((UDItype)(v))); \ 685 + __asm__ ("dmuhu %0,%1,%2" \ 686 + : "=d" ((UDItype)(w1)) \ 687 + : "d" ((UDItype)(u)), \ 688 + "d" ((UDItype)(v))); \ 689 + } while (0) 690 + #elif (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4) 675 691 #define umul_ppmm(w1, w0, u, v) \ 676 692 do { \ 677 693 typedef unsigned int __ll_UTItype __attribute__((mode(TI))); \