From patchwork Thu Feb 22 02:37:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 204523 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp1428380dyc; Wed, 21 Feb 2024 18:38:08 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU2c/zvvvaSU+mRDoy1b/y3f04MgbaShfsfKqJ73CEwIr3NHQ/ndLdarHGG8QKuC32tPgJ4V+7Y4vXTIx/vF6XyQA/DKw== X-Google-Smtp-Source: AGHT+IGpYqXDl7y0Fe5/N6Re1aYJvkZgSWPQHiv0UCeV7bnK5Oq+tGcxBTl3FNN/PTQIjAvbQnkE X-Received: by 2002:a0c:8bd9:0:b0:68f:2edf:e81b with SMTP id a25-20020a0c8bd9000000b0068f2edfe81bmr21278677qvc.10.1708569487909; Wed, 21 Feb 2024 18:38:07 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708569487; cv=pass; d=google.com; s=arc-20160816; b=DlznX06CUp5+cXwubMjZqvQ0mCkJSKnivpOgTJa9G/QA7JduJWvvjESOa5yoXy4YVU +Ygju5HiG9ZldloOGM9JqetVPH9nas28W4rTDAG185m+lVns4XtlejjsSROAtRD0X6N2 xbcy+Gx9i6GHhmejnyIHiKP2gMVDe08IxBAG/j651gfSByyAMDLqhFdbN4jnvbFL2LXU H0W9SRMjYUXTo3AhdjI/ogH6gMTl85hBF0XwGPMLW6ZRfqeIKecnLkBtnvsDchnirEU7 2DEVuHpejRKmSVStInD5Q5WLeAPox+vlmOqXkzJM08SMXRwDJKTmFfurOowZhtnZbb4g knPQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature; bh=VbWwM7zPic1o2n8E79ikwcyfydTfqLLzWcN1NjJT53s=; fh=2WrMZ6V8CnDiIcmxnAjA+Xgmu9L4ffFUW59X4xVeixA=; b=WifJ8NUc16r3VMqOyvVz41E6h5Tzhtulmfxc1GXseEJv3qYdLCeMYuF3MxJgMEkgbV JK/V9UpMdSQWDrphNtUjwZGxHxNcbNUpcFQYk6Pc5xWqNVUNHpx+BGLNMwwevqHunGjb gLzpygFjnGF1/7dpPtgoIvKr+N74V4Dqz5/xQVseckeL9jP2T857y1a0B2EsbtDNzkX+ DTAn954EIoEkKNnArUA5mdSdom7AcIJKylsP+YBSF+dbF6XVe9rppP0DELyPXoJ8Yv45 Hc1Nc8HtzbdFXHf56zHMHHfMReCk9XmybDBIaviGetHr4jh7F145fWa/IwK98BW5MxI0 JO8g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=n2S1A4KI; arc=pass (i=1 spf=pass spfdomain=rivosinc.com dkim=pass dkdomain=rivosinc-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-75801-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-75801-ouuuleilei=gmail.com@vger.kernel.org" Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id kc3-20020a056214410300b0068d14cbf19csi11737371qvb.345.2024.02.21.18.38.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 18:38:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-75801-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=n2S1A4KI; arc=pass (i=1 spf=pass spfdomain=rivosinc.com dkim=pass dkdomain=rivosinc-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-75801-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-75801-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 518EC1C2246F for ; Thu, 22 Feb 2024 02:38:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5C0D21775F; Thu, 22 Feb 2024 02:37:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="n2S1A4KI" Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (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 C95BB14284 for ; Thu, 22 Feb 2024 02:37:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708569456; cv=none; b=Eld0KvWZqJ3XxB8eDSAlrfOvFUgTdayFY6JCregAayS+LydumGql0wV0PUs1wkoUHd9dVvZDXU320S0Qsv8BvnSVfGOPMKbfEM3BvxG0idIcJenFVyFu/8sFmiG0pn2yt8wPs0VY3W/EV3rGGpqthsy7D1ND/DgCGq0W2166QIw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708569456; c=relaxed/simple; bh=sNekCmUtLWlwQH/XsGvAEvEx2UjQ+qNezBis71mVY4E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VpwnqayG9PygNRItdtJTP0WpiObKZ25IidB/3T2XY8+T8X6xHJIFVZpRQcx+Ehjo4s2cQEQ4leTu+WPClFDWNOSArCbXPzRrpVH+4YGYDzZg6Jn0+o94zrdAjnhrTP60mp9r34oQPU2Zvc+03QvncruCXXbUUFHsppCHVaalftg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=n2S1A4KI; arc=none smtp.client-ip=209.85.210.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-6e32a92e0fdso1930193b3a.0 for ; Wed, 21 Feb 2024 18:37:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1708569453; x=1709174253; 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=VbWwM7zPic1o2n8E79ikwcyfydTfqLLzWcN1NjJT53s=; b=n2S1A4KI4xKCMwYeYxrEQa4nzp2ZiNEv2cCqdoud4K9FNa5ZsAkcltDavzafgVQLYK DLmvmFCaJPyxeJAEy2fsUV06b0Pbyi2QDgI7bkp31JIMIQnH1Z/AjkDhUaXgPeig203V gIpadKz8m5LIz8JVXyvIIX9a2Q/rsI8TnfZTDh343Unb7wWAEoaUCVGKYJ8ApvXG5bLC sodA37sAzLXTDbwj51LrZesjKmsun+EssLEKV1JwwgV5+Vy2qs6lw/6AnCUPJccEV+CB shO70xyy/kS3OBWWdCkmEGxeZBUBKgZgn9ijewsibTKFJwBoJXxO5T+N8BuqhpxQCeQd 6C4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708569453; x=1709174253; 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=VbWwM7zPic1o2n8E79ikwcyfydTfqLLzWcN1NjJT53s=; b=ZRnERKCa3T8i84v4qKcc+JaiRd0qm7pp/+OmJ5+22EJIgeAAXGNv17OUS3C+Zjq6XU FJpplUY/Y4XJXVbzwwemKEUxzQ+OJj3YS3QXKJb11MO/FydIH+WzgVL6LuMl6/baxwkY /TG5ojl3phx4WyccCv325A4tfEDTNSiftSBQGJT5hBOE/jAxCfruDm9zDJXKhoVT9SLT 5ySAcJrKbki0lfRbpYOPBp5FSd8cS0g1G5IfwpBiRZ2oE3Y/SolLYKceHJd5VjB7pDJI FwNeZbET3fcKGD8kk7yrTKP+918+ZkHg+aavUbvazEzHRBwGMZwyGklhP673OjCPEkme cIfg== X-Forwarded-Encrypted: i=1; AJvYcCX5L0lDwIwjzRVkdUZcKh3y3XegkqtVxpBg2JK+FY2tsfUUfjuOpti0mdRwehT8RxygYqocWdE/ijE+4GDOyBiS6BXk7EzduIFWv2jr X-Gm-Message-State: AOJu0YwTWeXmoxCblTqczemNb16COToPbJDTfh2tP6Am34vBvhiJ/Ii2 5EnFHK0cC9BLDVwziP2CbNnGuF7xW13kIVbEQwc9UhUAF/lEPMwHUc/d/0XVTkATM+clwfpWenl U X-Received: by 2002:a05:6a00:da:b0:6e4:c5a1:e41d with SMTP id e26-20020a056a0000da00b006e4c5a1e41dmr1396178pfj.29.1708569453628; Wed, 21 Feb 2024 18:37:33 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id kt21-20020a056a004bb500b006e465e1573esm6469705pfb.74.2024.02.21.18.37.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 18:37:33 -0800 (PST) From: Charlie Jenkins Date: Wed, 21 Feb 2024 18:37:11 -0800 Subject: [PATCH 1/4] asm-generic headers: Allow csum_partial arch override Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240221-parisc_use_generic_checksum-v1-1-ad34d895fd1b@rivosinc.com> References: <20240221-parisc_use_generic_checksum-v1-0-ad34d895fd1b@rivosinc.com> In-Reply-To: <20240221-parisc_use_generic_checksum-v1-0-ad34d895fd1b@rivosinc.com> To: "James E.J. Bottomley" , Helge Deller , Arnd Bergmann , Andrew Morton , Guenter Roeck Cc: linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Charlie Jenkins X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708569451; l=1437; i=charlie@rivosinc.com; s=20231120; h=from:subject:message-id; bh=sNekCmUtLWlwQH/XsGvAEvEx2UjQ+qNezBis71mVY4E=; b=g+fjMFlNSWfcCrlu2uFDLLNXHSUDovxevoYfasXSOOsYTDbSYie7Kx4HZ/ltvBWgwxDLH99EH QhtbgMGsTK1C6kG7qoIseYXNTILqnnfDUH9Um6xbzAAZtYxm8RUNSa+ X-Developer-Key: i=charlie@rivosinc.com; a=ed25519; pk=t4RSWpMV1q5lf/NWIeR9z58bcje60/dbtxxmoSfBEcs= X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791564959570725857 X-GMAIL-MSGID: 1791564959570725857 Arches can have more a efficient implementation of csum_partial. Signed-off-by: Charlie Jenkins Tested-by: Guenter Roeck --- include/asm-generic/checksum.h | 2 ++ lib/checksum.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/include/asm-generic/checksum.h b/include/asm-generic/checksum.h index ad928cce268b..3309830ba2cb 100644 --- a/include/asm-generic/checksum.h +++ b/include/asm-generic/checksum.h @@ -4,6 +4,7 @@ #include +#ifndef csum_partial /* * computes the checksum of a memory block at buff, length len, * and adds in "sum" (32-bit) @@ -17,6 +18,7 @@ * it's best to have buff aligned on a 32-bit boundary */ extern __wsum csum_partial(const void *buff, int len, __wsum sum); +#endif #ifndef ip_fast_csum /* diff --git a/lib/checksum.c b/lib/checksum.c index 6860d6b05a17..c115a9ac71d9 100644 --- a/lib/checksum.c +++ b/lib/checksum.c @@ -110,6 +110,7 @@ __sum16 ip_fast_csum(const void *iph, unsigned int ihl) EXPORT_SYMBOL(ip_fast_csum); #endif +#ifndef csum_partial /* * computes the checksum of a memory block at buff, length len, * and adds in "sum" (32-bit) @@ -134,6 +135,7 @@ __wsum csum_partial(const void *buff, int len, __wsum wsum) return (__force __wsum)result; } EXPORT_SYMBOL(csum_partial); +#endif /* * this routine is used for miscellaneous IP-like checksums, mainly From patchwork Thu Feb 22 02:37:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 204524 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp1428470dyc; Wed, 21 Feb 2024 18:38:24 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVffbM5QkbbWQbm9s8RAk3STz1ebG4QEwORTkXZw9ZVltnLjtOFVxmt2WnYUrQh6YPxqEjIWTxwVXkwtooCg4+dRl4pJQ== X-Google-Smtp-Source: AGHT+IEyNFeWuFuGCeXpw1S5aq59q7CEMZNma5eVl5v3HcKnBGT3qsTyAehkAFJubZQoQs+9TKP5 X-Received: by 2002:ac8:57cc:0:b0:42e:1577:795d with SMTP id w12-20020ac857cc000000b0042e1577795dmr9908594qta.59.1708569504556; Wed, 21 Feb 2024 18:38:24 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708569504; cv=pass; d=google.com; s=arc-20160816; b=Zb8YRJdToW9+haNld2kuBcG/Ma4wdZVJ3cRHVYsKN1ZyIb2oaZ/sDk2d6056jNIpFE XXESCUbGQqS3caxaI4ymuJIcBUqWZUTehQFr3tCmJKZznnN9j/hNS4LW8Q5EQFERBaEL /CJCm17csSGfQhhOXBJL1j68/M9EgErkLa2LjEJGrptjPIo6RBpwfnqZ0vJ+m45Uw59x IR5xG2hHJb1GYfiporDf2RYtccqCiZEJUDMukxTuAssAUh4iM8OGKIKfo4KNOSUvcWIU L6hVSiIkPUSe0J6oRtu8upkfP1W7gbk21MJJo2DYCbuDYDVzhQgGdUgDmYVCRUUO0Asf m+OA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature; bh=xdYAIYdQG1Ak9nX+umevv7MEU7fdacXyP4+T5jQwePU=; fh=nTQU/iE90BffehqdFAGT0rXKhPBL8BtBRq+X1aybbCA=; b=zrEqRyATKhZqXUk/VqZOr8+IRDmosulHgZXBdt36JXEW4vC2lHgEWffpu5PE6+cSk7 NSHDOOGoU/rRnQGFkoGESP/hcvt9qr4VDpkLmIGk7ermvE7340un5HvTXBf9ny/XmZUY ipMuxQbhevr7Wpw/iemK+YD4K3GIDZheGafcG4xjWhwErxwRPlYHJpSvRWJQu3XaYuEw fsyESYREjxyA+uspz+G/cxu0pzAwFu5G5JnuS1Zg6vY4xGotRhIy7up2+MLAwfl7D753 J6P2pWGNz3u0tgQSye+bBEd+fDlAL99JQL+NxJ1YSoVj6HO3L/OqBS5JUEukKH9Yrlhi Xjqg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=My0RCvBz; arc=pass (i=1 spf=pass spfdomain=rivosinc.com dkim=pass dkdomain=rivosinc-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-75802-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-75802-ouuuleilei=gmail.com@vger.kernel.org" Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id vz20-20020a05620a495400b00785d2bde9a5si12081534qkn.242.2024.02.21.18.38.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 18:38:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-75802-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=My0RCvBz; arc=pass (i=1 spf=pass spfdomain=rivosinc.com dkim=pass dkdomain=rivosinc-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-75802-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-75802-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 38DA11C2240B for ; Thu, 22 Feb 2024 02:38:24 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id F03F01B263; Thu, 22 Feb 2024 02:37:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="My0RCvBz" Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (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 35D1915EA2 for ; Thu, 22 Feb 2024 02:37:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708569457; cv=none; b=rFLsVsELonkMgU5uyauBqr9gmnp3LS1x6pLPgnoVCGAUZLRvx/TdIzzLfpbEsva1Ri9S5wmazm00xFjaJUYpLFYFnIy0+JuSb8b8q9I2+o8JhMmJoR85KkfiI0hSxmEm7TLRigYVF8rsgZyJHl2dgsSJ9dFwJQOdXCvMfzMinrI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708569457; c=relaxed/simple; bh=l+USg6YpypTRM0+WpzcfEdryMXsoNQLARzL5GiGzQLo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=moJcNZKmKe5LIYprXCp9aKkxJyZOpzSluNSXGxH/V2O0EXaWaU9DmOzkhVi4uG4f7pe0MqiXbxoT/nJQ42D/VYzhmmWZnWMNoH/sYILN05sdotrpsBIYILDtMa+uAvpX2RcqSg4T35ThdxWqLFfFoqgEXj1TG2nJ/N3g2iOCnf8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=My0RCvBz; arc=none smtp.client-ip=209.85.210.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-6e486abf3a5so1405972b3a.0 for ; Wed, 21 Feb 2024 18:37:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1708569455; x=1709174255; 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=xdYAIYdQG1Ak9nX+umevv7MEU7fdacXyP4+T5jQwePU=; b=My0RCvBzyoUfAKwvIOr/6evWcNGJLzzMtcwkKb1D9MGInpj5eIYlBD5Y+69md2E4KJ Waqg4RYOkpbP2Ot1BJDPWg7cSW4y2YUqGcuMRe661H/ffqPP6Pb9FjG1pTbgS/y+kOrc GQflr0RrvAS5OpusJ1bITlWwEampTy7okf7lJd6c/qg0Gd8yZb9Ll9M9DGE2i8rXDS6m +4Z215xFLj2LD0coTLSHrk2dwaHpJAfYx7M2BK+TXYl74fhNMrwPU4KJe9yhpU77ItnZ rwZxvpmInhbhohbGxbXBrUejxQbrio2OWOpqHFh2GtnE9xhmJQ3M95q2HUQZP0UpCbqu rd+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708569455; x=1709174255; 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=xdYAIYdQG1Ak9nX+umevv7MEU7fdacXyP4+T5jQwePU=; b=a6xaPbdSDZPLiywXe9avU8nzjSVNK/KKf+0XsiVIgl4xHKp+JPLUykB5dLJLOaDmpA d1PtfkdtL4wcmpTvS4WIfR6rfa/DoI7ulU/JgWJL+4yk3W4mK7V3YB0k5Z0T4Aww8B14 fc3N1nKNkzj9yFj8bDPq5fIEdUgdKc/GNJ9rYttITYIAbGLQwpHV5Ph00MbBwChEnSKV PuPSybSVXVbYujpfhy8IRUIjGABXx1Zs6g0KJtQWYLknCh3sokcbXCLnFC3dUZRl5XiI xLOWWpPfE+wNF23vugmNOoXr+pg0ZhIRUt3F/sp9MZYP6i/iTGPQi9r3Y0U+3is6uxoV LWAg== X-Forwarded-Encrypted: i=1; AJvYcCWBUkjUKmm49ySb6eIdhAVZYH7mewPuKf+lLSLMl1mmhs7fwCb0KehBzUZdo3iO06ZfFuFdrZOuD7UWmHFYNEHanVBa58f61gpt/DU+ X-Gm-Message-State: AOJu0Yz8evHlwYFsyVqARBO5qTUR9rPgmSyc/5haIZKwFr87AiO22HIK rsG3OXRZne8xHhLVTevXwb+XTfxzFlFWW2YX2p90zUDM+BeH9rbI0xQn+Qe7EcUdpfoHzqX1mH1 Y X-Received: by 2002:a05:6a00:1d92:b0:6e4:ce30:ae1 with SMTP id z18-20020a056a001d9200b006e4ce300ae1mr229424pfw.20.1708569454826; Wed, 21 Feb 2024 18:37:34 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id kt21-20020a056a004bb500b006e465e1573esm6469705pfb.74.2024.02.21.18.37.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 18:37:34 -0800 (PST) From: Charlie Jenkins Date: Wed, 21 Feb 2024 18:37:12 -0800 Subject: [PATCH 2/4] parisc: checksum: Use generic implementations Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240221-parisc_use_generic_checksum-v1-2-ad34d895fd1b@rivosinc.com> References: <20240221-parisc_use_generic_checksum-v1-0-ad34d895fd1b@rivosinc.com> In-Reply-To: <20240221-parisc_use_generic_checksum-v1-0-ad34d895fd1b@rivosinc.com> To: "James E.J. Bottomley" , Helge Deller , Arnd Bergmann , Andrew Morton , Guenter Roeck Cc: linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Charlie Jenkins X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708569451; l=3620; i=charlie@rivosinc.com; s=20231120; h=from:subject:message-id; bh=l+USg6YpypTRM0+WpzcfEdryMXsoNQLARzL5GiGzQLo=; b=B+aW/3quyGTiPp/dimTVueCw78vaqCIG5wP05i6PchiAwl3gIbzt2dwaZ6dscnmEwLFzm7aBr xnekuqU4P72D8HfAbwftg4vIXq2sfQCtMjwzQBEvRc/VMEK7L9+evsT X-Developer-Key: i=charlie@rivosinc.com; a=ed25519; pk=t4RSWpMV1q5lf/NWIeR9z58bcje60/dbtxxmoSfBEcs= X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791564976951925682 X-GMAIL-MSGID: 1791564976951925682 The generic implementations of the checksum functions csum_tcpudp_nofold, csum_fold, and ip_compute_csum are either identical or perform better than the parisc ones, so use the generic implementations instead. In order to use the generic implementations of checksum functions, do_csum can no longer be static. Signed-off-by: Charlie Jenkins --- arch/parisc/Kconfig | 3 +++ arch/parisc/include/asm/checksum.h | 42 ++++++++------------------------------ arch/parisc/lib/checksum.c | 2 +- 3 files changed, 13 insertions(+), 34 deletions(-) diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index d14ccc948a29..1638deb23287 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig @@ -122,6 +122,9 @@ config GENERIC_BUG config GENERIC_BUG_RELATIVE_POINTERS bool +config GENERIC_CSUM + def_bool y + config GENERIC_HWEIGHT bool default y diff --git a/arch/parisc/include/asm/checksum.h b/arch/parisc/include/asm/checksum.h index 3c43baca7b39..c7847a08ef7c 100644 --- a/arch/parisc/include/asm/checksum.h +++ b/arch/parisc/include/asm/checksum.h @@ -17,6 +17,7 @@ * it's best to have buff aligned on a 32-bit boundary */ extern __wsum csum_partial(const void *, int, __wsum); +#define csum_partial csum_partial /* * Optimized for IP headers, which always checksum on 4 octet boundaries. @@ -57,20 +58,8 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl) return (__force __sum16)sum; } -/* - * Fold a partial checksum - */ -static inline __sum16 csum_fold(__wsum csum) -{ - u32 sum = (__force u32)csum; - /* add the swapped two 16-bit halves of sum, - a possible carry from adding the two 16-bit halves, - will carry from the lower half into the upper half, - giving us the correct sum in the upper half. */ - sum += (sum << 16) + (sum >> 16); - return (__force __sum16)(~sum >> 16); -} - +#define ip_fast_csum ip_fast_csum + static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len, __u8 proto, __wsum sum) @@ -85,28 +74,15 @@ static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, return sum; } -/* - * computes the checksum of the TCP/UDP pseudo-header - * returns a 16-bit checksum, already complemented - */ -static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr, - __u32 len, __u8 proto, - __wsum sum) -{ - return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum)); -} - -/* - * this routine is used for miscellaneous IP-like checksums, mainly - * in icmp.c - */ -static inline __sum16 ip_compute_csum(const void *buf, int len) -{ - return csum_fold (csum_partial(buf, len, 0)); -} +#define csum_tcpudp_nofold csum_tcpudp_nofold +extern unsigned int do_csum(const unsigned char *buff, int len); +#define do_csum do_csum #define _HAVE_ARCH_IPV6_CSUM + +#include + static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr, const struct in6_addr *daddr, __u32 len, __u8 proto, diff --git a/arch/parisc/lib/checksum.c b/arch/parisc/lib/checksum.c index 4818f3db84a5..05f5ca4b2f96 100644 --- a/arch/parisc/lib/checksum.c +++ b/arch/parisc/lib/checksum.c @@ -34,7 +34,7 @@ static inline unsigned short from32to16(unsigned int x) return (unsigned short)x; } -static inline unsigned int do_csum(const unsigned char * buff, int len) +unsigned int do_csum(const unsigned char *buff, int len) { int odd, count; unsigned int result = 0; From patchwork Thu Feb 22 02:37:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 204525 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp1428501dyc; Wed, 21 Feb 2024 18:38:31 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUML6bpTRP0UmJbE07+xx/TbRMHY6W+9Pxdcioh5R0YfWzkLl0OtFiD4wq5l3nI6KpNkDeIMcvdyN8xP9DTU4KSVMl/SQ== X-Google-Smtp-Source: AGHT+IGUUomyl1bzS5KQtY6INPZQUus/JCi404exB1KZGmBpu2qonQj/ueenlWBjlD7efe6rRwr1 X-Received: by 2002:a05:6a00:80dc:b0:6e4:ce00:677a with SMTP id ei28-20020a056a0080dc00b006e4ce00677amr176515pfb.16.1708569511210; Wed, 21 Feb 2024 18:38:31 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708569511; cv=pass; d=google.com; s=arc-20160816; b=Gy1cLmQYq5SNrjIfodzMCoytbx2nnom911GFz75Hi8AwG5fFsORG0pFzbgOY9tIxBR PqCjp3aFU757lAHSbzzL+XrsibjGHFuNJ2jK00zuwN0ee6ITYygi3cJ2YRoabjo0N21T /PVEzuNg/vpZko5xTkuQ6KgKjlDieBJkeeVSTYxFgNGWj7ZL9nXJxcu8q2dX0LRI3Lm/ C6wunLBcz7ZBu5k17sdcTFKjv4PNC7jPHDi3KWN6TKqt9A35CZ7j83/CrWINEtXbskwq l3hqzU3VkuFaTddPoUHzkt+2uMZEgzIW/LG557RX4gIH753bHE2y3uJAXrUiOcD8vqmG FjGQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature; bh=ZGrNzxe3gyC6VQWPSLHOaYx0WPaI3IQ/8Jr8tyLxsyE=; fh=QMNR4pAGGzk9qTS2KUlm1tMXgHlruS0wyeJohLlujnQ=; b=DLJ9PinzO4TrqTmAlsqWYxV0XtJ7z7U8GGgXDzAc9Fg6VdWH0IqzLk+V3YWcC5QmqM Gx3HACvVOkNeTE//p+TybfmLIywSXEoXT2i0Qe9fmoBokgT+3tkRr/bynY7BDe/aVeiq EiKpdcu7ZznthuRwt2X4PycVPgqJh1cFU4BrEOH6LjsFr4Kl08rcjR4VUl+HQ+Fa6cht /WVfWWFlVKBCiAVPFIlIESS5Ve9eUdJ/eU53D3B5RAEx1C0NbJu/uMbwcRCmXRHaFmXW ibJfdmhqFpsozGGmDRf1vsHjxyQ/tTysI/f5RDf/i7sWrDdi5gs+g/rS3atKPbPS8gnq DKEw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=bDqLaH4M; arc=pass (i=1 spf=pass spfdomain=rivosinc.com dkim=pass dkdomain=rivosinc-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-75803-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-75803-ouuuleilei=gmail.com@vger.kernel.org" Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id lb12-20020a056a004f0c00b006e376b9203esi8127207pfb.213.2024.02.21.18.38.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 18:38:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-75803-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=bDqLaH4M; arc=pass (i=1 spf=pass spfdomain=rivosinc.com dkim=pass dkdomain=rivosinc-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-75803-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-75803-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 0B937283CDB for ; Thu, 22 Feb 2024 02:38:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B4C2A179A8; Thu, 22 Feb 2024 02:37:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="bDqLaH4M" Received: from mail-oi1-f182.google.com (mail-oi1-f182.google.com [209.85.167.182]) (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 72C0D17562 for ; Thu, 22 Feb 2024 02:37:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708569458; cv=none; b=aebnoRNHm/MKwtQqcXrkVrd6+lOAHC5ThRHwtue40bGBSczII0dfsxG/ixNHhIannzQ60+iphClFBL3vOr8fSss/cEjpJjTAZ74Hcsg/v8GvLFXxo6Oh40XFqfCM2S6z7NEA+xAiLdc+j2ryZUVTNRgvuK1FJPcNAcuMPZlElwQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708569458; c=relaxed/simple; bh=loWpjUeaU5B9E/ejxOfrGk83272NpESpvlB1T6y7RcU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JKVudTO9EvgZ6k+wGknB8rw8thv8jBMP+RJTEW3woFk1i9Xnabzn302yuzove6qdbnqcSS6cO8cavzdBfBQCjCIEDeofqU0ATl5TlyDWDgGqwJ7hTLptkzNGzMhgqwwT7+9Yh+A5OSzqidwNKpHbsnfbD3au6/UkWPHF73YuKYc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=bDqLaH4M; arc=none smtp.client-ip=209.85.167.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Received: by mail-oi1-f182.google.com with SMTP id 5614622812f47-3c1404d05bfso5399589b6e.3 for ; Wed, 21 Feb 2024 18:37:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1708569456; x=1709174256; 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=ZGrNzxe3gyC6VQWPSLHOaYx0WPaI3IQ/8Jr8tyLxsyE=; b=bDqLaH4Mz6HBVCQH8/bzqJM/xjCxIxcGrIh8PIEU0TYPLwt6nH79zDhos0DOTlmk/R sewKpdEG84CTfUkO4fqkKo+KLgPemD7mqj176D+7eicT/3SoHLmguQVgQkvNX5ol1zoE 1W7S3IroWirVSWaPWLLTcdWP2uQMrDsflRj7BxPghmFDaR2YAXMEKZSs0qejzkCxbjGA SPlxggHVkvmjfUHi8n+B1W5tu/YIAmEF7fyYfycUAhwAiGUCgm2UfQa7df201Dg9OBTJ /MxdofkD0gNu3TRQycgc42xIeApQf4q278El0L7milqb7PMFVtXnJXTxROIBSCctm+Os siJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708569456; x=1709174256; 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=ZGrNzxe3gyC6VQWPSLHOaYx0WPaI3IQ/8Jr8tyLxsyE=; b=LDbsMdPocSxwD6xvsAQuVvXWZzxYeVS5Zdvvc2g242RDPiH5dChfvNv+UhYNOmgJCI a/e+8INKfTnwuGKqZpgMescGpv+0rp1pe4couY/dbNQyhPX/k9kMFGnSEDdTzfAZnq69 /sOta1CwMwxTmzFfgvoWT83NnKOeSaSU2M4qCmjFqTfwf/yiJzqZaNSm26+xOFCTaJNE CfdzPIZNhybqLCaGVPyZ2ejG+yHnW/HbXwYAT3IrAbzAwTekbV7DS/Ig48BAsQGKR6E4 sE64geUVJl5JsalxdhgRMHTnDQcB/c1SL48raq9/ZC2kHzJwquwT3BBUNvTgvH+Zn//Z iy5w== X-Forwarded-Encrypted: i=1; AJvYcCVML9mFzUwqT1CeRe4WsC+8JnJgsYkdL+cZCLRS11PDJ2VTPaWJq8lqxkmp/bqwGslu2ioDvvdoixqpGkYEJf7Zp7/Sl0SbWHdK+Zoe X-Gm-Message-State: AOJu0Yz3+/O+4k/o+/ZopE1hezttOa87pCDWBdC7VpJVHe952cXSWppr DV1o8cqdFQ4inxFoyBWfKTOJTpGpvtSaG79VSq8QvB7bcUy9E1LrJt+bTbcrGEKeAwMSEs3k2+5 S X-Received: by 2002:a05:6359:45a9:b0:17b:335c:fa07 with SMTP id no41-20020a05635945a900b0017b335cfa07mr13781339rwb.32.1708569455998; Wed, 21 Feb 2024 18:37:35 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id kt21-20020a056a004bb500b006e465e1573esm6469705pfb.74.2024.02.21.18.37.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 18:37:35 -0800 (PST) From: Charlie Jenkins Date: Wed, 21 Feb 2024 18:37:13 -0800 Subject: [PATCH 3/4] parisc: checksum: Remove folding from csum_partial Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240221-parisc_use_generic_checksum-v1-3-ad34d895fd1b@rivosinc.com> References: <20240221-parisc_use_generic_checksum-v1-0-ad34d895fd1b@rivosinc.com> In-Reply-To: <20240221-parisc_use_generic_checksum-v1-0-ad34d895fd1b@rivosinc.com> To: "James E.J. Bottomley" , Helge Deller , Arnd Bergmann , Andrew Morton , Guenter Roeck Cc: linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Charlie Jenkins X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708569451; l=1119; i=charlie@rivosinc.com; s=20231120; h=from:subject:message-id; bh=loWpjUeaU5B9E/ejxOfrGk83272NpESpvlB1T6y7RcU=; b=xtNabUDylbAE6Wad/8orZRl3dAazwQY8qAbie+Ef8VKsiWBGicqZfawURBgIzMindz5keC/GQ JFElQKZrZefDR+vZaVkejbXrGuxRi9Xb6hk2IyfNMsmFd1KK3OjfEjC X-Developer-Key: i=charlie@rivosinc.com; a=ed25519; pk=t4RSWpMV1q5lf/NWIeR9z58bcje60/dbtxxmoSfBEcs= X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791564983562969416 X-GMAIL-MSGID: 1791564983562969416 The parisc implementation of csum_partial previously folded the result into 16 bits instead of returning all 32 bits and letting consumers like ip_compute_csum do the folding. Since ip_compute_csum no longer depends on this requirement, remove the folding so that the parisc implementation operates the same as other architectures. Signed-off-by: Charlie Jenkins --- arch/parisc/lib/checksum.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/parisc/lib/checksum.c b/arch/parisc/lib/checksum.c index 05f5ca4b2f96..eaa660491e24 100644 --- a/arch/parisc/lib/checksum.c +++ b/arch/parisc/lib/checksum.c @@ -95,14 +95,11 @@ unsigned int do_csum(const unsigned char *buff, int len) /* * computes a partial checksum, e.g. for TCP/UDP fragments */ -/* - * why bother folding? - */ __wsum csum_partial(const void *buff, int len, __wsum sum) { unsigned int result = do_csum(buff, len); addc(result, sum); - return (__force __wsum)from32to16(result); + return (__force __wsum)result; } EXPORT_SYMBOL(csum_partial); From patchwork Thu Feb 22 02:37:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 204526 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp1428523dyc; Wed, 21 Feb 2024 18:38:35 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWMYcPIqg6CHF6/6cQSlszYk2lHv+9AcaC3m5C29SLMEwH8GCUAJ8gMRiZCVKnGnCsQqVD5fEzaoDVriFO8C5+0sdVtEw== X-Google-Smtp-Source: AGHT+IHXJgon48XJdZfHzRNZ2bPRHlFi7SWcBEPqVBsg4ou/LpkToER5kiVc408sa/gtUwErDbBm X-Received: by 2002:a92:ca05:0:b0:365:2732:8bb6 with SMTP id j5-20020a92ca05000000b0036527328bb6mr15904729ils.11.1708569515453; Wed, 21 Feb 2024 18:38:35 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708569515; cv=pass; d=google.com; s=arc-20160816; b=L0Gg+83XxqD7NOtGwyiZsGBhNviIE+mzUWqll6doNhWI8P/Q/o7mvMBQ2VrRg7rQ1g ifXAlwbcTG6+chBHeGLzuIbrdXSkA24qB3fe/uBejoGl64pffxBJ65siWLs3WY0vz4Bb 3QwO/XtxDs37RepmhOqmRPKiusliNWSgiWx90ycw8cR5qHaZQz7CYGvby8fOQetZzN6G 2SzZL/kx8LdQmwpa8cWJinjE/I8CXE1nRC0HJMMcHpOGj44wuRMhuNTMrBNryJifOD3O ZhVhp9LO9XidacLWxN1nJjPLIedOuB1wM7lb2blH+fwFq4X4GL1qC+AcGy7l9XaMrlq6 dyog== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature; bh=K6YZh5OBHggNhG2iazj7ayAHylZjnHIget6Lw5n4A74=; fh=/pkm6kGJw9TnKqYp3GWjusId02PN+onWfNWEjqoYFG8=; b=VWM7yjj6j5kupZhxK8gfuE1rjzrIYB3CV6gt4IHH/1M6xbBjABLYINWW+xd0CYK/MW X/Qgdob3vtfYS6NXXxM9DtnqyMVo339Kd6WOY7JHJnrlbhgM3qYbUzq/3PDjI80ftBn6 fBJQdfRGVYhQ8LyIbUNUxIDbCGQj5ib/s3kf7KmpdX/x2Prng78XqqSs8r1vwSixswOm xyW1UZIoLjDaYiucqsHeJ7SZERa4iWeoDyYHXOpuyT0O1muy/+OxrEX36YFPok9Zzs/T 6V71pcz/5r7OuH+n7EcZdRlw3n8317oBRgKGWjxAuvtO2EiQcGPdbMkVaJDR4Mu0HWwU OCaA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=jilndtav; arc=pass (i=1 spf=pass spfdomain=rivosinc.com dkim=pass dkdomain=rivosinc-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-75804-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-75804-ouuuleilei=gmail.com@vger.kernel.org" Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id bx33-20020a056a02052100b005e438ff32f9si1531630pgb.394.2024.02.21.18.38.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 18:38:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-75804-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=jilndtav; arc=pass (i=1 spf=pass spfdomain=rivosinc.com dkim=pass dkdomain=rivosinc-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-75804-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-75804-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 03CCE283D8A for ; Thu, 22 Feb 2024 02:38:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 543261B5BA; Thu, 22 Feb 2024 02:37:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="jilndtav" Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) (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 45110175AC for ; Thu, 22 Feb 2024 02:37:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708569459; cv=none; b=Egx1UgfG2F1FDUgxYw6Ucdc9CBFSUwn0iUdKol8ZC5x4v4CxPvGbkICGylwHS/RIopUldqYs98gRQLnVDZr9HT/3bbdXeEp2p3wwI0WAQXgVT1fV14kfaolQnBgwESUWWUZCfExDPypq2t2mJELEfoz+D9zfByKJLRwesJy4Q8I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708569459; c=relaxed/simple; bh=mYOv5YQT1yDdOTCAzi4OkkPsYH4iMvZEO+odMa9t9OU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mOreJzAG3plR9os5Y+qjZk1fUpBu161z0SOryv4Q1DXrs7qAjdHQxpkKjMWOXu3+pF7sbH0losgZ0PlsSUyZ2j/ZHijHvznXl67xe4kXuLJUJVdyI4UPD05s/CMs7nM4Nt+BeE41y/dEuwsPARI9rX96erTOfsRne+ZwPtHHIuo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=jilndtav; arc=none smtp.client-ip=209.85.210.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-6e22e63abf1so3451457b3a.3 for ; Wed, 21 Feb 2024 18:37:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1708569457; x=1709174257; 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=K6YZh5OBHggNhG2iazj7ayAHylZjnHIget6Lw5n4A74=; b=jilndtav6wK9tlin1vZ80mFJXVjji8doG7sZyl7JpysdxrkyxaOefh6QIAmLsoXFgj wNTbNODr/2hOaE7wIOvZWUmgtrP0HweIbG2zpPvCS3A/rrjc3YTpU7k9x2/WEVCQT/SK pJXf415f+RZt3z466pXUGS5I+zPL6761GDxu5FvNSVOlhEvuQUzT0VR1WkqlupHQSoI7 M7rGYjUmygHH3KA0VoUKceZbVHGW/oFAwZJf6Und66esSukQHLQWqE0FCkhyYSkbwLW6 v1whZDp+GwAJxQtw3Eu3DY+IQ+9l9VPoDjXTzyaccYq+V5w6JBJv6qylE8q7bsWSf0mQ L3RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708569457; x=1709174257; 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=K6YZh5OBHggNhG2iazj7ayAHylZjnHIget6Lw5n4A74=; b=NkBGtiPbbUOsLHN5K3rPqQp23Vn6Y4LO7oEpl87IFIoRl0bfwINH9KCaAq9pz93m4L r6i3pG/tVF+SHPGzBtSzq+9e17VehPH73xlfdRR69K487FlVgA+/EGurkmHm317RIlXN c6YyccQYZmU+WU1RrCjrHih7P7m3pFvHlHWVVMTW/PEFF6Y69uDnYnWyc0FJU/od2fS4 LZTgd+iXP5tOE5/8e4SJwaWshySu33RNwHHb0hh0V06RnI8yK5nAp/WGQcORJwMofZCL +lKebE/Kd8bIWoBJC6eDuGeCxOLlXJe9l5xesOpOiS3x3uuDniR5PVRAJP5quYGc7jdJ 8pMg== X-Forwarded-Encrypted: i=1; AJvYcCVNF4I+Ipi9vwN4YvlNUziL3codqua7lekH0sDbROuj5GD3ZEgvAX+UcHpRZ4dyYnUTUcrqn287iRNLcL1v+7yXdEZPFNfMLvHulOmB X-Gm-Message-State: AOJu0Yyxmst4QzRmCFf4s0fI/XL0lw7hpDPnTCUq4PdmbRT4+QMhnPvN y1//m1PyHgFqDK7jopoPWbdOEdUBPu0Zx9YUSm1c42ZzvYerehU2zlbLYuwBBBH6Zm+EFpBXDNd P X-Received: by 2002:a62:e306:0:b0:6e4:cf7c:6c28 with SMTP id g6-20020a62e306000000b006e4cf7c6c28mr15413pfh.22.1708569457164; Wed, 21 Feb 2024 18:37:37 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id kt21-20020a056a004bb500b006e465e1573esm6469705pfb.74.2024.02.21.18.37.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 18:37:36 -0800 (PST) From: Charlie Jenkins Date: Wed, 21 Feb 2024 18:37:14 -0800 Subject: [PATCH 4/4] parisc: checksum: Optimize from32to16 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240221-parisc_use_generic_checksum-v1-4-ad34d895fd1b@rivosinc.com> References: <20240221-parisc_use_generic_checksum-v1-0-ad34d895fd1b@rivosinc.com> In-Reply-To: <20240221-parisc_use_generic_checksum-v1-0-ad34d895fd1b@rivosinc.com> To: "James E.J. Bottomley" , Helge Deller , Arnd Bergmann , Andrew Morton , Guenter Roeck Cc: linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Charlie Jenkins X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708569451; l=833; i=charlie@rivosinc.com; s=20231120; h=from:subject:message-id; bh=mYOv5YQT1yDdOTCAzi4OkkPsYH4iMvZEO+odMa9t9OU=; b=kcPBmJJuQfkQSLxjGXYurjNDqCrgbi6FLLWky02d0x0JjqeH/QjvkkY9LAedCaybC9FPI+/Uo 2tOaKUsjuarDrM9ZBbUaloDo2KRy4cHqTwp5CTnTJDmua6pJs9ksfxQ X-Developer-Key: i=charlie@rivosinc.com; a=ed25519; pk=t4RSWpMV1q5lf/NWIeR9z58bcje60/dbtxxmoSfBEcs= X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791564987808145657 X-GMAIL-MSGID: 1791564987808145657 Replace the shifting and masking of x with a rotation. This generates better assembly. Signed-off-by: Charlie Jenkins --- arch/parisc/lib/checksum.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/parisc/lib/checksum.c b/arch/parisc/lib/checksum.c index eaa660491e24..1ae8cc730d13 100644 --- a/arch/parisc/lib/checksum.c +++ b/arch/parisc/lib/checksum.c @@ -27,11 +27,8 @@ static inline unsigned short from32to16(unsigned int x) { - /* 32 bits --> 16 bits + carry */ - x = (x & 0xffff) + (x >> 16); - /* 16 bits + carry --> 16 bits including carry */ - x = (x & 0xffff) + (x >> 16); - return (unsigned short)x; + x += ror32(x, 16); + return (unsigned short)(x >> 16); } unsigned int do_csum(const unsigned char *buff, int len)