Skip to contentSkip to conversation

ndctl, test: add bus-id parameter for start-scrub/wait-scrub operation

PATCH In review Yi Zhang 3 participants 3 messages Dec 18, 2019 – Feb 18, 2020 libnvdimm: non-volatile memory device

lore
Share & tools
lore

Yi Zhang

author
#0 lore raw

PATCH 1/1 ndctl, test: add bus-id parameter for start-scrub/wait-scrub operation

On some NVDIMM servers, scrub operation will take long time to be finished as it start on all nvdimm buses in the system, add the bus-id parameter to do the scrub on the NFIT_TEST_BUS0

---
 test/btt-errors.sh      | 4 ++--
 test/clear.sh           | 2 +-
 test/inject-error.sh    | 2 +-
 test/pfn-meta-errors.sh | 2 +-
 test/pmem-errors.sh     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
test/btt-errors.sh +2 -2
index cb35865..00c0796 100755
@@ -115,7 +115,7 @@ bb_inj=$((dataoff/512))
 
 # inject badblocks for one page at the start of the file
 $NDCTL inject-error --block="$bb_inj" --count=8 $dev
-$NDCTL start-scrub && $NDCTL wait-scrub
+$NDCTL start-scrub $NFIT_TEST_BUS0 && $NDCTL wait-scrub $NFIT_TEST_BUS0
 
 force_raw 0
 mount -o nodelalloc "/dev/$blockdev" $MNT
@@ -149,7 +149,7 @@ map=$(hexdump -s 96 -n 4 "/dev/$raw_bdev" | head -1 | cut -d' ' -f2-)
 map=$(tr -d ' ' <<< "0x${map#* }${map%% *}")
 bb_inj=$((map/512))
 $NDCTL inject-error --block="$bb_inj" --count=1 $dev
-$NDCTL start-scrub && $NDCTL wait-scrub
+$NDCTL start-scrub $NFIT_TEST_BUS0 && $NDCTL wait-scrub $NFIT_TEST_BUS0
 force_raw 0
 
 # make sure reading the first block of the namespace fails
test/clear.sh +1 -1
index 17d5bed..1bd12da 100755
@@ -41,7 +41,7 @@ err_sector="$(((size/512) / 2))"
 err_count=8
 if ! read sector len < /sys/block/$blockdev/badblocks; then
 	$NDCTL inject-error --block="$err_sector" --count=$err_count $dev
-	$NDCTL start-scrub && $NDCTL wait-scrub
+	$NDCTL start-scrub $NFIT_TEST_BUS0 && $NDCTL wait-scrub $NFIT_TEST_BUS0
 fi
 read sector len < /sys/block/$blockdev/badblocks
 [ $((sector * 2)) -ne $((size /512)) ] && echo "fail: $LINENO" && exit 1
test/inject-error.sh +1 -1
index 49e68b3..825bf18 100755
@@ -77,7 +77,7 @@ do_tests()
 
 	# inject normally
 	$NDCTL inject-error --block=$err_block --count=$err_count $dev
-	$NDCTL start-scrub && $NDCTL wait-scrub
+	$NDCTL start-scrub $NFIT_TEST_BUS0 && $NDCTL wait-scrub $NFIT_TEST_BUS0
 	check_status "$err_block" "$err_count"
 	if read -r sector len < /sys/block/$blockdev/badblocks; then
 		test "$sector" -eq "$err_block"
test/pfn-meta-errors.sh +1 -1
index 2b57f19..14a15ae 100755
@@ -61,7 +61,7 @@ mblk="$((metaoff/512))"
 # inject in the middle of the struct page area
 bb_inj=$(((dblk - mblk)/2))
 $NDCTL inject-error --block="$bb_inj" --count=32 $dev
-$NDCTL start-scrub && $NDCTL wait-scrub
+$NDCTL start-scrub $NFIT_TEST_BUS0 && $NDCTL wait-scrub $NFIT_TEST_BUS0
 
 # after probe from the enable-namespace, the error should've been cleared
 force_raw 0
test/pmem-errors.sh +1 -1
index 9553a3f..3d90508 100755
@@ -46,7 +46,7 @@ err_sector="$(((size/512) / 2))"
 err_count=8
 if ! read sector len < /sys/block/$blockdev/badblocks; then
 	$NDCTL inject-error --block="$err_sector" --count=$err_count $dev
-	$NDCTL start-scrub; $NDCTL wait-scrub
+	$NDCTL start-scrub $NFIT_TEST_BUS0; $NDCTL wait-scrub $NFIT_TEST_BUS0
 fi
 read sector len < /sys/block/$blockdev/badblocks
 [ $((sector * 2)) -ne $((size /512)) ] && echo "fail: $LINENO" && false
Signature · 4 lines
2.21.0
_______________________________________________
Linux-nvdimm mailing list -- [email protected]
To unsubscribe send an email to [email protected]
#1 lore raw
Quoted 4 lines · Yi Zhang

