Skip to contentSkip to conversation

md/raid6 algorithms: scale test duration for speedier boots

PATCH Superseded Colin Ian King 2 participants 3 messages Apr 7, 2025 – Apr 8, 2025 Memory management

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 md/raid6 algorithms: scale test duration for speedier boots

Instead of using jiffies (and waiting for jiffies to wrap before benchmarking the algorithms) instead use the higher precision local_time for benchmarking. This patch performs 2,500 iterations of the benchmark measurements which works out to be accurate enough for benchmarking the raid algorithm data rates. Also add division by zero checking in case timing measurements are bogus.

Measuring 100 re-boots on Intel(R) Core(TM) Ultra 9 285K with improves raid64 benchmarking loop from ~68000 usecs to ~5300 usec.

This patch has been in use in Clear Linux for ~2 years w/o issues.

---
 lib/raid6/algos.c | 53 ++++++++++++++++++++---------------------------
 1 file changed, 22 insertions(+), 31 deletions(-)
lib/raid6/algos.c +22 -31
index cd2e88ee1f14..b846635542bc 100644
@@ -18,6 +18,8 @@
 #else
 #include <linux/module.h>
 #include <linux/gfp.h>
+#include <linux/sched/clock.h>
+
 /* In .bss so it's zeroed */
 const char raid6_empty_zero_page[PAGE_SIZE] __attribute__((aligned(256)));
 EXPORT_SYMBOL(raid6_empty_zero_page);
