Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee81602c authored by Tatyana Brokhman's avatar Tatyana Brokhman
Browse files

mtd: ubi: Read threshold verification 



One of the criteria to scrub an eraseblock due to read disturb issue is
if that eraseblock was read from more times then a pre-defined threshold.
This is verified at each LEB read according to the read counter
parameter of the read PEB.
An eraseblock that is found needs scrubbing is added to the ubi->scrub
list.

Change-Id: I70efe1622e6348f4e231ab99b93ee1ae5bc0ff92
Signed-off-by: default avatarTanya Brokhman <tlinder@codeaurora.org>
parent cee32f18

drivers/mtd/ubi/eba.c

+6 −1
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (c) International Business Machines Corp., 2006

 * Copyright (c) International Business Machines Corp., 2006

 * Copyright (c) 2014, Linux Foundation. All rights reserved.

 * Linux Foundation chooses to take subject only to the GPLv2

 * license terms, and distributes only under these terms.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * it under the terms of the GNU General Public License as published by
@@ -466,8 +469,10 @@ retry: 
			goto out_unlock;

			goto out_unlock;

		}

		}

	}

	}

	if (ubi->lookuptbl[pnum]->rc >= ubi->rd_threshold)

		scrub = 1;





	if (scrub)

	if (scrub && !ubi_in_wl_tree(ubi->lookuptbl[pnum], &ubi->scrub))

		err = ubi_wl_scrub_peb(ubi, pnum);

		err = ubi_wl_scrub_peb(ubi, pnum);





	leb_read_unlock(ubi, vol_id, lnum);

	leb_read_unlock(ubi, vol_id, lnum);

drivers/mtd/ubi/wl.c

+50 −6
Original line number Original line Diff line number Diff line
@@ -449,7 +449,7 @@ static struct ubi_wl_entry *find_anchor_wl_entry(struct rb_root *root) 
	return victim;

	return victim;

}

}





static int anchor_pebs_avalible(struct rb_root *root)

static int anchor_pebs_avalible(struct rb_root *root, int rd_threshold)