On some NVDIMM servers, scrub operation will take long time to be finished as it start on all nvdimm buses in the system, add the bus-id parameter to do the scrub on the NFIT_TEST_BUS0

Looks good, applied.
_______________________________________________
Linux-nvdimm mailing list -- [email protected] To unsubscribe send an email to [email protected]

Reviewed-by on v1 1/1
#2 lore raw
In reply to Yi Zhang
Quoted 5 lines · Yi Zhang

On some NVDIMM servers, scrub operation will take long time to be finished as it start on all nvdimm buses in the system, add the bus-id parameter to do the scrub on the NFIT_TEST_BUS0

Quoted 74 lines
---
 test/btt-errors.sh      | 4 ++--
 test/clear.sh           | 2 +-
 test/inject-error.sh    | 2 +-
 test/pfn-meta-errors.sh | 2 +-
 test/pmem-errors.sh     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
test/btt-errors.sh +2 -2
index cb35865..00c0796 100755
@@ -115,7 +115,7 @@ bb_inj=$((dataoff/512))
 
 # inject badblocks for one page at the start of the file
 $NDCTL inject-error --block="$bb_inj" --count=8 $dev
-$NDCTL start-scrub && $NDCTL wait-scrub
+$NDCTL start-scrub $NFIT_TEST_BUS0 && $NDCTL wait-scrub $NFIT_TEST_BUS0
 
 force_raw 0
 mount -o nodelalloc "/dev/$blockdev" $MNT
@@ -149,7 +149,7 @@ map=$(hexdump -s 96 -n 4 "/dev/$raw_bdev" | head -1 | cut -d' ' -f2-)
 map=$(tr -d ' ' <<< "0x${map#* }${map%% *}")
 bb_inj=$((map/512))
 $NDCTL inject-error --block="$bb_inj" --count=1 $dev
-$NDCTL start-scrub && $NDCTL wait-scrub
+$NDCTL start-scrub $NFIT_TEST_BUS0 && $NDCTL wait-scrub $NFIT_TEST_BUS0
 force_raw 0
 
 # make sure reading the first block of the namespace fails
test/clear.sh +1 -1
index 17d5bed..1bd12da 100755
@@ -41,7 +41,7 @@ err_sector="$(((size/512) / 2))"
 err_count=8
 if ! read sector len < /sys/block/$blockdev/badblocks; then
 	$NDCTL inject-error --block="$err_sector" --count=$err_count $dev
-	$NDCTL start-scrub && $NDCTL wait-scrub
+	$NDCTL start-scrub $NFIT_TEST_BUS0 && $NDCTL wait-scrub $NFIT_TEST_BUS0
 fi
 read sector len < /sys/block/$blockdev/badblocks
 [ $((sector * 2)) -ne $((size /512)) ] && echo "fail: $LINENO" && exit 1
test/inject-error.sh +1 -1
index 49e68b3..825bf18 100755
@@ -77,7 +77,7 @@ do_tests()
 
 	# inject normally
 	$NDCTL inject-error --block=$err_block --count=$err_count $dev
-	$NDCTL start-scrub && $NDCTL wait-scrub
+	$NDCTL start-scrub $NFIT_TEST_BUS0 && $NDCTL wait-scrub $NFIT_TEST_BUS0
 	check_status "$err_block" "$err_count"
 	if read -r sector len < /sys/block/$blockdev/badblocks; then
 		test "$sector" -eq "$err_block"
test/pfn-meta-errors.sh +1 -1
index 2b57f19..14a15ae 100755
@@ -61,7 +61,7 @@ mblk="$((metaoff/512))"
 # inject in the middle of the struct page area
 bb_inj=$(((dblk - mblk)/2))
 $NDCTL inject-error --block="$bb_inj" --count=32 $dev
-$NDCTL start-scrub && $NDCTL wait-scrub
+$NDCTL start-scrub $NFIT_TEST_BUS0 && $NDCTL wait-scrub $NFIT_TEST_BUS0
 
 # after probe from the enable-namespace, the error should've been cleared
 force_raw 0
test/pmem-errors.sh +0 -0
index 9553a3f..3d90508 100755

test/pmem-errors.sh err_sector="$(((size/512) / 2))" · line 52

Quoted 8 lines
test/pmem-errors.sh +1 -1
@@ -46,7 +46,7 @@ err_sector="$(((size/512) / 2))"
 err_count=8
 if ! read sector len < /sys/block/$blockdev/badblocks; then
 	$NDCTL inject-error --block="$err_sector" --count=$err_count $dev
-	$NDCTL start-scrub; $NDCTL wait-scrub
+	$NDCTL start-scrub $NFIT_TEST_BUS0; $NDCTL wait-scrub $NFIT_TEST_BUS0
 fi
 read sector len < /sys/block/$blockdev/badblocks
 [ $((sector * 2)) -ne $((size /512)) ] && echo "fail: $LINENO" && false

_______________________________________________
Linux-nvdimm mailing list -- [email protected] To unsubscribe send an email to [email protected]