From nobody Mon May 25 05:12:12 2026 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (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 414033F39D8 for ; Mon, 18 May 2026 13:14:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779110086; cv=none; b=kCkmYYJuz3ShuXHfneaOfodg/mfgZTNyn78VsvnluGQhZSzgBUmre33wBcCojhgR1rOzExVanAxjgg6tbmi2h5iwPq6qMkzoGC/Y12lgwh9Dq206lCPgQ0ijXU3c6hwyrsQS5LDc69kvF1vPigh7Vt6vUAi7iTHpFJxzMfWbP5M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779110086; c=relaxed/simple; bh=/uNrr7I3e4CqMrlpCg2OIX0J6TcPN1mB4Ff0tS/sVg4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=APbsl+eK7yMTKXwSsusviDVL6TUSxX4T7SRgJbrcd3Xgx8ZxDZtAebmaaq+WjhaJQ1K3OlwPqzWixcZbYcyiJTnebM1F0TOcvq0k44LpzFpJVWGNEZNKhq2FuzLYiU1bcBJHSnOc6U2aMN14KpVSxHYNczfFxaZuTf3FeX3TV88= 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=hlHrO6mr; arc=none smtp.client-ip=209.85.221.45 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="hlHrO6mr" Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-4526a8170ceso942401f8f.2 for ; Mon, 18 May 2026 06:14:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779110084; x=1779714884; 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=xKdZwHICxAcumd/0vYmGg6f5JCYmSEbXy5dzzVwJhKM=; b=hlHrO6mrVmZm1D69ZL1vJ1ZQw069iZxt0e2wvtyFlg6x+maXQh0q8wpUJZ0UFIIZVq ufQ151C0uF6xXqZZEmG4SLYW2wVxBv/V91Xn+XTAeXuxHxaNBmj0Eco8k+C2QhV/BkDp Ik3+XxtnHN9xyXaPTZY12kXUjbPVKpY7N3+LxFEH2biiuO6lR4t2P4yd6qGKqA+3C2nX 8R8dUTqj5qbiEWNwPfiFxHGqBccIx6egIvZKlxSwwoXVNrbi95vfASE/ilbUDslWGA4a kl6HD90h2ZHMVY2m6jb7Cx8tv0DF5qZw4et/H6CbEh6MLRN4ybiGcOKkGgQjP5Iqiyju RR3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779110084; x=1779714884; 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=xKdZwHICxAcumd/0vYmGg6f5JCYmSEbXy5dzzVwJhKM=; b=jGQlIEY/Bm+FgaOH2qyqrgXIaup/5Uqiup2HgHf3j/EEMXfQQfEzytF47TL/nsnojy m+RJmEgGLh72m/ZIGN7qrkV+xH2TbexBe7oQqYbcqsxF4kfVsDRjw6aoYna/bALY0k6V M6R8bR8SyG7sDvVUZZ1MR+FjJMkumH046ntbclF/dPj0jKGNP3+RVFgw5xRCkxZkHzEz WhdQFXvNg2ZVy/rNja3xLpdzL+ioZX+9yyf8B91XxkjgQ+S8QqR0K6p3fKgdcU+62bOx ikk2nd9Fbvn/6PhPaFt64kySzKxCSFeMzGoNW7ZumeNTHdZqgfWwyiS6LWi0QWHp6j8z afCw== X-Forwarded-Encrypted: i=1; AFNElJ/DTOv63ltN/y0szRzqELSw8bzUanjatY6/W4fJ0jSIasMUhp/p/MJWqKlOpwTa1v4opi0pcAUGoBPaEXE=@vger.kernel.org X-Gm-Message-State: AOJu0YzBimnShOhEI1/S60Fur2EA2xZG1j69QJcgCzbzsKuKXQ2KYL9n /KXwrLxjwPhPd27Q6XHse65rjEHR/F+jabJ2Hx6m/1rNlQqfngqNUwyw X-Gm-Gg: Acq92OHsL+tfDA9RtHHqufUOBxPu8ldqSW4X26E355qJqj74QeZR3qQbUNspkXlYNx1 BMfg2EQgwvVKab0+PLlaYxM6Z3X+NsEhWkMu2vGBpiKtmOcRaDuAx+bv0j9gmbsAziUofx2KEO2 c5H7vTrABceHI7GQyBDhHEmWElhd2H8mZbjT2fM6G6fFrQelOxKVtsNKDHNwhpIFirpn7jA6kRa uCMBFien9XTQCkVagG83eWhCmwbk5sE3NOm/MALWLP7pPfEZWxaYj3bZcS0kmwTugNXxvXiF3VP JYE+2OAZ8e7gdlJCq5YMvQZ4yBqmHZ+WFp4AjzfnIQ01UCrElwVxZX+JU23BgyNKEPlqlj6KE2Q 7vnWvj1qMBqJbrrPoarP6+ziHbUoujG7vk3geI/9M4EboMxYQiCBL7B/APBlBbfeVl5OB19TlXA nulgcjd36dVxy1WeSbKsDn/UBrgdZjcjQds5zI0nfh X-Received: by 2002:a05:600c:8906:b0:48f:e3e7:3d39 with SMTP id 5b1f17b1804b1-48fe5fdd63fmr179436245e9.11.1779110083569; Mon, 18 May 2026 06:14:43 -0700 (PDT) Received: from RTRKW671-LIN.domain.local ([95.86.49.225]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48fffb9aac4sm249619265e9.9.2026.05.18.06.14.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 May 2026 06:14:43 -0700 (PDT) From: Milan Tripkovic To: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Cc: pjw@kernel.org, palmer@dabbelt.com, aou@eecs.berkeley.edu, alex@ghiti.fr, kees@kernel.org, andy@kernel.org, linux-hardening@vger.kernel.org, Dusan.Stojkovic@rt-rk.com, Milan Tripkovic Subject: [PATCH v4 1/2] riscv: lib: add memcmp() implementation Date: Mon, 18 May 2026 15:14:06 +0200 Message-ID: <20260518131407.1026049-2-milant2002@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260518131407.1026049-1-milant2002@gmail.com> References: <20260518131407.1026049-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 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 | 125 ++++++++++++++++++++++++++++++++ arch/riscv/purgatory/Makefile | 5 +- 4 files changed, 132 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..a531e481c --- /dev/null +++ b/arch/riscv/lib/memcmp.S @@ -0,0 +1,125 @@ +/* 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 + +#if defined(CONFIG_RISCV_ISA_ZBB) && defined(CONFIG_TOOLCHAIN_HAS_ZBB) +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 +#endif +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 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 05:12:12 2026 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (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 3675648034B for ; Mon, 18 May 2026 13:14:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779110088; cv=none; b=K63F1yvjtT2eOcr6Fe3QPckq22sc3x7vrBIRkvi0shpvsQF1agPNrfoyhLJrCWi0vNlyl7kvvQfTbpV7uL3HjSRZaGQhMPUCbzDF8x3NEKgD5DHEB7wANdBRt1mdqh5sknIvlRlIvNR/RKlayN/1Xd/zMgn3KVWWwigJLPLj8Wo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779110088; c=relaxed/simple; bh=sW9PBi/UOltWN1DR57pORdbD5ITJ09pEbZk5A99xqLU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RLM6ywBD0JQ8v2z18QYQPRUd8BleuH7Qxb10+lvxLl96swGFBum1gx0HA/qQBsaZaCYRK7CcjEOJc/HGaSdUs8U0fQ2o6JbAh8cnywcU0ZY/OGkhInGKqhoz6w3x5+rDNf3JrkTlAdXIP2yo1Kk8ZMEWRLIAxsvu9teIQVKHunQ= 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=Q1sI0gLh; arc=none smtp.client-ip=209.85.128.52 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="Q1sI0gLh" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-488af9fdaa7so10194625e9.1 for ; Mon, 18 May 2026 06:14:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779110086; x=1779714886; 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=dNKDREEZdQovW0REhCmZGfTK1N5DJlg6DXHt9BuUT0Y=; b=Q1sI0gLhy99jZS8YjWJ4xqfckhP7l6dIgSLNnWJrYwphbwYMVdBlyJM1Nf2ljxQ8IP 9/Y2ILPZhMV+FXUaqRwZrmxpeNAI1q3FDVdXBqkKjHp4TYsMOzTyrKEsAGNg0qdziiC3 3YZr+wMPmqcQyU4Lc4JHTOPcEC9A8tTD0+q+KieabD1PzoZ+SoX0tL56GyX3HNOP10aQ Qqn5rI7AzMUt3lmw1T0jBQifJn/l+Oh2d8tHVQY3E6vaj0jNki1g4kHUdC3XFT2uqJ3K dv9HeVAcZviOT2ruQ4aLG3QH5Md0Qcqc5jpTcIDdEoJ/CJ34d+F8MjD8/3mmGE/twuAd SewA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779110086; x=1779714886; 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=dNKDREEZdQovW0REhCmZGfTK1N5DJlg6DXHt9BuUT0Y=; b=XQ3Fv45r3lF8/e2z+Smj6uG8ss5uwVMQEY3GakUkIShKjY+pE6aa0gHkTkx7aZmTtJ 59t2pIDvxfGYtEJmo/oajSowNjhNsbpKcBHDt+4eemn+BBqdrrvINQQ0cy0q8JEZ/hUz sxD6qsDRZs1ejhuiMw0wao49JeSO/4IbO6S4x70gcR9I/N8LH46aPP4ZCfyJy/qUhcHW DX0TBFVFANZas4LMHn1zGOkxOhSpXLW929qB3T1IokPlgOk5Od/b4T0c4UKWuKN1qm5y bdqie/HG7i4YP1FZPA7lsMcNccy/BK8SGinT85UDz7psNEV1va5VaJsxQuFp3JWueROC YEVg== X-Forwarded-Encrypted: i=1; AFNElJ+V1lfxOWtZFWWDa3tFHkcEU7h7+O5T5DitQJdBh+yhWTaDxRCsF34O1/nBeblp9g+xtXdhOrk28xhua0Y=@vger.kernel.org X-Gm-Message-State: AOJu0YwCxWkDrmbLXCEz6zRzydbsoYb4W0RMCOz0aodTktuNIPzIiOBG QytspB+QQCaR2X5Ff61qNFiIVk0iDruoI39LLSB7flyDlNoeZhEAimeN X-Gm-Gg: Acq92OGNmXCmfHDKaZajI0+PITn/On1hDxa1SstzH75cd4yu+SpLVth8cShCAvpIdga GRQ4rCdMaqGp+mf6XvYrZmer2LZFY0eMGj3m19+V4zaMC9eEhMipppQUMCUjryRz1DPkhB8iB+4 cpC/XtkwgyjAiOGjZ2cV0Drhs1/6WrYP54BmL4pY+ujJ5atPn/tRcQTx3YH+W1p0GpgGLfRalPb esHwdYh8SeA2Cffl3YmmgBOpxUppXfY5KddQYuf3LmbeTgqKD4QPYf5wy8a05Gij9Zy106o0I71 06hfevML7m4cBfeqPbcIY3fkQzLYHPphjK8ZT17RjdOurE/kZvX6kla5J84jnS5Vn8M+UahysIR sS/9l6r2pyMClZvGUQggZGAvSadldkN+tVwE8W6GMo91NLiC8pF4dxwquNCgG5EdA89KthEv1dj nWcCYHd+QzOpcouZNGNEIOR9xRque/WdzRlztOl5Ii X-Received: by 2002:a05:600c:3e1b:b0:486:fd5c:2b35 with SMTP id 5b1f17b1804b1-48fe60eccc3mr223047365e9.13.1779110085224; Mon, 18 May 2026 06:14:45 -0700 (PDT) Received: from RTRKW671-LIN.domain.local ([95.86.49.225]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48fffb9aac4sm249619265e9.9.2026.05.18.06.14.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 May 2026 06:14:44 -0700 (PDT) From: Milan Tripkovic To: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Cc: pjw@kernel.org, palmer@dabbelt.com, aou@eecs.berkeley.edu, alex@ghiti.fr, kees@kernel.org, andy@kernel.org, linux-hardening@vger.kernel.org, Dusan.Stojkovic@rt-rk.com, Milan Tripkovic Subject: [PATCH v4 2/2] lib/string_kunit: extend benchmarks and unit test to memcmp() Date: Mon, 18 May 2026 15:14:07 +0200 Message-ID: <20260518131407.1026049-3-milant2002@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260518131407.1026049-1-milant2002@gmail.com> References: <20260518131407.1026049-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 --- lib/tests/string_kunit.c | 120 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/lib/tests/string_kunit.c b/lib/tests/string_kunit.c index 0819ace5b..48b1fd068 100644 --- a/lib/tests/string_kunit.c +++ b/lib/tests/string_kunit.c @@ -881,6 +881,124 @@ 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 w, o, i; + unsigned int off; + u64 len; + char *p1; + char *p2; + u64 iterations; + u64 elapsed; + u64 ns_per_call; + u64 mbps; + u64 j; + + 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 (w =3D 0; w < 100000U; w++) + (void)memcmp(buf1, buf2, 4096); + + 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]; + p1 =3D buf1; + p2 =3D buf2 + off; + iterations =3D (len < 512) ? 100000ULL : 10000ULL; + + for (j =3D 0; j < iterations; j++) { + (void)memcmp(p1, p2, len); + barrier(); + } + + elapsed =3D STRING_BENCH(iterations, memcmp, p1, p2, 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 +1028,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