From patchwork Sat May 28 08:12:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yu-Jen Chang X-Patchwork-Id: 12863952 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5AAE8C433F5 for ; Sat, 28 May 2022 08:14:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231454AbiE1IOE (ORCPT ); Sat, 28 May 2022 04:14:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231189AbiE1IOC (ORCPT ); Sat, 28 May 2022 04:14:02 -0400 Received: from mail-pg1-x52d.google.com (mail-pg1-x52d.google.com [IPv6:2607:f8b0:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7388B9E; Sat, 28 May 2022 01:14:01 -0700 (PDT) Received: by mail-pg1-x52d.google.com with SMTP id g184so5847641pgc.1; Sat, 28 May 2022 01:14:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=361V99T0mQNSQZyHOPdAMCdjPFEyiJTvNkUeBgEbOug=; b=UKRaDeHeiRxhtIJZR+xleOoJVibDLSIhzWwg85RhvXjxUCq3Dw9NqgNY17soShlrq1 37pKHOx7zfTKsRVTQ9RfM1xxlCQiZhZdJ5jeWx/C2GPYlwQ1XePN0+7UKorCPBrQRSYE rsK7fjeIbYoys6MnHUZlrZ4G9fjlUQNur81OQXwz16c7xVThvjBZFskft1zWJCLU9xiU 2HY7X/uebsVkYT9SSIxvybtQsuPAOtmzXv6GnfqBifUgIqyShygFw8ZbCrginsUwY9yY DO/XV/zI9XBSIdk9MSKtZvHScABNEsuoq4lPJ+vLXK1IDwnW8mKh4qpcnqWTijxmyXre 6CNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=361V99T0mQNSQZyHOPdAMCdjPFEyiJTvNkUeBgEbOug=; b=VoutrjFjWJ5vmR3CNc5q6JFXOeDJfNMtlD3OL2iw3WBYCHgVOIuxlTZgHCW0xAMoX1 Nx7d3V99EC2UIkJ5t6DQFOxD/M3vYS9kHV5eufUq1sy/95cVCeY8zR/Gk9D93p/Bs0vk j61bp3BUzvvDTaYoHz/rB4YJh/txION8/xnwpYHvHCWxRfFKHV17rS0kfi1L8MY1Hv9R 88H/wkxO1QJ/jV3U1K28FUis0lS28aTO4Su3C8yP13N2jiCyTU6bFIk0Cd0SLSBwMcSW OFVYbI9tP7ScoRroYLke+q3SHdwH4h7480T9q3BA070NdGNBMLOe25TAsRRcawsEU4CV M+Gw== X-Gm-Message-State: AOAM5333rw/HYpqg44usQZnb2p29RbOxHAh1tDD51zbflkp3qhb2zpE7 vc2Safm+wF4VcknkKzJoh6c= X-Google-Smtp-Source: ABdhPJwu9nZQ0cl6DnaMRtKysOnJ+Z6A96NJ6rjSYH02icOQdn3Ohk4+EIOv67lyKxlqXtQpOg5qsQ== X-Received: by 2002:a65:6a47:0:b0:3f5:d7a8:44ee with SMTP id o7-20020a656a47000000b003f5d7a844eemr40352490pgu.330.1653725641154; Sat, 28 May 2022 01:14:01 -0700 (PDT) Received: from localhost.localdomain ([140.116.104.153]) by smtp.gmail.com with ESMTPSA id i12-20020a17090ad34c00b001e0c5da6a51sm2774347pjx.50.2022.05.28.01.13.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 May 2022 01:14:00 -0700 (PDT) From: Yu-Jen Chang To: ak@linux.intel.com, jdike@linux.intel.com Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, keescook@chromium.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, richard@nod.at, anton.ivanov@cambridgegreys.com, johannes@sipsolutions.net, linux-um@lists.infradead.org, jserv@ccns.ncku.edu.tw, Yu-Jen Chang Subject: [PATCH 1/2] x86/lib: Optimize memchr() Date: Sat, 28 May 2022 16:12:35 +0800 Message-Id: <20220528081236.3020-2-arthurchang09@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220528081236.3020-1-arthurchang09@gmail.com> References: <20220528081236.3020-1-arthurchang09@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-hardening@vger.kernel.org The original assembly version of memchr() is implemented with the byte-wise comparing technique, which does not fully use 64-bits registers in x86_64 CPU. We use word-wide comparing so that 8 characters can be compared at the same time on x86_64 CPU. First we align the input and then use word-wise comparing to find the first 64-bit word that contain the target. Secondly, we compare every byte in the word and get the output. We create two files to measure the performance. The first file contains on average 10 characters ahead the target character. The second file contains at least 1000 characters ahead the target character. Our implementation of “memchr()” is slightly better in the first test and nearly 4x faster than the orginal implementation in the second test. Signed-off-by: Yu-Jen Chang Signed-off-by: Ching-Chun (Jim) Huang --- arch/x86/include/asm/string_64.h | 3 ++ arch/x86/lib/Makefile | 1 + arch/x86/lib/string_64.c | 78 ++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) create mode 100644 arch/x86/lib/string_64.c diff --git a/arch/x86/include/asm/string_64.h b/arch/x86/include/asm/string_64.h index 6e450827f..edce657e0 100644 --- a/arch/x86/include/asm/string_64.h +++ b/arch/x86/include/asm/string_64.h @@ -14,6 +14,9 @@ extern void *memcpy(void *to, const void *from, size_t len); extern void *__memcpy(void *to, const void *from, size_t len); +#define __HAVE_ARCH_MEMCHR +extern void *memchr(const void *cs, int c, size_t length); + #define __HAVE_ARCH_MEMSET void *memset(void *s, int c, size_t n); void *__memset(void *s, int c, size_t n); diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index f76747862..4d530e559 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -69,5 +69,6 @@ else lib-y += clear_page_64.o copy_page_64.o lib-y += memmove_64.o memset_64.o lib-y += copy_user_64.o + lib-y += string_64.o lib-y += cmpxchg16b_emu.o endif diff --git a/arch/x86/lib/string_64.c b/arch/x86/lib/string_64.c new file mode 100644 index 000000000..4e067d5be --- /dev/null +++ b/arch/x86/lib/string_64.c @@ -0,0 +1,78 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include + +/* How many bytes are loaded each iteration of the word copy loop */ +#define LBLOCKSIZE (sizeof(long)) + +#ifdef __HAVE_ARCH_MEMCHR + +void *memchr(const void *cs, int c, size_t length) +{ + const unsigned char *src = (const unsigned char *)cs, d = c; + + while (!IS_ALIGNED((long)src, sizeof(long))) { + if (!length--) + return NULL; + if (*src == d) + return (void *)src; + src++; + } + if (length >= LBLOCKSIZE) { + unsigned long mask = d << 8 | d; + unsigned int i = 32; + long xor, data; + const long consta = 0xFEFEFEFEFEFEFEFF, + constb = 0x8080808080808080; + + /* + * Create a 8-bytes mask for word-wise comparing. + * For example, a mask for 'a' is 0x6161616161616161. + */ + + mask |= mask << 16; + for (i = 32; i < LBLOCKSIZE * 8; i <<= 1) + mask |= mask << i; + /* + * We perform word-wise comparing with following operation: + * 1. Perform xor on the long word @src and @mask + * and put into @xor. + * 2. Add @xor with @consta. + * 3. ~@xor & @constb. + * 4. Perform & with the result of step 2 and 3. + * + * Step 1 creates a byte which is 0 in the long word if + * there is at least one target byte in it. + * + * Step 2 to Step 4 find if there is a byte with 0 in + * the long word. + */ + asm volatile("1:\n\t" + "movq (%0),%1\n\t" + "xorq %6,%1\n\t" + "lea (%1,%4), %2\n\t" + "notq %1\n\t" + "andq %5,%1\n\t" + "testq %1,%2\n\t" + "jne 2f\n\t" + "add $8,%0\n\t" + "sub $8,%3\n\t" + "cmp $7,%3\n\t" + "ja 1b\n\t" + "2:\n\t" + : "=D"(src), "=r"(xor), "=r"(data), "=r"(length) + : "r"(consta), "r"(constb), "r"(mask), "0"(src), + "1"(xor), "2"(data), "3"(length) + : "memory", "cc"); + } + + while (length--) { + if (*src == d) + return (void *)src; + src++; + } + return NULL; +} +EXPORT_SYMBOL(memchr); +#endif From patchwork Sat May 28 08:12:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu-Jen Chang X-Patchwork-Id: 12863953 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03424C433EF for ; Sat, 28 May 2022 08:14:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231532AbiE1IOP (ORCPT ); Sat, 28 May 2022 04:14:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347542AbiE1IOL (ORCPT ); Sat, 28 May 2022 04:14:11 -0400 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D57DF53; Sat, 28 May 2022 01:14:06 -0700 (PDT) Received: by mail-pj1-x1029.google.com with SMTP id z11so6514881pjc.3; Sat, 28 May 2022 01:14:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZYHdokksnG9Y0QPms6w4hrVQLSzn/79oRxG8uAaCyWA=; b=n4KyaUDNiRgLAnB6fAuw9YONU7eZLpumh8ntdlUumo28paSx7jQf7ZL2xBqIfVGneX eRbSH5g5CV03RFtJGNPP0NPpYixt619Zp/XlAPVf75bqqkpIcmrh+OspL3LbxmFJid3Z FHLuTUhZlwU2c4euDn/A5LXKyyPCtD1reFCBasCC4UnQNOLjO66cED98AZ3+oQXQQ+9E QKeQcVf7pAYS0flG9Q7MTSfKpCeFaEzdWpnFQkXLYdFKRbaAfd3RAGxiu0V52Sv21VjL RtzyeQQkXv8BO1PRYiVRDViMiPcTWyozS3mLQ0KmuNfg6oZqA2wCCLzyR/LGYKRT80DW 0kEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZYHdokksnG9Y0QPms6w4hrVQLSzn/79oRxG8uAaCyWA=; b=KqkmesPnC8szGN/E8M56bZoN/QodJI5O8vN3tKkfFi2PWmWdTg9zOCIm12AAhn5zJs 95iN12BJon9fHvwL/1dbgI/NwFq98DbzwbPsK7X6J7LBgBjrsIvL1DgIDM89zXXKPWY9 DW2oHB5fP7rXgH015Cl6wE/ZJWmUki/9l5roT+svjPPH3P2AY95tzUi3bDwrPUON/qAc EPawaD+Y39Y3UUE0v6x4jcMk2sHDz+YyqGebnbrEt+Z+EGc+fMxTkEN0fLC0FYtKHSp1 grgUdGOhMtRhqz9m7/tqGGRO2DP/nhrc8XHrfs5wmo9QFDctlO75krbE5u9qYMkkDOHc rs7Q== X-Gm-Message-State: AOAM5335GiaFpWJMsw1O+yHG6P6z0hPki6WBGGtlC1V9NiLIySA3fdhL PAq9xkScFPACAyqi3GR1WG2mXfnknTkCJA== X-Google-Smtp-Source: ABdhPJz3V7NRvrZwYZSzP4M47joqmutX5DfncFJvGOCQkJYhAybWJg3Z9vX6P/U4/nZwfw4GfpLF5A== X-Received: by 2002:a17:90a:e7cb:b0:1df:8481:9469 with SMTP id kb11-20020a17090ae7cb00b001df84819469mr12401528pjb.195.1653725646153; Sat, 28 May 2022 01:14:06 -0700 (PDT) Received: from localhost.localdomain ([140.116.104.153]) by smtp.gmail.com with ESMTPSA id i12-20020a17090ad34c00b001e0c5da6a51sm2774347pjx.50.2022.05.28.01.14.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 May 2022 01:14:05 -0700 (PDT) From: Yu-Jen Chang To: ak@linux.intel.com, jdike@linux.intel.com Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, keescook@chromium.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, richard@nod.at, anton.ivanov@cambridgegreys.com, johannes@sipsolutions.net, linux-um@lists.infradead.org, jserv@ccns.ncku.edu.tw, Yu-Jen Chang Subject: [PATCH 2/2] x86/um: Use x86_64-optimized memchr Date: Sat, 28 May 2022 16:12:36 +0800 Message-Id: <20220528081236.3020-3-arthurchang09@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220528081236.3020-1-arthurchang09@gmail.com> References: <20220528081236.3020-1-arthurchang09@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-hardening@vger.kernel.org Add x86_64-optimized memchr, which is 4x faster than the original implementation, into um. Signed-off-by: Yu-Jen Chang Signed-off-by: Ching-Chun (Jim) Huang --- arch/x86/um/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/um/Makefile b/arch/x86/um/Makefile index ba5789c35..52b7c21ca 100644 --- a/arch/x86/um/Makefile +++ b/arch/x86/um/Makefile @@ -28,7 +28,7 @@ else obj-y += syscalls_64.o vdso/ -subarch-y = ../lib/csum-partial_64.o ../lib/memcpy_64.o ../entry/thunk_64.o +subarch-y = ../lib/csum-partial_64.o ../lib/memcpy_64.o ../lib/string_64.o ../entry/thunk_64.o endif