From nobody Mon May 25 00:56:12 2026 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D94A83DD518 for ; Wed, 20 May 2026 12:40:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779280809; cv=none; b=d3x2G2nXIt/44hxdRmrNY4Azm/HOVvEAi5Cv9bV0NX19bSOXsIACR2LPHySmBQyCTla1PDN8Jdqq8K+WfHsoYN7yjc0+pWHPSsy0NdZxpkCJs6mPNdNLYzvfSk4/bjrttsOBHK4rYsXQJwPlBan3XcUfrAAzAXJ8Ko0d6rgizVc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779280809; c=relaxed/simple; bh=K7L6/XB0yyn6ybRoO/c5hHdoNUlLw642jyc1eKLVk90=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KmbxxxUNtGH3DJDrJOYnJS0LsQKRnOtkvnW9fzJF/Yb37+wUNyc14ByNjup8RxUXUlBM0fRCMDsZ1UVbzma4EgIve+Pz6MAUW+zWQ6awy8anMuVFZcnOB1j3NGP9frOirlvQTrwRshZKzRP/ioQ48jK9QThECKQ7+pkYzy0j5/8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=rgCk/1FQ; arc=none smtp.client-ip=209.85.221.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="rgCk/1FQ" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-44ccbd3290aso4516059f8f.2 for ; Wed, 20 May 2026 05:40:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779280805; x=1779885605; darn=vger.kernel.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=0vz7ySB1n7hiRbxQUx3+c5jByhWmQvmCG7QHugS1JFY=; b=rgCk/1FQk8j0wXw/14HfpslWx0wgaY1M27wQ671n1g0XxOk4E+poy69mgX2kO2X3Zh mAi6qHVyXyGEiav9Rv9jH2bJvPdbyyanGhb76Wd+zLivn4jQQgbix74cNGcupOZJ1/eI aoVc76rAHwzn/odiaTUfYVvDXALC226zHt78RRwDfLjDOhE5PTCLDcp8Xsrsq1Q0/aae 1e8ERrNr7YN6ozDddyOcg+F3+GiR25zaVZX6YYIAFXZCGm4VmXBOtIcmano+mM72YE7L b9vOtSJ8EIkfM7lUyWslFsoYDRlPktDQhcU6ecxec/u1a0WDmXRZ0nQgES/puCxAEOWe 0zpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779280805; x=1779885605; 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=0vz7ySB1n7hiRbxQUx3+c5jByhWmQvmCG7QHugS1JFY=; b=XDbOO97ZdqfszKZBp1f/Bop9Y7s9n5CaoLKZl7jkgI6j2dNAS3I20EV4eyYfci5MT3 PfGvI1KWZIW5C7Shzj/9SB0x5sP/xNYHeX/NjY+AfAJxWPRhOooJPuq+iIiiMLt3SlJt pJiSHPhWIOf4z7oKJ07lyu3h1qIBqTQMtJzPagRAEAHPS56Twrvu6DHyG4LQ2tsxluq4 R0uGBMO5Gl/k/5M6hRLQ3R1khpANQzyvMc3krqzKr+46Ty1hmzamjH/EaPyjLuSvdwbS o+i/tCYrhuUK3arqs03O2kDMtnKUFKn9bhZcfFwyI6WVWCK8JwGlYvDlEK4e9xYNq2te m1sg== X-Forwarded-Encrypted: i=1; AFNElJ9GATL00Z0/tUyz41r5WOuNByRtJHagwT9azkAyiSFX914C7dCzlVeBv7CW2t0job7KbcoVV0SjE5uBgWI=@vger.kernel.org X-Gm-Message-State: AOJu0Yy2H81Rj70QWX6xxMnUmVwCMGP5Cah4m2ySe/lrjLh4T+UCCe+a hel6kQkD7s4sQ/Rkc97t1MxHri/KLhHjAFGVU2Gh7xZXRAejwO6bgMlv X-Gm-Gg: Acq92OEj7ZM8BrD6Q7wEff1ryh4HkMsZB48YoJ2q9Y1OXserPlwgB1TnhNSctW/l6/V xJEF3vnsuqHHgc5rb4gOxLv3nGhn8qbFjqAO+NWZ+DST9Vuq+KPEt9l+PTElFnfr6MnVsxeRc3X 6yCQYIEezTgcbscXZgvZwhjiBnp4PcqvhQXs4Fa4KPTebz/hoo48O1Lpk2juTYENfg5w44OdLpm crm1hg8m28uAC0tBRwEUg4rSfvd43EkSVKsCAnZB2ciXYnR+hYH8mQUUT97QhgomRgBc5Jeko8+ d0sECzl+wV0OoqWOiuCCVjalzGf9Tvh6dPTcXFPERunOC2O0M6vap7OZUE+HLUY2uPo1IQzprMg iitOAJDV9EcCKOY0dlpmXtf6II4JteN9qIDDIUqleGisfsJB0zmD82Es6XxqdwhA6geMqPSblFY TtrRLqoTJ+H0MBropKPosgBhNKjlYefqBl+RJZuNEsSQ== X-Received: by 2002:a05:6000:1a8e:b0:43e:a70d:7622 with SMTP id ffacd0b85a97d-45e5c58d96amr36524506f8f.22.1779280804903; Wed, 20 May 2026 05:40:04 -0700 (PDT) Received: from RTRKW671-LIN.domain.local ([89.216.37.146]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45d9ec3acf7sm54460252f8f.12.2026.05.20.05.40.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 05:40:04 -0700 (PDT) From: Milan Tripkovic To: pjw@kernel.org, palmer@dabbelt.com, aou@eecs.berkeley.edu, kees@kernel.org Cc: alex@ghiti.fr, andy@kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Dusan.Stojkovic@rt-rk.com, Milan Tripkovic Subject: [PATCH v6 1/2] riscv: lib: add memcmp() implementation Date: Wed, 20 May 2026 14:39:53 +0200 Message-ID: <20260520123954.379630-2-milant2002@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260520123954.379630-1-milant2002@gmail.com> References: <20260520123954.379630-1-milant2002@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Milan Tripkovic Add an assembly implementation of memcmp() for RISC-V. The implementation uses word-aligned loads for the generic path and the ZBB extension for optimized sign resolution, with an assembly fallback for non-ZBB systems. Benchmark results (QEMU TCG, rv64): Len | Default |NoALIGN | ALIGN | %NoALIGN | %ALIGN ------|---------|--------|--------|----------|-------- 1 B | 20.3 | 21.5 | 20.9 | +5.9% | +3.0% 7 B | 88.9 | 96.9 | 155.7 | +9.0% | +75.1% 8 B | 89.6 | 110.5 | 176.2 | +23.3% | +96.7% 16 B | 134.4 | 172.8 | 334.8 | +28.6% | +149.1% 31 B | 163.5 | 211.9 | 606.2 | +29.6% | +270.8% 64 B | 203.8 | 240.3 | 968.6 | +17.9% | +375.3% 127 B | 224.6 | 269.0 | 1362.8 | +19.8% | +506.8% 512 B | 235.7 | 269.9 | 1913.7 | +14.5% | +711.9% 1024 B| 256.8 | 283.5 | 2123.6 | +10.4% | +726.9% 4096 B| 263.8 | 299.7 | 2290.4 | +13.6% | +768.2% Signed-off-by: Milan Tripkovic --- v6 changes: - Fixed build errors kernel test robot noticed.=20 - Link to v5: https://lore.kernel.org/all/20260519140029.1190381-1-mila= nt2002@gmail.com/ =20 v5 changes: - Optimized generic memcmp path with word-aligned loads. - Implemented non-ZBB fallback to byte comparison per review. - Link to v4: https://lore.kernel.org/all/20260518131407.1026049-2-mila= nt2002@gmail.com/ v2 changes: - Added alignment checks for buffers to avoid expensive misaligned load= s. - Optimized the loop using end-pointers to reduce per-iteration overhea= d. - Implemented word-aligned tail handling using ZBB shifts. - Removed redundant pointer equality (a0 =3D=3D a1) check. - Retained BE support via #ifndef; ZBB rev8 is used for the LE fast-pat= h. - Link to v1: https://lore.kernel.org/all/20260512141007.1193033-1-mila= nt2002@gmail.com/ arch/riscv/include/asm/string.h | 2 + arch/riscv/lib/Makefile | 1 + arch/riscv/lib/memcmp.S | 107 ++++++++++++++++++++++++++++++++ arch/riscv/purgatory/Makefile | 5 +- 4 files changed, 114 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/strin= g.h index 764ffe8f6..5c5299678 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 *, si= ze_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); =20 #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 6f767b2a3..b529e1be1 100644 --- a/arch/riscv/lib/Makefile +++ b/arch/riscv/lib/Makefile @@ -3,6 +3,7 @@ lib-y +=3D delay.o lib-y +=3D memcpy.o lib-y +=3D memset.o lib-y +=3D memmove.o +lib-y +=3D memcmp.o ifeq ($(CONFIG_KASAN_GENERIC)$(CONFIG_KASAN_SW_TAGS),) lib-y +=3D strcmp.o lib-y +=3D strlen.o diff --git a/arch/riscv/lib/memcmp.S b/arch/riscv/lib/memcmp.S new file mode 100644 index 000000000..bdb92941d --- /dev/null +++ b/arch/riscv/lib/memcmp.S @@ -0,0 +1,107 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include +#include +#include + +#if defined(CONFIG_RISCV_ISA_ZBB) && defined(CONFIG_TOOLCHAIN_HAS_ZBB) +.option push +.option arch,+zbb +#endif + +/* int memcmp(const void *cs, const void *ct, size_t n) */ +SYM_FUNC_START(memcmp) +/* + * 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: +#if defined(CONFIG_RISCV_ISA_ZBB) && defined(CONFIG_TOOLCHAIN_HAS_ZBB) + __ALTERNATIVE_CFG("j 5f", "nop", 0, RISCV_ISA_EXT_ZBB, + IS_ENABLED(CONFIG_RISCV_ISA_ZBB)) + + 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 +#else + j 5f +#endif +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: +#if !defined(CONFIG_CPU_BIG_ENDIAN) && \ + defined(CONFIG_TOOLCHAIN_HAS_ZBB) && defined(CONFIG_RISCV_ISA_ZBB) + __ALTERNATIVE_CFG("j 5b", "nop", 0, RISCV_ISA_EXT_ZBB, IS_ENABLED(CONFIG_= RISCV_ISA_ZBB)) + rev8 t1, t1 + rev8 t2, t2 +#elif !defined(CONFIG_CPU_BIG_ENDIAN) + j 5b +#endif +8: + sltu a0, t2, t1 + sltu t0, t1, t2 + sub a0, a0, t0 + ret + +3: + sub a0, t1, t2 + ret + +SYM_FUNC_END(memcmp) +SYM_FUNC_ALIAS(__pi_memcmp, memcmp) +EXPORT_SYMBOL(memcmp) + +#if defined(CONFIG_RISCV_ISA_ZBB) && defined(CONFIG_TOOLCHAIN_HAS_ZBB) +.option pop +#endif diff --git a/arch/riscv/purgatory/Makefile b/arch/riscv/purgatory/Makefile index b0358a78f..456929971 100644 --- a/arch/riscv/purgatory/Makefile +++ b/arch/riscv/purgatory/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 =20 -purgatory-y :=3D purgatory.o sha256.o entry.o string.o ctype.o memcpy.o me= mset.o +purgatory-y :=3D purgatory.o sha256.o entry.o string.o ctype.o memcpy.o me= mset.o memcmp.o ifeq ($(CONFIG_KASAN_GENERIC)$(CONFIG_KASAN_SW_TAGS),) purgatory-y +=3D 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) =20 +$(obj)/memcmp.o: $(srctree)/arch/riscv/lib/memcmp.S FORCE + $(call if_changed_rule,as_o_S) + CFLAGS_sha256.o :=3D -D__DISABLE_EXPORTS -D__NO_FORTIFY CFLAGS_string.o :=3D -D__DISABLE_EXPORTS CFLAGS_ctype.o :=3D -D__DISABLE_EXPORTS --=20 2.43.0 From nobody Mon May 25 00:56:12 2026 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0550B3DF00F for ; Wed, 20 May 2026 12:40:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779280809; cv=none; b=ki07nTnqik8enJ1hWBM5W2KtzSVP2nWwDQNMpwm+pBVXUQ7G/F3s268hrP+4zlctkawQqdVEEV83PCUeiLKD93PF/fiMoOh4i+HBToG5cJ678JhWfv3DTlYPib6kB4FvDttOC3DtQiw+VoGIpmirIpNy2VXsJn/ajRi9uODKZ6o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779280809; c=relaxed/simple; bh=riO1ZNMnJ54rVBK8RID6oN0pWaUmns533VE2TlxnP8Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ndIp/92M9+gCLrG0d5M1oXHRDdu5aTFaJGqlmlalcT/xIZuryKmKivdZNNTQX6bpO3lU3ZsYo7bF5YbqSy/7vbNwALeoh/wSf4uBGNfReQ2CF83cX2N56YTUa4cccUOAeFRsIK2iGvgk3waU7vq8aV4Mramg2xWcdCm6oAxkGH8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=XlWI1n9f; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XlWI1n9f" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-488b0046078so42817695e9.1 for ; Wed, 20 May 2026 05:40:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779280806; x=1779885606; darn=vger.kernel.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=ZF9TELI0fOJNnQQ0E3LX4ebM27p0Qx0XyBTx0DYfCok=; b=XlWI1n9fatfZ3M0GiBap5c0WoV8VQsjet5Hb0ozB6cMB7oE2HrlB/q0XDi29KtUc3t QBnoajYpvcCGw4OTTKwECLBRFIikmNtMGEhBbXjjCW1RHUXu5NzRKI65a3Plzw5MaxCy VtLoXg5ORiYT0rm7byYx6E1vIM5/M1zSnm40ff5CV2lrsFcmx2r2p8Q/oi+oKXlJjMos XJH7wRE6KGBC5AoQQ9oofRS+5zpFySwSXi9farG9Rv7iImIZZJyAwfxgTzrlCOKxnspT 8IYpWKJCHfLZv1/M3E/w+uJoXfdorjKrKS53JSa40aj3Lwvm3dlWiqtoj4lT/eZcNZS/ zddA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779280806; x=1779885606; 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=ZF9TELI0fOJNnQQ0E3LX4ebM27p0Qx0XyBTx0DYfCok=; b=U2aM5uCKjo5C37jnvXWQh6EPDNY678gx0GIg4gOY2mJKwbZk8NY5HTcT8oqLFyBeQl gSPGFhV/lw+xMn8jfgj+YQH9e/5XKL+2M3LHK54DTD+QokHhm61ZoGKNIIfEH0eTjgPp 1R7dp9dAkmkblQBYU7+U/2mBn0u8Fg/2XHHL5tKCPMIE9iBsNU3FQWQUyfgFsQ40Z33N MXMeOsjGrVQQ8xGJWRyIILplYufZAnX5cgp74xbhj9fi0MnrxmtZma9HlUPlbjPoL1uc cWIBDxqgdQaXCyom8PTTqNN627jU5uWMDRSFxfvr87o/0ZiKtYbS5SPcFC4vhYPPkGiH Vf2Q== X-Forwarded-Encrypted: i=1; AFNElJ9LPMAZFKo25bKpSjgbwDGFIUQ+4SsOW+XaOwZ1tvLz+IXXWYFiBHAez9wgR6+zh8t1f439DNUg0xf6ptg=@vger.kernel.org X-Gm-Message-State: AOJu0YzAXvsVXtVqKYR/bd0rS0G7z4WsaEO9xZufNArSNVzE0r+TVFwY U8mdjo35BVgj/hP2j4pSxMFxvvZ08TicW8wrANAc3HLgkEnoEucm+G8u X-Gm-Gg: Acq92OFBNVTqBsOEHeVo9akamItbxf8ZkhJ/rh3skHR3PD+R26+ndIOq1MlOyNwoS9w Nhea/kOMGCtV8fw3h0aGMZo2avoMeeEVr48TY2ddG5dowZ9NQmjQgUPKJcppaV76DTRMrSWnA/e bX9MI7DUYR99yYR6NMi6L50M7T5KACgEFA7zFhbI+o7kWkgfSV3eFTcaMn0TSWzCI3n3EFB4Jy6 WLsdnrYv/4U7IhWdGxg3KEX4xP54SGjU6vGqeQ9atbZZTwu6zrmO7jATAVZIgU2goFlQ5FRxFII DFE3YuRMvlrG0FIT+z9AKqzgxOdSVzVZ1zoEwc/E173U4kNJcZyKLtc8NU/3qtq8bPwXGvzs7A3 1N7vqBWAEhvTWO7JsFfr9TuQwqgijD8zeU9YpVbtInTrtRbCD9IAea8WXzNH9+NhI3rNK20HYXs /llb+peTVmP4e01THZtn/4b2Ut+tIydzbyIPkkKoUQqNoj8Apldxx/ X-Received: by 2002:a05:6000:4007:b0:456:ba09:3e64 with SMTP id ffacd0b85a97d-45e5c5b3669mr37757602f8f.1.1779280806221; Wed, 20 May 2026 05:40:06 -0700 (PDT) Received: from RTRKW671-LIN.domain.local ([89.216.37.146]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45d9ec3acf7sm54460252f8f.12.2026.05.20.05.40.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 05:40:05 -0700 (PDT) From: Milan Tripkovic To: pjw@kernel.org, palmer@dabbelt.com, aou@eecs.berkeley.edu, kees@kernel.org Cc: alex@ghiti.fr, andy@kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Dusan.Stojkovic@rt-rk.com, Milan Tripkovic Subject: [PATCH v6 2/2] lib/string_kunit: extend benchmarks and unit test to memcmp() Date: Wed, 20 May 2026 14:39:54 +0200 Message-ID: <20260520123954.379630-3-milant2002@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260520123954.379630-1-milant2002@gmail.com> References: <20260520123954.379630-1-milant2002@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Milan Tripkovic Extend the string benchmarking suite to include memcmp(). Extend the string unit test to include memcmp(). Signed-off-by: Milan Tripkovic --- v6 changes: - Fixed build errors kernel test robot noticed.=20 - Link to v5: https://lore.kernel.org/all/20260519140029.1190381-1-mila= nt2002@gmail.com/ =20 v5 changes: - Removed redundant warm-up from test case - Link to v4: https://lore.kernel.org/all/20260518131407.1026049-2-mila= nt2002@gmail.com/ v4 changes: - Fixed build error: call to undeclared function 'STRING_BENCH' - Link to v3: https://lore.kernel.org/all/20260515141019.1234037-1-mila= nt2002@gmail.com/ v3 changes: - Split memcmp benchmark into wrapper (string_bench_memcmp) and worker function (do_string_bench_memcmp). - Removed all C99 mixed declarations; moved all variable declarations to the top of each function. - Converted len, iterations and loop counters in the benchmark to u64 to avoid implicit casts. - Cleaned up spacing, indentation and minor style issues. - Added #if defined(CONFIG_RISCV_ISA_ZBB)... in memcmp.S - Link to v2: https://lore.kernel.org/all/20260514121359.931999-1-milan= t2002@gmail.com/ v2 changes: - Fixed KUnit build failures for Clang and non-benchmark configs. - Link to v1: https://lore.kernel.org/all/20260512141007.1193033-1-mila= nt2002@gmail.com/ =20 lib/tests/string_kunit.c | 106 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/lib/tests/string_kunit.c b/lib/tests/string_kunit.c index 0819ace5b..d395627f7 100644 --- a/lib/tests/string_kunit.c +++ b/lib/tests/string_kunit.c @@ -881,6 +881,110 @@ static void string_bench_strrchr(struct kunit *test) STRING_BENCH_BUF(test, buf, len, strrchr, buf, '\0'); } =20 +static void string_test_memcmp(struct kunit *test) +{ + const unsigned int max_offset =3D 16; + const unsigned int max_len =3D 32; + const unsigned int buf_size =3D max_offset + max_len + 32; + u8 *buf1, *buf2; + unsigned int i, j, len, k; + int res; + + buf1 =3D kunit_kzalloc(test, buf_size, GFP_KERNEL); + buf2 =3D kunit_kzalloc(test, buf_size, GFP_KERNEL); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, buf1); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, buf2); + + for (i =3D 0; i < max_offset; i++) { + for (j =3D 0; j < max_offset; j++) { + for (len =3D 0; len <=3D max_len; len++) { + memset(buf1, 'A', buf_size); + memset(buf2, 'A', buf_size); + KUNIT_EXPECT_EQ_MSG(test, memcmp(buf1 + i, buf2 + j, len), 0, + "Should be equal: i:%u j:%u len:%u", i, j, len); + for (k =3D 0; k < len; k++) { + memset(buf1, 'A', buf_size); + memset(buf2, 'A', buf_size); + buf2[j + k] =3D 'B'; + res =3D memcmp(buf1 + i, buf2 + j, len); + KUNIT_EXPECT_NE_MSG(test, res, 0, + "Should detect difference at k:%u (i:%u j:%u len:%u)", + k, i, j, len); + if (buf1[i + k] < buf2[j + k]) + KUNIT_EXPECT_LT(test, res, 0); + else + KUNIT_EXPECT_GT(test, res, 0); + } + } + } + } +} + +#ifndef STRING_BENCH +#define STRING_BENCH(...) 0 +#endif + +static void do_string_bench_memcmp(struct kunit *test) +{ + char *buf1 =3D NULL; + char *buf2 =3D NULL; + const u64 lengths[] =3D { 1, 7, 8, 16, 32, 64, 128, 512, 1024, 4096}; + const int offsets[] =3D { 0, 1, 3, 7}; + const u64 max_len =3D 4096 + 64; + unsigned int o, i; + unsigned int off; + u64 len; + u64 iterations; + u64 elapsed; + u64 ns_per_call; + u64 mbps; + + buf1 =3D vmalloc(max_len); + buf2 =3D vmalloc(max_len); + + if (!buf1 || !buf2) { + vfree(buf1); + vfree(buf2); + kunit_err(test, "vmalloc failed\n"); + return; + } + + memset(buf1, 'A', max_len); + memset(buf2, 'A', max_len); + + for (o =3D 0; o < ARRAY_SIZE(offsets); o++) { + off =3D offsets[o]; + + for (i =3D 0; i < ARRAY_SIZE(lengths); i++) { + len =3D lengths[i]; + iterations =3D (len < 512) ? 100000ULL : 10000ULL; + elapsed =3D STRING_BENCH(iterations, memcmp, buf1, buf2 + off, len); + ns_per_call =3D div_u64(elapsed, iterations); + mbps =3D len ? div_u64(iterations * len * (NSEC_PER_SEC / MEGA), elapse= d) : 0; + + if (off =3D=3D 0) { + kunit_info(test, "bench_memcmp_aligned: len=3D%-4llu: %llu MB/s (%llu = ns/call)\n", + len, mbps, ns_per_call); + } else { + kunit_info(test, "bench_memcmp_unaligned(off=3D%u): len=3D%-4llu: %llu= MB/s (%llu ns/call)\n", + off, len, mbps, ns_per_call); + } + } + } + + vfree(buf1); + vfree(buf2); +} + +static void string_bench_memcmp(struct kunit *test) +{ + if (!IS_ENABLED(CONFIG_STRING_KUNIT_BENCH)) { + kunit_skip(test, "CONFIG_STRING_KUNIT_BENCH not enabled"); + return; + } + do_string_bench_memcmp(test); +} + static struct kunit_case string_test_cases[] =3D { KUNIT_CASE(string_test_memset16), KUNIT_CASE(string_test_memset32), @@ -910,6 +1014,8 @@ static struct kunit_case string_test_cases[] =3D { KUNIT_CASE(string_bench_strnlen), KUNIT_CASE(string_bench_strchr), KUNIT_CASE(string_bench_strrchr), + KUNIT_CASE(string_test_memcmp), + KUNIT_CASE_SLOW(string_bench_memcmp), {} }; =20 --=20 2.43.0