From: "tip-bot2 for Eric Dumazet" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>,
Noah Goldstein <goldstein.w.n@gmail.com>,
Eric Dumazet <edumazet@google.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/core] x86/csum: Fix initial seed for odd buffers
Date: Wed, 01 Dec 2021 00:33:02 -0000 [thread overview]
Message-ID: <163831878239.11128.3793034988701149763.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20211125141817.3541501-1-eric.dumazet@gmail.com>
The following commit has been merged into the x86/core branch of tip:
Commit-ID: 2a144bcd661c4f0a503e03f9280e88854ac0bb37
Gitweb: https://git.kernel.org/tip/2a144bcd661c4f0a503e03f9280e88854ac0bb37
Author: Eric Dumazet <edumazet@google.com>
AuthorDate: Thu, 25 Nov 2021 06:18:17 -08:00
Committer: Dave Hansen <dave.hansen@linux.intel.com>
CommitterDate: Tue, 30 Nov 2021 16:26:03 -08:00
x86/csum: Fix initial seed for odd buffers
When I folded do_csum() into csum_partial(), I missed that we
had to swap odd/even bytes from @sum argument.
This is because this swap will happen again at the end of the function.
[A, B, C, D] -> [B, A, D, C]
As far as Internet checksums (rfc 1071) are concerned, we can instead
rotate the whole 32bit value by 8 (or 24)
-> [D, A, B, C]
Note that I played with the idea of replacing this final swapping:
result = from32to16(result);
result = ((result >> 8) & 0xff) | ((result & 0xff) << 8);
With:
result = ror32(result, 8);
But while the generated code was definitely better for the odd case,
run time cost for the more likely even case was not better for gcc.
gcc is replacing a well predicted conditional branch
with a cmov instruction after a ror instruction which adds
a cost canceling the cmov gain.
Many thanks to Noah Goldstein for reporting this issue.
[ dhansen: * spelling: swaping => swapping
* updated Fixes commit ]
Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
Fixes: d31c3c683ee6 ("x86/csum: Rewrite/optimize csum_partial()")
Reported-by: Noah Goldstein <goldstein.w.n@gmail.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lkml.kernel.org/r/20211125141817.3541501-1-eric.dumazet@gmail.com
---
arch/x86/lib/csum-partial_64.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/x86/lib/csum-partial_64.c b/arch/x86/lib/csum-partial_64.c
index 1eb8f2d..40b527b 100644
--- a/arch/x86/lib/csum-partial_64.c
+++ b/arch/x86/lib/csum-partial_64.c
@@ -41,6 +41,7 @@ __wsum csum_partial(const void *buff, int len, __wsum sum)
if (unlikely(odd)) {
if (unlikely(len == 0))
return sum;
+ temp64 = ror32((__force u32)sum, 8);
temp64 += (*(unsigned char *)buff << 8);
len--;
buff++;
prev parent reply other threads:[~2021-12-01 0:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-25 14:18 [PATCH] x86/csum: fix initial seed for odd buffers Eric Dumazet
2021-11-30 22:16 ` Dave Hansen
2021-12-01 0:18 ` Eric Dumazet
2021-12-01 0:33 ` tip-bot2 for Eric Dumazet [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=163831878239.11128.3793034988701149763.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=dave.hansen@linux.intel.com \
--cc=edumazet@google.com \
--cc=goldstein.w.n@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).