UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

crypto: xor - fix template benchmarking 

[ Upstream commit ab9a244c396aae4aaa34b2399b82fc15ec2df8c1 ]

Commit c055e3eae0 ("crypto: xor - use ktime for template benchmarking")
switched from using jiffies to ktime-based performance benchmarking.

This works nicely on machines which have a fine-grained ktime()
clocksource as e.g. x86 machines with TSC.
But other machines, e.g. my 4-way HP PARISC server, don't have such
fine-grained clocksources, which is why it seems that 800 xor loops
take zero seconds, which then shows up in the logs as:

 xor: measuring software checksum speed
    8regs           : -1018167296 MB/sec
    8regs_prefetch  : -1018167296 MB/sec
    32regs          : -1018167296 MB/sec
    32regs_prefetch : -1018167296 MB/sec

Fix this with some small modifications to the existing code to improve
the algorithm to always produce correct results without introducing
major delays for architectures with a fine-grained ktime()
clocksource:
a) Delay start of the timing until ktime() just advanced. On machines
with a fast ktime() this should be just one additional ktime() call.
b) Count the number of loops. Run at minimum 800 loops and finish
earliest when the ktime() counter has progressed.

With that the throughput can now be calculated more accurately under all
conditions.

Fixes: c055e3eae0 ("crypto: xor - use ktime for template benchmarking")
Signed-off-by: Helge Deller <deller@gmx.de>
Tested-by: John David Anglin <dave.anglin@bell.net>

v2:
- clean up coding style (noticed & suggested by Herbert Xu)
- rephrased & fixed typo in commit message

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Helge Deller 2024-07-08 14:24:52 +02:00 committed by Greg Kroah-Hartman
parent 1b8178a2ae
commit e55fcc821d
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
crypto/xor.c
View File

@ -83,33 +83,30 @@ static void __init
do_xor_speed(struct xor_block_template *tmpl, void *b1, void *b2) do_xor_speed(struct xor_block_template *tmpl, void *b1, void *b2)
{ {
int speed; int speed;
int i, j; unsigned long reps;
ktime_t min, start, diff; ktime_t min, start, t0;
tmpl->next = template_list; tmpl->next = template_list;
template_list = tmpl; template_list = tmpl;
preempt_disable(); preempt_disable();
min = (ktime_t)S64_MAX; reps = 0;
for (i = 0; i < 3; i++) { t0 = ktime_get();
start = ktime_get(); /* delay start until time has advanced */
for (j = 0; j < REPS; j++) { while ((start = ktime_get()) == t0)
mb(); /* prevent loop optimization */ cpu_relax();
tmpl->do_2(BENCH_SIZE, b1, b2); do {
mb(); mb(); /* prevent loop optimization */
} tmpl->do_2(BENCH_SIZE, b1, b2);
diff = ktime_sub(ktime_get(), start); mb();
if (diff < min) } while (reps++ < REPS || (t0 = ktime_get()) == start);
min = diff; min = ktime_sub(t0, start);
}
preempt_enable(); preempt_enable();
// bytes/ns == GB/s, multiply by 1000 to get MB/s [not MiB/s] // bytes/ns == GB/s, multiply by 1000 to get MB/s [not MiB/s]
if (!min) speed = (1000 * reps * BENCH_SIZE) / (unsigned int)ktime_to_ns(min);
min = 1;
speed = (1000 * REPS * BENCH_SIZE) / (unsigned int)ktime_to_ns(min);
tmpl->speed = speed; tmpl->speed = speed;
pr_info(" %-16s: %5d MB/sec\n", tmpl->name, speed); pr_info(" %-16s: %5d MB/sec\n", tmpl->name, speed);