@@ -155,12 +157,15 @@ static inline const struct raid6_recov_calls *raid6_choose_recov(void)
 static inline const struct raid6_calls *raid6_choose_gen(
 	void *(*const dptrs)[RAID6_TEST_DISKS], const int disks)
 {
-	unsigned long perf, bestgenperf, j0, j1;
+	unsigned long perf;
+	const unsigned long max_perf = 2500;
 	int start = (disks>>1)-1, stop = disks-3;	/* work on the second half of the disks */
 	const struct raid6_calls *const *algo;
 	const struct raid6_calls *best;
+	const u64 ns_per_mb = 1000000000 >> 20;
+	u64 n, ns, t, ns_best = ~0ULL;
 
-	for (bestgenperf = 0, best = NULL, algo = raid6_algos; *algo; algo++) {
+	for (best = NULL, algo = raid6_algos; *algo; algo++) {
 		if (!best || (*algo)->priority >= best->priority) {
 			if ((*algo)->valid && !(*algo)->valid())
 				continue;
@@ -170,26 +175,20 @@ static inline const struct raid6_calls *raid6_choose_gen(
 				break;
 			}
 
-			perf = 0;
-
 			preempt_disable();
-			j0 = jiffies;
-			while ((j1 = jiffies) == j0)
-				cpu_relax();
-			while (time_before(jiffies,
-					    j1 + (1<<RAID6_TIME_JIFFIES_LG2))) {
+			t = local_clock();
+			for (perf = 0; perf < max_perf; perf++) {
 				(*algo)->gen_syndrome(disks, PAGE_SIZE, *dptrs);
-				perf++;
 			}
+			ns = local_clock() - t;
 			preempt_enable();
 
-			if (perf > bestgenperf) {
-				bestgenperf = perf;
+			if (ns < ns_best) {
+				ns_best = ns;
 				best = *algo;
 			}
-			pr_info("raid6: %-8s gen() %5ld MB/s\n", (*algo)->name,
-				(perf * HZ * (disks-2)) >>
-				(20 - PAGE_SHIFT + RAID6_TIME_JIFFIES_LG2));
+			n = max_perf * PAGE_SIZE * ns_per_mb * (disks - 2);
+			pr_info("raid6: %-8s gen() %5llu MB/s (%llu ns)\n", (*algo)->name, (ns > 0) ? n / ns : 0, ns);
 		}
 	}
 
@@ -206,31 +205,23 @@ static inline const struct raid6_calls *raid6_choose_gen(
 		goto out;
 	}
 
-	pr_info("raid6: using algorithm %s gen() %ld MB/s\n",
-		best->name,
-		(bestgenperf * HZ * (disks - 2)) >>
-		(20 - PAGE_SHIFT + RAID6_TIME_JIFFIES_LG2));
+	n = max_perf * PAGE_SIZE * ns_per_mb * (disks - 2);
+	pr_info("raid6: using algorithm %s gen() %llu MB/s (%llu ns)\n",
+		best->name, (ns_best > 0) ? n / ns_best : 0, ns_best);
 
 	if (best->xor_syndrome) {
-		perf = 0;
-
 		preempt_disable();
-		j0 = jiffies;
-		while ((j1 = jiffies) == j0)
-			cpu_relax();
-		while (time_before(jiffies,
-				   j1 + (1 << RAID6_TIME_JIFFIES_LG2))) {
+		t = local_clock();
+		for (perf = 0; perf < max_perf; perf++) {
 			best->xor_syndrome(disks, start, stop,
 					   PAGE_SIZE, *dptrs);
-			perf++;
 		}
+		ns = local_clock() - t;
 		preempt_enable();
 
-		pr_info("raid6: .... xor() %ld MB/s, rmw enabled\n",
-			(perf * HZ * (disks - 2)) >>
-			(20 - PAGE_SHIFT + RAID6_TIME_JIFFIES_LG2 + 1));
+		n = max_perf * PAGE_SIZE * ns_per_mb * (disks - 2);
+		pr_info("raid6: .... xor() %llu MB/s, rmw enabled (%llu ns)\n", (ns > 0) ? n / ns : 0, ns);
 	}
-
 out:
 	return best;
 }
Signature · 1 line
2.49.0
#1 lore raw
kernel test robot noticed the following build errors:

Hi Colin,

kernel test robot noticed the following build errors:

[auto build test ERROR on akpm-mm/mm-nonmm-unstable]
[also build test ERROR on akpm-mm/mm-everything linus/master v6.15-rc1 next-20250407] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Colin-Ian-King/md-raid6-algorithms-scale-test-duration-for-speedier-boots/20250407-225435
base:   https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-nonmm-unstable
patch link:    https://lore.kernel.org/r/20250407143105.60-1-colin.king%40intel.com
patch subject: [PATCH] md/raid6 algorithms: scale test duration for speedier boots
config: i386-buildonly-randconfig-002-20250407 (https://download.01.org/0day-ci/archive/20250408/[email protected]/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250408/[email protected]/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/

All errors (new ones prefixed by >>):

ld: lib/raid6/algos.o: in function `raid6_choose_gen':

>> lib/raid6/algos.c:191: undefined reference to `__udivdi3'
>> ld: lib/raid6/algos.c:209: undefined reference to `__udivdi3'

ld: lib/raid6/algos.c:223: undefined reference to `__udivdi3'

vim +191 lib/raid6/algos.c

156
157 static inline const struct raid6_calls *raid6_choose_gen(
158 void *(*const dptrs)[RAID6_TEST_DISKS], const int disks)
159 {
160 unsigned long perf;
161 const unsigned long max_perf = 2500;
162 int start = (disks>>1)-1, stop = disks-3; /* work on the second half of the disks */
163 const struct raid6_calls *const *algo;
164 const struct raid6_calls *best;
165 const u64 ns_per_mb = 1000000000 >> 20;
166 u64 n, ns, t, ns_best = ~0ULL;
167
168 for (best = NULL, algo = raid6_algos; *algo; algo++) {
169 if (!best || (*algo)->priority >= best->priority) {
170 if ((*algo)->valid && !(*algo)->valid())
171 continue;
172
173 if (!IS_ENABLED(CONFIG_RAID6_PQ_BENCHMARK)) {
174 best = *algo;
175 break;
176 }
177
178 preempt_disable();
179 t = local_clock();
180 for (perf = 0; perf < max_perf; perf++) {
181 (*algo)->gen_syndrome(disks, PAGE_SIZE, *dptrs);
182 }
183 ns = local_clock() - t;
184 preempt_enable();
185
186 if (ns < ns_best) {
187 ns_best = ns;
188 best = *algo;
189 }
190 n = max_perf * PAGE_SIZE * ns_per_mb * (disks - 2);

 > 191				pr_info("raid6: %-8s gen() %5llu MB/s (%llu ns)\n", (*algo)->name, (ns > 0) ? n / ns : 0, ns);
   192			}
   193		}
   194	
   195		if (!best) {
   196			pr_err("raid6: Yikes! No algorithm found!\n");
   197			goto out;
   198		}
   199	
   200		raid6_call = *best;
   201	
   202		if (!IS_ENABLED(CONFIG_RAID6_PQ_BENCHMARK)) {
   203			pr_info("raid6: skipped pq benchmark and selected %s\n",
   204				best->name);
   205			goto out;
   206		}
   207	
   208		n = max_perf * PAGE_SIZE * ns_per_mb * (disks - 2);
 > 209		pr_info("raid6: using algorithm %s gen() %llu MB/s (%llu ns)\n",

210 best->name, (ns_best > 0) ? n / ns_best : 0, ns_best);
211
212 if (best->xor_syndrome) {
213 preempt_disable();
214 t = local_clock();
215 for (perf = 0; perf < max_perf; perf++) {
216 best->xor_syndrome(disks, start, stop,
217 PAGE_SIZE, *dptrs);
218 }
219 ns = local_clock() - t;
220 preempt_enable();
221
222 n = max_perf * PAGE_SIZE * ns_per_mb * (disks - 2);
223 pr_info("raid6: .... xor() %llu MB/s, rmw enabled (%llu ns)\n", (ns > 0) ? n / ns : 0, ns);
224 }
225 out:
226 return best;
227 }
228

Signature · 2 lines
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
#2 lore raw
In reply to Colin Ian King
kernel test robot noticed the following build errors:

Hi Colin,

kernel test robot noticed the following build errors:

[auto build test ERROR on akpm-mm/mm-nonmm-unstable]
[also build test ERROR on akpm-mm/mm-everything linus/master v6.15-rc1 next-20250407] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Colin-Ian-King/md-raid6-algorithms-scale-test-duration-for-speedier-boots/20250407-225435
base:   https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-nonmm-unstable
patch link:    https://lore.kernel.org/r/20250407143105.60-1-colin.king%40intel.com
patch subject: [PATCH] md/raid6 algorithms: scale test duration for speedier boots
config: m68k-allyesconfig (https://download.01.org/0day-ci/archive/20250408/[email protected]/config)
compiler: m68k-linux-gcc (GCC) 14.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250408/[email protected]/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/

All errors (new ones prefixed by >>):

m68k-linux-ld: lib/raid6/algos.o: in function `raid6_choose_gen.constprop.0':

>> algos.c:(.text.unlikely+0xa8): undefined reference to `__udivdi3'
>> m68k-linux-ld: algos.c:(.text.unlikely+0x122): undefined reference to `__udivdi3'

m68k-linux-ld: algos.c:(.text.unlikely+0x1be): undefined reference to `__udivdi3'

Signature · 2 lines
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki