chksum: run all benchmarks on demand

ZFS-CI-Type: full
Signed-off-by: Alexx Saver <[email protected]>
Reviewed-by: Tino Reichardt <[email protected]>
Reviewed-by: Alexander Motin <[email protected]>
Co-authored-by: Adam Moss <[email protected]>
Close #17945

Author: lzsaver

module/zfs/zfs_chksum.c

@@ -51,7 +51,6 @@ typedef struct {
 
 #define	AT_STARTUP	0
 #define	AT_BENCHMARK	1
-#define	AT_DONE		2
 
 static chksum_stat_t *chksum_stat_data = 0;
 static kstat_t *chksum_kstat = NULL;
@@ -155,11 +154,11 @@ chksum_run(chksum_stat_t *cs, abd_t *abd, void *ctx, int round,
 	switch (round) {
 	case 1: /* 1k */
 		size = 1<<10; loops = 128; break;
-	case 2: /* 2k */
+	case 2: /* 4k */
 		size = 1<<12; loops = 64; break;
-	case 3: /* 4k */
+	case 3: /* 16k */
 		size = 1<<14; loops = 32; break;
-	case 4: /* 16k */
+	case 4: /* 64k */
 		size = 1<<16; loops = 16; break;
 	case 5: /* 256k */
 		size = 1<<18; loops = 8; break;
@@ -212,6 +211,7 @@ chksum_benchit(chksum_stat_t *cs)
 	chksum_run(cs, abd, ctx, 2, &cs->bs4k);
 	chksum_run(cs, abd, ctx, 3, &cs->bs16k);
 	chksum_run(cs, abd, ctx, 4, &cs->bs64k);
+	chksum_run(cs, abd, ctx, 5, &cs->bs256k);
 	chksum_run(cs, abd, ctx, 6, &cs->bs1m);
 	abd_free(abd);
 
@@ -245,19 +245,16 @@ chksum_benchmark(void)
 	const zfs_impl_t *sha256 = zfs_impl_get_ops("sha256");
 	const zfs_impl_t *sha512 = zfs_impl_get_ops("sha512");
 
-	/* benchmarks are done */
-	if (chksum_stat_limit == AT_DONE)
-		return;
-
-
 	/* count implementations */
-	chksum_stat_cnt = 1;  /* edonr */
-	chksum_stat_cnt += 1; /* skein */
-	chksum_stat_cnt += sha256->getcnt();
-	chksum_stat_cnt += sha512->getcnt();
-	chksum_stat_cnt += blake3->getcnt();
-	chksum_stat_data = kmem_zalloc(
-	    sizeof (chksum_stat_t) * chksum_stat_cnt, KM_SLEEP);
+	if (chksum_stat_limit == AT_STARTUP) {
+		chksum_stat_cnt = 1;  /* edonr */
+		chksum_stat_cnt += 1; /* skein */
+		chksum_stat_cnt += sha256->getcnt();
+		chksum_stat_cnt += sha512->getcnt();
+		chksum_stat_cnt += blake3->getcnt();
+		chksum_stat_data = kmem_zalloc(
+		    sizeof (chksum_stat_t) * chksum_stat_cnt, KM_SLEEP);
+	}
 
 	/* edonr - needs to be the first one here (slow CPU check) */
 	cs = &chksum_stat_data[cbid++];
@@ -333,15 +330,8 @@ chksum_benchmark(void)
 	}
 	blake3->setid(id_save);
 
-	switch (chksum_stat_limit) {
-	case AT_STARTUP:
-		/* next time we want a full benchmark */
+	if (chksum_stat_limit == AT_STARTUP) {
 		chksum_stat_limit = AT_BENCHMARK;
-		break;
-	case AT_BENCHMARK:
-		/* no further benchmarks */
-		chksum_stat_limit = AT_DONE;
-		break;
 	}
 }