{

{

	struct rb_node *p;

	struct rb_node *p;

	struct ubi_wl_entry *e;

	struct ubi_wl_entry *e;
@@ -560,6 +560,12 @@ static void return_unused_pool_pebs(struct ubi_device *ubi, 




	for (i = pool->used; i < pool->size; i++) {

	for (i = pool->used; i < pool->size; i++) {

		e = ubi->lookuptbl[pool->pebs[i]];

		e = ubi->lookuptbl[pool->pebs[i]];

		/* If given PEB pending to be scrubbed - remove it */

		if (ubi_in_wl_tree(e, &ubi->scrub)) {

			ubi_err("PEB %d was pending scrubb", e->pnum);

			self_check_in_wl_tree(ubi, e, &ubi->scrub);

			rb_erase(&e->u.rb, &ubi->scrub);

		}

		wl_tree_add(e, &ubi->free);

		wl_tree_add(e, &ubi->free);

		ubi->free_count++;

		ubi->free_count++;

	}

	}
@@ -937,6 +943,13 @@ static int schedule_erase(struct ubi_device *ubi, struct ubi_wl_entry *e, 
	wl_wrk->lnum = lnum;

	wl_wrk->lnum = lnum;

	wl_wrk->torture = torture;

	wl_wrk->torture = torture;





	/* If given PEB pending to be scrubbed - remove it */

	if (ubi_in_wl_tree(e, &ubi->scrub)) {

		self_check_in_wl_tree(ubi, e, &ubi->scrub);

		rb_erase(&e->u.rb, &ubi->scrub);

		ubi_msg("PEB %d was pending scrubb",

				e->pnum);

	}

	schedule_ubi_work(ubi, wl_wrk);

	schedule_ubi_work(ubi, wl_wrk);

	return 0;

	return 0;

}

}
@@ -966,6 +979,14 @@ static int do_sync_erase(struct ubi_device *ubi, struct ubi_wl_entry *e, 
	wl_wrk->lnum = lnum;

	wl_wrk->lnum = lnum;

	wl_wrk->torture = torture;

	wl_wrk->torture = torture;





	/* If given PEB pending to be scrubbed - remove it */

	if (ubi_in_wl_tree(e, &ubi->scrub)) {

		self_check_in_wl_tree(ubi, e, &ubi->scrub);

		rb_erase(&e->u.rb, &ubi->scrub);

		ubi_msg("PEB %d was pending scrubb",

				e->pnum);

	}



	return erase_worker(ubi, wl_wrk, 0);

	return erase_worker(ubi, wl_wrk, 0);

}

}
@@ -1070,7 +1091,7 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk, 
#ifdef CONFIG_MTD_UBI_FASTMAP

#ifdef CONFIG_MTD_UBI_FASTMAP

	/* Check whether we need to produce an anchor PEB */

	/* Check whether we need to produce an anchor PEB */

	if (!anchor)

	if (!anchor)

		anchor = !anchor_pebs_avalible(&ubi->free);

		anchor = !anchor_pebs_avalible(&ubi->free, ubi->rd_threshold);





	if (anchor) {

	if (anchor) {

		e1 = find_anchor_wl_entry(&ubi->used);

		e1 = find_anchor_wl_entry(&ubi->used);
@@ -1631,6 +1652,8 @@ retry: 
		} else if (ubi_in_wl_tree(e, &ubi->scrub)) {

		} else if (ubi_in_wl_tree(e, &ubi->scrub)) {

			self_check_in_wl_tree(ubi, e, &ubi->scrub);

			self_check_in_wl_tree(ubi, e, &ubi->scrub);

			rb_erase(&e->u.rb, &ubi->scrub);

			rb_erase(&e->u.rb, &ubi->scrub);

			ubi_msg("PEB %d was pending scrubb",

				e->pnum);

		} else if (ubi_in_wl_tree(e, &ubi->erroneous)) {

		} else if (ubi_in_wl_tree(e, &ubi->erroneous)) {

			self_check_in_wl_tree(ubi, e, &ubi->erroneous);

			self_check_in_wl_tree(ubi, e, &ubi->erroneous);

			rb_erase(&e->u.rb, &ubi->erroneous);

			rb_erase(&e->u.rb, &ubi->erroneous);
@@ -1674,8 +1697,6 @@ int ubi_wl_scrub_peb(struct ubi_device *ubi, int pnum) 
{

{

	struct ubi_wl_entry *e;

	struct ubi_wl_entry *e;





	ubi_msg("schedule PEB %d for scrubbing", pnum);



retry:

retry:

	spin_lock(&ubi->wl_lock);

	spin_lock(&ubi->wl_lock);

	e = ubi->lookuptbl[pnum];

	e = ubi->lookuptbl[pnum];
@@ -1713,6 +1734,7 @@ retry: 
		}

		}

	}

	}





	ubi_msg("schedule PEB %d for scrubbing", pnum);

	wl_tree_add(e, &ubi->scrub);

	wl_tree_add(e, &ubi->scrub);

	spin_unlock(&ubi->wl_lock);

	spin_unlock(&ubi->wl_lock);
@@ -1906,7 +1928,9 @@ int ubi_wl_init(struct ubi_device *ubi, struct ubi_attach_info *ai) 
	struct ubi_ainf_volume *av;

	struct ubi_ainf_volume *av;

	struct ubi_ainf_peb *aeb, *tmp;

	struct ubi_ainf_peb *aeb, *tmp;

	struct ubi_wl_entry *e;

	struct ubi_wl_entry *e;

	struct timeval tv;





	do_gettimeofday(&tv);

	ubi->used = ubi->erroneous = ubi->free = ubi->scrub = RB_ROOT;

	ubi->used = ubi->erroneous = ubi->free = ubi->scrub = RB_ROOT;

	spin_lock_init(&ubi->wl_lock);

	spin_lock_init(&ubi->wl_lock);

	mutex_init(&ubi->move_mutex);

	mutex_init(&ubi->move_mutex);
@@ -1989,8 +2013,17 @@ int ubi_wl_init(struct ubi_device *ubi, struct ubi_attach_info *ai) 
		ubi_assert(e->ec >= 0);

		ubi_assert(e->ec >= 0);

		ubi_assert(!ubi_is_fm_block(ubi, e->pnum));

		ubi_assert(!ubi_is_fm_block(ubi, e->pnum));





		/* Check last erase timestamp (in days) */

		if (e->last_erase_time + ubi->dt_threshold <

			(tv.tv_sec / NUM_SEC_IN_DAY)) {

			if (schedule_erase(ubi, e, aeb->vol_id, aeb->lnum, 0)) {

				kmem_cache_free(ubi_wl_entry_slab, e);

				goto out_free;

			}

		} else {

			wl_tree_add(e, &ubi->free);

			wl_tree_add(e, &ubi->free);

			ubi->free_count++;

			ubi->free_count++;

		}





		ubi->lookuptbl[e->pnum] = e;

		ubi->lookuptbl[e->pnum] = e;
@@ -2021,6 +2054,17 @@ int ubi_wl_init(struct ubi_device *ubi, struct ubi_attach_info *ai) 
			e->last_erase_time = aeb->last_erase_time;

			e->last_erase_time = aeb->last_erase_time;

			ubi->lookuptbl[e->pnum] = e;

			ubi->lookuptbl[e->pnum] = e;





			/*

			 * Verify last erase timestamp

			 * (in days) and read counter

			 */

			if (e->last_erase_time + ubi->dt_threshold <

				(tv.tv_sec / NUM_SEC_IN_DAY) ||

				e->rc > ubi->rd_threshold) {

				ubi_msg("scrub PEB %d rc = %d",

				       e->pnum, e->rc);

				aeb->scrub = 1;

			}

			if (!aeb->scrub) {

			if (!aeb->scrub) {

				dbg_wl("add PEB %d EC %d to the used tree",

				dbg_wl("add PEB %d EC %d to the used tree",

				       e->pnum, e->ec);

				       e->pnum, e->ec);