From patchwork Fri Dec 28 07:37:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: huhai X-Patchwork-Id: 10744197 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8FEE513BF for ; Fri, 28 Dec 2018 07:38:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6FF96285B5 for ; Fri, 28 Dec 2018 07:38:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5DDCF28C05; Fri, 28 Dec 2018 07:38:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 38D76285B5 for ; Fri, 28 Dec 2018 07:38:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=pUkQiNq3m1QoeEhqE3a0G/+JyXKcPVbbHUfPrr8N0Ao=; b=ogCWEhR8OI+1ke qGRBSsS9Skt4Pv/5tYX07gNEb1jjN1IcPEDtbP/KlqY1zGVDZbq3agKLvZwC+4GDBSn+xP8qhQMLf Tcd2huvogj+FPGSLvc2B1qtiiGXse/TbtXGLe9mJQrTVedAD1SaNJunShDUH1cWT+7lCHaHkOqLUa 17aVFO0PN/wlS4YIdXiWrLUfENvA2tBs6shHK2BJ7fN6m0MbvfLOwZ11fr3ETQy1WCtJSv/vXOLah fDAOOc6giml+eGQBI3676DVtO7vqb3kXe3gHKBHkLAeuxCGX5lltXlTiW7QU0P4TWDL8Pu/nwbNxu v+c0DaxnH8dEp8eyQ96Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gcmj3-000651-2W; Fri, 28 Dec 2018 07:38:33 +0000 Received: from smtpbgau1.qq.com ([54.206.16.166]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gcmiy-00063t-QQ for linux-arm-kernel@lists.infradead.org; Fri, 28 Dec 2018 07:38:31 +0000 X-QQ-mid: bizesmtp12t1545982665t7nrb338 Received: from hhtrace-pc.localdomain (unknown [210.22.22.130]) by esmtp6.qq.com (ESMTP) with id ; Fri, 28 Dec 2018 15:37:41 +0800 (CST) X-QQ-SSF: 01400000002000F0FF32000A0000000 X-QQ-FEAT: x4sLw9LeY+a6c8l1PkBEh+C+0gbA+aUyeOjp2pc07qx5Jc2fR4K8t1KIDTYcX OD16VIiR4INYT9M+E/7IQC/d9RxDhBs4u2GpPWDE7elbhPhEUvqb95UITN10myegaUl08AZ 9BISQktB/WdDNLmoz70nVbl59QN/Ed5HGbrs/1mVIOENsUlVdaQjIcc64YjtGssdbNfDS3Q XJzv03K6ZHqJnedNv07JXo3lXW8R/gcE1MeRnBFxFsvTd0Ex8WZY3VMYuCI/WCxiddvZpxn 6zoS1lrjJC5vnRiArO/udcupqALhZbSU+fByHD5fUX24j+ X-QQ-GoodBg: 2 From: huhai To: will.deacon@arm.com, catalin.marinas@arm.com Subject: [PATCH] arm64/lib: add accelerated do_csum for arm64 Date: Fri, 28 Dec 2018 15:37:39 +0800 Message-Id: <20181228073739.13169-1-huhai@kylinos.cn> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:kylinos.cn:qybgforeign:qybgforeign4 X-QQ-Bgrelay: 1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181227_233829_218006_24F4A19D X-CRM114-Status: GOOD ( 16.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: liuyun01@kylinos.cn, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, huhai Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP do_csum() in lib/checksum.c is too slow in ARM64, and we can use assembly and algorithm to accelerate it. Signed-off-by: huhai --- arch/arm64/include/asm/checksum.h | 3 + arch/arm64/lib/Makefile | 2 +- arch/arm64/lib/checksum.c | 144 ++++++++++++++++++++++++++++++ 3 files changed, 148 insertions(+), 1 deletion(-) create mode 100644 arch/arm64/lib/checksum.c diff --git a/arch/arm64/include/asm/checksum.h b/arch/arm64/include/asm/checksum.h index 0b6f5a7d4027..0d7b80fb300e 100644 --- a/arch/arm64/include/asm/checksum.h +++ b/arch/arm64/include/asm/checksum.h @@ -26,6 +26,9 @@ static inline __sum16 csum_fold(__wsum csum) } #define csum_fold csum_fold +#define do_csum do_csum +unsigned int do_csum(const unsigned char *buff, unsigned int len); + static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl) { __uint128_t tmp; diff --git a/arch/arm64/lib/Makefile b/arch/arm64/lib/Makefile index 69ff9887f724..4134730a121b 100644 --- a/arch/arm64/lib/Makefile +++ b/arch/arm64/lib/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -lib-y := clear_user.o delay.o copy_from_user.o \ +lib-y := checksum.o clear_user.o delay.o copy_from_user.o \ copy_to_user.o copy_in_user.o copy_page.o \ clear_page.o memchr.o memcpy.o memmove.o memset.o \ memcmp.o strcmp.o strncmp.o strlen.o strnlen.o \ diff --git a/arch/arm64/lib/checksum.c b/arch/arm64/lib/checksum.c new file mode 100644 index 000000000000..6931ef13ef87 --- /dev/null +++ b/arch/arm64/lib/checksum.c @@ -0,0 +1,144 @@ +/* + * arch/arm64/lib/checksum.c + * + * This file contains network checksum routines that are better done + * in an architecture-specific manner due to speed. + * + * Acknowledgements: + * This file is based on arch/x86/lib/csum-partial_64.c and + * arch/alpha/lib/checksum.c, which was written by Thomas Gleixner + * and Rick Gorton respectively. + */ + +#include +#include +#include + +static inline unsigned short from64to16(unsigned long x) +{ + /* Using extract instructions is a bit more efficient + * than the original shift/bitmask version. + */ + + union { + unsigned long ul; + unsigned int ui[2]; + unsigned short us[4]; + } in_v, tmp_v, out_v; + + in_v.ul = x; + tmp_v.ul = (unsigned long) in_v.ui[0] + (unsigned long) in_v.ui[1]; + + /* Since the bits of tmp_v.sh[3] are going to always be zero, + * we don't have to bother to add that in. + */ + out_v.ul = (unsigned long) tmp_v.us[0] + (unsigned long) tmp_v.us[1] + + (unsigned long) tmp_v.us[2]; + + /* Similarly, out_v.us[2] is always zero for the final add. */ + return out_v.us[0] + out_v.us[1]; +} + +/* + * Do a 64-bit checksum on an arbitrary memory area. + * Returns a 16bit checksum. + */ +unsigned int do_csum(const unsigned char *buff, unsigned len) +{ + unsigned odd, count; + unsigned long result = 0; + + if (unlikely(len == 0)) + return result; + odd = 1 & (unsigned long) buff; + if (odd) { + result = *buff << 8; + len--; + buff++; + } + count = len >> 1; /* nr of 16-bit words.. */ + if (count) { + if (2 & (unsigned long) buff) { + result += *(unsigned short *)buff; + count--; + len -= 2; + buff += 2; + } + count >>= 1; /* nr of 32-bit words.. */ + if (count) { + unsigned long zero; + unsigned long tmp1; + unsigned count64; + + if (4 & (unsigned long) buff) { + result += *(unsigned int *) buff; + count--; + len -= 4; + buff += 4; + } + count >>= 1; /* nr of 64-bit words.. */ + + /* main loop using 64byte blocks */ + zero = 0; + count64 = count >> 3; + while (count64) { + __asm__ __volatile__( + "ldr %x3, [%x1, #0]\n" + "adds %x0, %x0, %x3\n" + "ldr %x3, [%x1, #8]\n" + "adcs %x0, %x0, %x3\n" + "ldr %x3, [%x1, #16]\n" + "adcs %x0, %x0, %x3\n" + "ldr %x3, [%x1, #24]\n" + "adcs %x0, %x0, %x3\n" + "ldr %x3, [%x1, #32]\n" + "adcs %x0, %x0, %x3\n" + "ldr %x3, [%x1, #40]\n" + "adcs %x0, %x0, %x3\n" + "ldr %x3, [%x1, #48]\n" + "adcs %x0, %x0, %x3\n" + "ldr %x3, [%x1, #56]\n" + "adcs %x0, %x0, %x3\n" + "adcs %x0, %x0, %x2\n" + : "=r" (result) + : "r" (buff), "r" (zero), "r" (tmp1), "0" (result) + : "cc", "memory"); + + buff += 64; + count64--; + } + + /* last up to 7 8byte blocks */ + count %= 8; + + while (count) { + __asm__ __volatile__( + "adds %x0, %x0, %x1\n" + "adcs %x0, %x0, %x2\n" + : "=r" (result) + : "r" (*(unsigned long *)buff), "r" (zero), "0" (result) + : "cc", "memory"); + --count; + buff += 8; + } + result = (result & 0xffffffff) + (result >> 32); + + if (len & 4) { + result += *(unsigned int *) buff; + buff += 4; + } + } + if (len & 2) { + result += *(unsigned short *) buff; + buff += 2; + } + } + if (len & 1) + result += *buff; + + result = from64to16(result); + if (odd) + result = ((result >> 8) & 0xff) | ((result & 0xff) << 8); + + return result; +}