From patchwork Wed Nov 1 00:18:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 160389 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:abcd:0:b0:403:3b70:6f57 with SMTP id f13csp103333vqx; Tue, 31 Oct 2023 17:19:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGdQ5hipqL8/V5+vOQFQe6oeXWH7ITU7SZyy5MdVEyDD56Egz4wIKr4s6/xkFQxji4hFhSF X-Received: by 2002:a17:90b:100b:b0:27f:fcc8:9196 with SMTP id gm11-20020a17090b100b00b0027ffcc89196mr11989514pjb.32.1698797992438; Tue, 31 Oct 2023 17:19:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698797992; cv=none; d=google.com; s=arc-20160816; b=wBNyDmpaYJO+4oIS8BjHYHfYhn16Z5xAML0pp3K3IVTzaPT1Ot5WtRptAfChV1eL8m CzzBfzsd8E+lNdCG4s8xIf/2YgC+sirqW0H4ekg5hcG3/rB3xz6OHbrSonQBGRyMM6b+ ojRH7xwdEc3iFKotAH62+LvYx2atwFunrVJz4Vy4NE+/E6ctVYRO+t44NlJOB8S+6PgV 1DqwrNaHh2Q1I1sAuNrYKBPhvSMlCVyR54ORV61MAOJ9qiMozU813eQPuEa5W6rGfH5z EFlALib99aq1YN7FfuvunUZsGroRQVHQe1njd81EZaIUK8WT3zb498oPT0kR1HhPs7JD SA9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=Ed3AceHMZkBHW3Y7G0fWRXKUFOz+aro++Yp4kYAVXuk=; fh=9CVYuTeKZZsaqutjthmBvtD0Q2REYt0VsVzn2qcF9/M=; b=D3YWKW3bXHjbPUWxY/cNmQzcgUEsoCOVscAuR0vdjUUWs5V1U2bQ4IEzpTA4rE+gAS GMv2SsHz0MPXE+z4i56XG9jqN3qH/pKclMXmpteKB0e+mM0kUtO/9QOjpbpdHV58y09P fwjPdXt3IU6jB1tfP4VqCzzlfrhdqJlZBgf7SiYduz9sAB7FNLhhJhnGsIK28JRpm+Nk buIR4Sdt18mBAO9EVfQfj4aELcjvAv4LfX+/mhXo5nQ6gcYzXuOEaofMODp8mrraEJfz ro1H2CMi8fPslYCdFO/dDaXLlHJYgoZ2A1u5YL9UTMlkmCho7NQ7YgfXEItsJJAHQEuk iLpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=b3wrNZMi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id il11-20020a17090b164b00b0027d8d426dfcsi1858509pjb.103.2023.10.31.17.19.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 17:19:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=b3wrNZMi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 377908027E2B; Tue, 31 Oct 2023 17:19:46 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376895AbjKAATe (ORCPT + 34 others); Tue, 31 Oct 2023 20:19:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345065AbjKAATP (ORCPT ); Tue, 31 Oct 2023 20:19:15 -0400 Received: from mail-oi1-x231.google.com (mail-oi1-x231.google.com [IPv6:2607:f8b0:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 590D1F4 for ; Tue, 31 Oct 2023 17:19:13 -0700 (PDT) Received: by mail-oi1-x231.google.com with SMTP id 5614622812f47-3b2e4107f47so4303404b6e.2 for ; Tue, 31 Oct 2023 17:19:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1698797952; x=1699402752; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Ed3AceHMZkBHW3Y7G0fWRXKUFOz+aro++Yp4kYAVXuk=; b=b3wrNZMigBwzBB3l8ZnunB5lH/gUOTU2Y8snqzkVKaDFBMGoV2sJhzUsQ9o3PkgQqg vM9jekAH2ZzZ7IdNreldtwnvaYPpoig/GvTFtItqh7S5YVM0MEMscd1F6NjCH6qZ3h8O 9aBchPyc9HkYezwwEQAJyIdLI59l1wmpYEP4644NQkQXwaiSzBh/Oe+xoJwzLeeJdHoT 2gO122+WdzbaFG32iZPRO9VlJCQyplRdO63wLiP74anWSmNBURPA6v3AB8Tayc3SS7Hd rEYvlrTTbSY4FnZKdYIyOqzF6gi+1Z4HyqBxXvxfrXzmwcUJegtWQ0vMNKsJ9i1LSq/u EgDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698797952; x=1699402752; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ed3AceHMZkBHW3Y7G0fWRXKUFOz+aro++Yp4kYAVXuk=; b=B1XUH1jvffn06G8gCg8/vtm2K5tdcnqlkCyD0RbFJo8bCgGj+yQwsxNMR7BXYCn6Ic O153Sm3EVhpirkCUkav8iZyxRvaINeg4z8/tJ7tjrKLJ4QQ1kSd3cd4hGRQEQB0bNxy8 VG1e2fKoKEsVMjeST8Gr6woCAiRtOHvn5cnbXJcBOZ0Si435T2yBBobILffW7v2djG4+ cAO5P2UAMv9DkfWaYJ/wTHB4rQLcR3l0WTebPSliUXc9Hw84AvJGh6CTytlmAJkl8aou kK33nkS16/iLnTx7ODhu35wcObveVafFfgEItZ9ZwBBQ0tode5jTDtzABNqpArMcv1qs ZEKA== X-Gm-Message-State: AOJu0YyBrttWpBUb97Wr/+JzQt6lNLNZxJ+K6NsCfeNZ0D/7IV3TUUTZ 8Wpc9WVr2kUyWyvU/htJ7e8XLw== X-Received: by 2002:a05:6808:1293:b0:3b0:daf8:954 with SMTP id a19-20020a056808129300b003b0daf80954mr20274613oiw.49.1698797952751; Tue, 31 Oct 2023 17:19:12 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id n21-20020aca2415000000b003af638fd8e4sm65309oic.55.2023.10.31.17.19.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 17:19:12 -0700 (PDT) From: Charlie Jenkins Date: Tue, 31 Oct 2023 17:18:53 -0700 Subject: [PATCH v9 3/5] riscv: Checksum header MIME-Version: 1.0 Message-Id: <20231031-optimize_checksum-v9-3-ea018e69b229@rivosinc.com> References: <20231031-optimize_checksum-v9-0-ea018e69b229@rivosinc.com> In-Reply-To: <20231031-optimize_checksum-v9-0-ea018e69b229@rivosinc.com> To: Charlie Jenkins , Palmer Dabbelt , Conor Dooley , Samuel Holland , David Laight , Xiao Wang , Evan Green , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Cc: Paul Walmsley , Albert Ou , Arnd Bergmann , Conor Dooley X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Tue, 31 Oct 2023 17:19:46 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781318803332829498 X-GMAIL-MSGID: 1781318803332829498 Provide checksum algorithms that have been designed to leverage riscv instructions such as rotate. In 64-bit, can take advantage of the larger register to avoid some overflow checking. Signed-off-by: Charlie Jenkins Acked-by: Conor Dooley --- arch/riscv/include/asm/checksum.h | 81 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/arch/riscv/include/asm/checksum.h b/arch/riscv/include/asm/checksum.h new file mode 100644 index 000000000000..3d77cac338fe --- /dev/null +++ b/arch/riscv/include/asm/checksum.h @@ -0,0 +1,81 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Checksum routines + * + * Copyright (C) 2023 Rivos Inc. + */ +#ifndef __ASM_RISCV_CHECKSUM_H +#define __ASM_RISCV_CHECKSUM_H + +#include +#include + +#define ip_fast_csum ip_fast_csum + +/* Define riscv versions of functions before importing asm-generic/checksum.h */ +#include + +/* + * Quickly compute an IP checksum with the assumption that IPv4 headers will + * always be in multiples of 32-bits, and have an ihl of at least 5. + * @ihl is the number of 32 bit segments and must be greater than or equal to 5. + * @iph is assumed to be word aligned given that NET_IP_ALIGN is set to 2 on + * riscv, defining IP headers to be aligned. + */ +static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl) +{ + unsigned long csum = 0; + int pos = 0; + + do { + csum += ((const unsigned int *)iph)[pos]; + if (IS_ENABLED(CONFIG_32BIT)) + csum += csum < ((const unsigned int *)iph)[pos]; + } while (++pos < ihl); + + /* + * ZBB only saves three instructions on 32-bit and five on 64-bit so not + * worth checking if supported without Alternatives. + */ + if (IS_ENABLED(CONFIG_RISCV_ISA_ZBB) && + IS_ENABLED(CONFIG_RISCV_ALTERNATIVE)) { + unsigned long fold_temp; + + asm_volatile_goto(ALTERNATIVE("j %l[no_zbb]", "nop", 0, + RISCV_ISA_EXT_ZBB, 1) + : + : + : + : no_zbb); + + if (IS_ENABLED(CONFIG_32BIT)) { + asm(".option push \n\ + .option arch,+zbb \n\ + not %[fold_temp], %[csum] \n\ + rori %[csum], %[csum], 16 \n\ + sub %[csum], %[fold_temp], %[csum] \n\ + .option pop" + : [csum] "+r" (csum), [fold_temp] "=&r" (fold_temp)); + } else { + asm(".option push \n\ + .option arch,+zbb \n\ + rori %[fold_temp], %[csum], 32 \n\ + add %[csum], %[fold_temp], %[csum] \n\ + srli %[csum], %[csum], 32 \n\ + not %[fold_temp], %[csum] \n\ + roriw %[csum], %[csum], 16 \n\ + subw %[csum], %[fold_temp], %[csum] \n\ + .option pop" + : [csum] "+r" (csum), [fold_temp] "=&r" (fold_temp)); + } + return csum >> 16; + } +no_zbb: +#ifndef CONFIG_32BIT + csum += ror64(csum, 32); + csum >>= 32; +#endif + return csum_fold((__force __wsum)csum); +} + +#endif /* __ASM_RISCV_CHECKSUM_H */