| Message ID | 1416594269-4647-1-git-send-email-computersforpeace@gmail.com |
|---|---|
| State | Accepted |
| Commit | 68f29815034e9dc9ed53cad85946c32b07adc8cc |
| Headers | show |
+ linux-mtd On Fri, Nov 21, 2014 at 06:55:54PM +0000, Jeff Lauruhn (jlauruhn) wrote: > Brian; > What is the purpose of the torture test? Please, no personal questions like this. Ask publicly so others can learn. And please read the code, comments, and existing documentation first. e.g.: http://www.linux-mtd.infradead.org/doc/general.html#L_mtd_tests Brian
On Fri, Nov 21, 2014 at 10:24:29AM -0800, Brian Norris wrote: > The torture test should quit once it actually induces an error in the > flash. This step was accidentally removed during refactoring. > > Without this fix, the torturetest just continues infinitely, or until > the maximum cycle count is reached. e.g.: > > ... > [ 7619.218171] mtd_test: error -5 while erasing EB 100 > [ 7619.297981] mtd_test: error -5 while erasing EB 100 > [ 7619.377953] mtd_test: error -5 while erasing EB 100 > [ 7619.457998] mtd_test: error -5 while erasing EB 100 > [ 7619.537990] mtd_test: error -5 while erasing EB 100 > ... > > Fixes: 6cf78358c94f ("mtd: mtd_torturetest: use mtd_test helpers") > Signed-off-by: Brian Norris <computersforpeace@gmail.com> > Cc: Akinobu Mita <akinobu.mita@gmail.com> > Cc: <stable@vger.kernel.org> Applied to l2-mtd.git. Brian
diff --git a/drivers/mtd/tests/torturetest.c b/drivers/mtd/tests/torturetest.c index eeab96973cf0..b55bc52a1340 100644 --- a/drivers/mtd/tests/torturetest.c +++ b/drivers/mtd/tests/torturetest.c @@ -264,7 +264,9 @@ static int __init tort_init(void) int i; void *patt; - mtdtest_erase_good_eraseblocks(mtd, bad_ebs, eb, ebcnt); + err = mtdtest_erase_good_eraseblocks(mtd, bad_ebs, eb, ebcnt); + if (err) + goto out; /* Check if the eraseblocks contain only 0xFF bytes */ if (check) {
The torture test should quit once it actually induces an error in the flash. This step was accidentally removed during refactoring. Without this fix, the torturetest just continues infinitely, or until the maximum cycle count is reached. e.g.: ... [ 7619.218171] mtd_test: error -5 while erasing EB 100 [ 7619.297981] mtd_test: error -5 while erasing EB 100 [ 7619.377953] mtd_test: error -5 while erasing EB 100 [ 7619.457998] mtd_test: error -5 while erasing EB 100 [ 7619.537990] mtd_test: error -5 while erasing EB 100 ... Fixes: 6cf78358c94f ("mtd: mtd_torturetest: use mtd_test helpers") Signed-off-by: Brian Norris <computersforpeace@gmail.com> Cc: Akinobu Mita <akinobu.mita@gmail.com> Cc: <stable@vger.kernel.org> --- drivers/mtd/tests/torturetest.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)