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 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.lore.kernel.org (Postfix) with ESMTPS id BB52CCD4851 for ; Thu, 14 May 2026 12:14:48 +0000 (UTC) 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=NK4IFx+vAjlCcegVr2EmwmTfdmOENl9RfQBI0/DFy3I=; b=NoJdU+62rZBl+G u6Fz5+TwxQx0Ve3rAFJmhV+JFDlXIJOYFc5yvxXR+gj636AwqU1SkF3yUNvr6PJ2h1ATeQi/2ZaHG uIcPDKOdNCgoqu4hmgv805HP5tmV9pQwyhUHxYpDskFxIfd2/67Bt3zOWE1l6Hn3kYvt0YY8gO4GP rObh2By5A3q01c/ysI3aOt39xiKWQ5Q7SWPgD39qyscZi+w4CL3SSOixGEzLNazrPJ7Atw6VJc6ja l/SAc0pumdY2PzmGt/qwIzDe7r/XpC2/DVsqXKgsOaVCb/zbyM0yQ0HnHL8iz1Wy8nxRoM4TwvF92 1sZlVXehfm+sp31XqDbQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wNUxO-00000005QTL-3Fjv; Thu, 14 May 2026 12:14:26 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wNUxN-00000005QSU-1LZy for linux-riscv@bombadil.infradead.org; Thu, 14 May 2026 12:14:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; 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=Pgj61FBq/UbvmM2TQH6EKEDIV/V9Gcyb7zXKSvEriQc=; b=mS48qN1lOlU6CgQWDLfT1Tt5yv 1OVo47obgvn/9TFy/N9Jwc/PwrbcGlzEXeHD9rH0IEKivwWMAi4OsfkrEMC3YCNsroGjK2bri8e/h 1jYjUDN45xY/buEoXopMjeJWPnGI7cJwmdoPy87XcCR8/aXsX5crKMdMoYIIU5YErIJY9QQcZ1tY+ b+QPVVCR1v9saw58cGmgDVtT6xyspNK2wHLKXV0+Utc5TboxUpBUjkVfOXN94pLiYPppDiyDXYUO6 FV/c/dQ+jgd8XA8setV36O3QR+PgVoREkEH+RSvVrWc37nTiAELowylK2067vKNYmukFA0AI6hR1y 3KoorIUQ==; Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by desiato.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wNUxJ-00000002qDd-284P for linux-riscv@lists.infradead.org; Thu, 14 May 2026 12:14:24 +0000 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-44e1860558fso5106533f8f.0 for ; Thu, 14 May 2026 05:14:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778760860; x=1779365660; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Pgj61FBq/UbvmM2TQH6EKEDIV/V9Gcyb7zXKSvEriQc=; b=dVM3QPnMFFoXWBfmD7gBmulPfYxbxVMXbK5MH5WD46Q/+eRG2DSkxojWWgtzU2yPao g3plyMmEh3arcHcZA7D6vPjOKzHhjNlq7S0YfsL1OwzXNO4rLDZNaXTDo5MwQErGN/iz EJRu5QU/D+uZ0DK/oOlEPAuzamQI8N6AKHsPF0v/hnOz8531Xl7eh3/kjgw4D7A4cOXf 6MMM4uJqG5Qh42sLwv+WNM35aL8kZd1FSvtna3cs0mxUa4vRwxf6CnR6YPrS3hYedjUd /rtxQRmwzigNoIp8ZD14Ek/z5VxgBitpPTIaNloQudyzzIKXQmSQrKPZsLkQjeDTAjs9 N98g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778760860; x=1779365660; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Pgj61FBq/UbvmM2TQH6EKEDIV/V9Gcyb7zXKSvEriQc=; b=BoUuwJHCAkHl0KLbR96z6MQ982e+EEIaLgdPByt0IXUFdijw137PV8qzh3OjYfglFY 2EWWsisLsVf3lqzuzZfb0A7md3dFzjtN29maTrY4OIl8QuqGXQcKDZjQGarYBX03fzKH W4O4MQLVMRiMHnJM91HLFSy09nlEPbN+9jhVXZKHzYphhMCibfAX8X35ZhQ1Agx04gh2 f3hKgKU31djNq+DHnLrVQQLJcGYi1V9IoQV7n2fk2WInBW8FK3uSp0abzDKLAJdunOgU 8+cWBbKlV4B8JLUJRxQKHe/mM8DJ678gfK4csoOymEoK4+FJAfFHW8LFMOhEagQrcT51 5stw== X-Forwarded-Encrypted: i=1; AFNElJ9s0eol7zi68sSECsc6/ldWNyKEW4MqJgGzDeolqxBJGLdkHs5jQYhedJCc3HRc6qjKAlJGwlREDvnWBg==@lists.infradead.org X-Gm-Message-State: AOJu0YyhJ5tZcNmXPaIdERmZZelHideDTQMIAnmUZ51zad0H2glp/5r9 KX98F2B2uPOeJaBrsHj4vuDVAgpQJadivybiOPR7WhULagzOzhHa5Sks X-Gm-Gg: Acq92OE9h56PaaSIB9rczrm8YyZTKjPJzdepfU1IyT/c/eecYB/jOelil9NM6hSf9rQ LlnuFYl7m07v7uuwarTor73/NithchSL8wRIovSKpfCJDGUp9ivAg14nj+yI/1JF3oO+5XcrpP+ cbxJ+TARlr6cdRCG6WPn8F/Gba5oLN/dkrCYAtbFHv5ASvNJKD6P8Tq3mf3MDNj4ek0HvlWNIPK kVVbGVPt0wLlUYXLBZPP6Z118/hhjaB9GxAwexhkFH8qqk+QEUrpwpPzzAP3Fjcg+96OavbeToj gIwSi/TvtWWO4P7pOp49dK74m3F+15HENuPRGxPNOxeOoR6wbvJaaSkPfbnDngZi626q1hll4KA u7q6XlHCdEKU2glUytgdxsMIN0mZjsPQE430MvjwCFNraQ54sgpvlYzr96crAg+vOyb8AxaE25j UnsBCyCx8Mr67sploiBteJGEUXrc0ClXnbbdcsmfgT6w== X-Received: by 2002:adf:e884:0:b0:45d:817c:b8b2 with SMTP id ffacd0b85a97d-45d817cb8f7mr4986962f8f.30.1778760859579; Thu, 14 May 2026 05:14:19 -0700 (PDT) Received: from RTRKW671-LIN.domain.local ([77.243.27.125]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45d9e767cb9sm6285630f8f.2.2026.05.14.05.14.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 May 2026 05:14:19 -0700 (PDT) From: Milan Tripkovic To: Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: Alexandre Ghiti , Kees Cook , Andy Shevchenko , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, llvm@lists.linux.dev, Dusan Stojkovic , Milan Tripkovic Subject: [PATCH v2 1/2] riscv: lib: add memcmp() implementation Date: Thu, 14 May 2026 14:13:57 +0200 Message-ID: <20260514121359.931999-2-milant2002@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260514121359.931999-1-milant2002@gmail.com> References: <20260514121359.931999-1-milant2002@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260514_131422_021359_DA4249A1 X-CRM114-Status: GOOD ( 15.95 ) X-BeenThere: linux-riscv@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-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Milan Tripkovic Add an assembly implementation of memcmp() for RISC-V. The implementation uses the ZBB extension for word-at-a-time comparison and an assembly fallback for non-ZBB systems. Benchmark results (QEMU TCG, rv64, Aligned): Len | Default | NoZBB | ZBB | %NoZBB | %ZBB ------|---------|--------|--------|--------|------- 1 B | 20.3 | 25.0 | 20.9 | +23.2% | +3.0% 7 B | 88.9 | 107.5 | 155.7 | +20.9% | +75.1% 8 B | 89.6 | 110.9 | 176.2 | +23.8% | +96.7% 16 B | 134.4 | 172.4 | 334.8 | +28.3% | +149.1% 31 B | 163.5 | 220.5 | 606.2 | +34.9% | +270.8% 64 B | 203.8 | 235.9 | 968.6 | +15.8% | +375.3% 127 B | 224.6 | 268.7 | 1362.8 | +19.6% | +506.8% 512 B | 235.7 | 271.1 | 1913.7 | +15.0% | +711.9% 1024 B| 256.8 | 290.6 | 2123.6 | +13.2% | +726.9% 4096 B| 263.8 | 302.9 | 2290.4 | +14.8% | +768.2% Benchmark results (QEMU TCG, rv64, Unaligned - Offset 3): Len | Default | NoZBB | ZBB | %NoZBB | %ZBB ------|---------|--------|--------|--------|------- 1 B | 20.7 | 21.7 | 21.5 | +4.8% | +3.9% 7 B | 96.2 | 99.1 | 96.9 | +3.0% | +0.7% 8 B | 97.5 | 118.5 | 110.5 | +21.5% | +13.3% 16 B | 136.7 | 166.6 | 172.8 | +21.9% | +26.4% 31 B | 167.6 | 206.5 | 211.9 | +23.2% | +26.4% 64 B | 204.4 | 229.9 | 240.3 | +12.5% | +17.6% 127 B | 229.6 | 261.7 | 269.0 | +14.0% | +17.2% 512 B | 245.5 | 260.8 | 269.9 | +6.2% | +9.9% 1024 B| 246.9 | 261.2 | 283.5 | +5.8% | +14.8% 4096 B| 250.7 | 295.8 | 299.7 | +18.0% | +19.5% Signed-off-by: Milan Tripkovic --- arch/riscv/include/asm/string.h | 2 + arch/riscv/lib/Makefile | 1 + arch/riscv/lib/memcmp.S | 124 ++++++++++++++++++++++++++++++++ arch/riscv/purgatory/Makefile | 5 +- 4 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 arch/riscv/lib/memcmp.S diff --git a/arch/riscv/include/asm/string.h b/arch/riscv/include/asm/string.h index 764ffe8f6479..5c5299678c66 100644 --- a/arch/riscv/include/asm/string.h +++ b/arch/riscv/include/asm/string.h @@ -18,6 +18,8 @@ extern asmlinkage void *__memcpy(void *, const void *, size_t); #define __HAVE_ARCH_MEMMOVE extern asmlinkage void *memmove(void *, const void *, size_t); extern asmlinkage void *__memmove(void *, const void *, size_t); +#define __HAVE_ARCH_MEMCMP +extern asmlinkage int memcmp(const void *, const void *, size_t); #if !(defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)) #define __HAVE_ARCH_STRCMP diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile index 6f767b2a349d..b529e1be18b2 100644 --- a/arch/riscv/lib/Makefile +++ b/arch/riscv/lib/Makefile @@ -3,6 +3,7 @@ lib-y += delay.o lib-y += memcpy.o lib-y += memset.o lib-y += memmove.o +lib-y += memcmp.o ifeq ($(CONFIG_KASAN_GENERIC)$(CONFIG_KASAN_SW_TAGS),) lib-y += strcmp.o lib-y += strlen.o diff --git a/arch/riscv/lib/memcmp.S b/arch/riscv/lib/memcmp.S new file mode 100644 index 000000000000..f7d0eaa08880 --- /dev/null +++ b/arch/riscv/lib/memcmp.S @@ -0,0 +1,124 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include +#include +#include + +/* int memcmp(const void *cs, const void *ct, size_t n) */ +SYM_FUNC_START(memcmp) + + __ALTERNATIVE_CFG("nop", "j memcmp_zbb", 0, RISCV_ISA_EXT_ZBB, + IS_ENABLED(CONFIG_RISCV_ISA_ZBB) && IS_ENABLED(CONFIG_TOOLCHAIN_HAS_ZBB)) +/* + * Parameters + * a0 - Pointer to first memory block (cs), also return value + * a1 - Pointer to second memory block (ct) + * a2 - Number of bytes to compare (n), transformed to end pointer (a0 + n) + * + * Returns + * a0 - 0 if equal, positive if cs > ct, negative if cs < ct + * + * Clobbers + * t0, t1 + */ + beqz a2, 2f + add a2, a0, a2 +1: + lbu t0, 0(a0) + lbu t1, 0(a1) + bne t0, t1, 3f + addi a0, a0, 1 + addi a1, a1, 1 + bne a0, a2, 1b +2: + li a0, 0 + ret +3: + sub a0, t0, t1 + ret + + +memcmp_zbb: +.option push +.option arch,+zbb +/* + * Parameters + * a0 - Pointer to first memory block (cs), also return value + * a1 - Pointer to second memory block (ct) + * a2 - Number of bytes to compare (n), decremented during loop + * + * Returns + * a0 - 0 if equal, positive if cs > ct, negative if cs < ct + * + * Clobbers + * t0, t1, t2, t3, t4 + */ + add t3, a0, a2 + or t0, a0, a1 + andi t0, t0, (SZREG - 1) + bnez t0, 5f + + addi t4, t3, -SZREG + bltu t4, a0, 7f + +1: + REG_L t1, 0(a0) + REG_L t2, 0(a1) + bne t1, t2, 2f + addi a0, a0, SZREG + addi a1, a1, SZREG + bleu a0, t4, 1b + +7: + beq a0, t3, 4f + REG_L t1, 0(a0) + REG_L t2, 0(a1) + + sub t0, t3, a0 + li t4, SZREG + sub t0, t4, t0 + slli t0, t0, 3 + +#ifndef CONFIG_CPU_BIG_ENDIAN + rev8 t1, t1 + rev8 t2, t2 +#endif + srl t1, t1, t0 + srl t2, t2, t0 + + bne t1, t2, 8f + li a0, 0 + ret +5: + beq a0, t3, 4f +6: + lbu t1, 0(a0) + lbu t2, 0(a1) + bne t1, t2, 3f + addi a0, a0, 1 + addi a1, a1, 1 + bne a0, t3, 6b + +4: li a0, 0 + ret +2: +#ifndef CONFIG_CPU_BIG_ENDIAN + rev8 t1, t1 + rev8 t2, t2 +#endif +8: + sltu a0, t2, t1 + sltu t0, t1, t2 + sub a0, a0, t0 + ret + +3: + sub a0, t1, t2 + ret + +.option pop + +SYM_FUNC_END(memcmp) +SYM_FUNC_ALIAS(__pi_memcmp, memcmp) +EXPORT_SYMBOL(memcmp) diff --git a/arch/riscv/purgatory/Makefile b/arch/riscv/purgatory/Makefile index b0358a78f11a..456929971da7 100644 --- a/arch/riscv/purgatory/Makefile +++ b/arch/riscv/purgatory/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -purgatory-y := purgatory.o sha256.o entry.o string.o ctype.o memcpy.o memset.o +purgatory-y := purgatory.o sha256.o entry.o string.o ctype.o memcpy.o memset.o memcmp.o ifeq ($(CONFIG_KASAN_GENERIC)$(CONFIG_KASAN_SW_TAGS),) purgatory-y += strcmp.o strlen.o strncmp.o strnlen.o strchr.o strrchr.o endif @@ -41,6 +41,9 @@ $(obj)/strchr.o: $(srctree)/arch/riscv/lib/strchr.S FORCE $(obj)/strrchr.o: $(srctree)/arch/riscv/lib/strrchr.S FORCE $(call if_changed_rule,as_o_S) +$(obj)/memcmp.o: $(srctree)/arch/riscv/lib/memcmp.S FORCE + $(call if_changed_rule,as_o_S) + CFLAGS_sha256.o := -D__DISABLE_EXPORTS -D__NO_FORTIFY CFLAGS_string.o := -D__DISABLE_EXPORTS CFLAGS_ctype.o := -D__DISABLE_EXPORTS -- 2.43.0 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv