Patch "ubi: Deal with interrupted erasures in WL" has been added to the 4.4-stable tree
This is a note to let you know that I've just added the patch titled
ubi: Deal with interrupted erasures in WL
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ubi-deal-with-interrupted-erasures-in-wl.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
2365418879e9abf12ea9def7f9f3caf0dfa7ffb0Mon Sep 17 00:00:00 2001
From: Richard Weinberger <[email protected]>
Date: Wed, 24 Aug 2016 14:36:13 +0200
Subject: ubi: Deal with interrupted erasures in WL
From: Richard Weinberger <[email protected]>
commit 2365418879e9abf12ea9def7f9f3caf0dfa7ffb0 upstream.
When Fastmap is used we can face here an -EBADMSG since Fastmap cannot know about unmaps.
If the erasure was interrupted the PEB may show ECC errors and UBI would go to ro-mode as it assumes that the PEB was check during attach time, which is not the case with Fastmap.
--- drivers/mtd/ubi/wl.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)
drivers/mtd/ubi/wl.c +19 -2
@@ -643,7 +643,7 @@ static int wear_leveling_worker(struct u int shutdown) {int err, scrubbing =0 , torture =0 , protect =0 , erroneous =0 ; -int vol_id =-1 , lnum =-1 ; +int erase =0 , keep =0 , vol_id =-1 , lnum =-1 ;#ifdef CONFIG_MTD_UBI_FASTMAP int anchor = wrk->anchor;#endif
@@ -777,6 +777,16 @@ static int wear_leveling_worker(struct u e1->pnum); scrubbing =1 ; goto out_not_moved; + }else if (ubi->fast_attach && err ==UBI_IO_BAD_HDR_EBADMSG ) { +/* +* While a full scan would detect interrupted erasures +* at attach time we can face them here when attached from +* Fastmap. +*/ +dbg_wl ("PEB %d has ECC errors, maybe from an interrupted erasure" , + e1->pnum); + erase =1 ; + goto out_not_moved; } ubi_err(ubi, "error %d while reading VID header from PEB %d",
@@ -810,6 +820,7 @@ static int wear_leveling_worker(struct u* Target PEB had bit-flips or write error - torture it. */ torture =1 ; + keep =1 ; goto out_not_moved; }
@@ -895,7 +906,7 @@ out_not_moved: ubi->erroneous_peb_count +=1 ; }else if (scrubbing)wl_tree_add (e1, &ubi->scrub); -else +else if (keep)wl_tree_add (e1, &ubi->used);ubi_assert (!ubi->move_to_put); ubi->move_from = ubi->move_to =NULL ;
@@ -907,6 +918,12 @@ out_not_moved:if (err) goto out_ro; +if (erase) { + err =do_sync_erase (ubi, e1, vol_id, lnum,1 ); +if (err) + goto out_ro; + } +mutex_unlock (&ubi->move_mutex);return 0 ;
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/ubi-deal-with-interrupted-erasures-in-wl.patch