mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Teresa Remmet <t.remmet@phytec.de>
To: barebox@lists.infradead.org
Subject: [PATCH 21/62] UBI: Fastmap: Make ubi_refill_pools() fair
Date: Mon, 23 May 2016 10:26:09 +0200	[thread overview]
Message-ID: <1463992010-31537-22-git-send-email-t.remmet@phytec.de> (raw)
In-Reply-To: <1463992010-31537-1-git-send-email-t.remmet@phytec.de>

From: Richard Weinberger <richard@nod.at>

Currently ubi_refill_pools() first fills the first and then
the second one.
If only very few free PEBs are available the second pool can get
zero PEBs.
Change ubi_refill_pools() to distribute free PEBs fair between
all pools.

Signed-off-by: Richard Weinberger <richard@nod.at>
Reviewed-by: Guido Martínez <guido@vanguardiasur.com.ar>

Conflicts:
	drivers/mtd/ubi/wl.c

Fixed minor conflict.

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
---
 drivers/mtd/ubi/wl.c | 86 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 49 insertions(+), 37 deletions(-)

diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index 21838f6..5d89323 100644
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -194,6 +194,7 @@ static void wl_tree_add(struct ubi_wl_entry *e, struct rb_root *root)
 	rb_insert_color(&e->u.rb, root);
 }
 
+#ifndef CONFIG_MTD_UBI_FASTMAP
 /**
  * do_work - do one pending work.
  * @ubi: UBI device description object
@@ -254,6 +255,7 @@ static int produce_free_peb(struct ubi_device *ubi)
 
 	return 0;
 }
+#endif
 
 /**
  * in_wl_tree - check if wear-leveling entry is present in a WL RB-tree.
@@ -492,6 +494,7 @@ static struct ubi_wl_entry *wl_get_wle(struct ubi_device *ubi)
 	return e;
 }
 
+#ifndef CONFIG_MTD_UBI_FASTMAP
 /**
  * wl_get_peb - get a physical eraseblock.
  * @ubi: UBI device description object
@@ -525,6 +528,7 @@ retry:
 
 	return e->pnum;
 }
+#endif
 
 #ifdef CONFIG_MTD_UBI_FASTMAP
 /**
@@ -546,58 +550,60 @@ static void return_unused_pool_pebs(struct ubi_device *ubi,
 }
 
 /**
- * refill_wl_pool - refills all the fastmap pool used by the
- * WL sub-system.
+ * ubi_refill_pools - refills all fastmap PEB pools.
  * @ubi: UBI device description object
  */
-static void refill_wl_pool(struct ubi_device *ubi)
+void ubi_refill_pools(struct ubi_device *ubi)
 {
+	struct ubi_fm_pool *wl_pool = &ubi->fm_wl_pool;
+	struct ubi_fm_pool *pool = &ubi->fm_pool;
 	struct ubi_wl_entry *e;
-	struct ubi_fm_pool *pool = &ubi->fm_wl_pool;
+	int enough;
 
+	return_unused_pool_pebs(ubi, wl_pool);
 	return_unused_pool_pebs(ubi, pool);
 
-	for (pool->size = 0; pool->size < pool->max_size; pool->size++) {
-		if (!ubi->free.rb_node ||
-		   (ubi->free_count - ubi->beb_rsvd_pebs < 5))
-			break;
+	wl_pool->size = 0;
+	pool->size = 0;
 
-		e = find_wl_entry(ubi, &ubi->free, WL_FREE_MAX_DIFF);
-		self_check_in_wl_tree(ubi, e, &ubi->free);
-		rb_erase(&e->u.rb, &ubi->free);
-		ubi->free_count--;
+	for (;;) {
+		enough = 0;
+		if (pool->size < pool->max_size) {
+			if (!ubi->free.rb_node ||
+			   (ubi->free_count - ubi->beb_rsvd_pebs < 5))
+				break;
 
-		pool->pebs[pool->size] = e->pnum;
-	}
-	pool->used = 0;
-}
+			e = wl_get_wle(ubi);
+			if (!e)
+				break;
 
-/**
- * refill_wl_user_pool - refills all the fastmap pool used by ubi_wl_get_peb.
- * @ubi: UBI device description object
- */
-static void refill_wl_user_pool(struct ubi_device *ubi)
-{
-	struct ubi_fm_pool *pool = &ubi->fm_pool;
+			pool->pebs[pool->size] = e->pnum;
+			pool->size++;
+		} else
+			enough++;
 
-	return_unused_pool_pebs(ubi, pool);
+		if (wl_pool->size < wl_pool->max_size) {
+			if (!ubi->free.rb_node ||
+			   (ubi->free_count - ubi->beb_rsvd_pebs < 5))
+				break;
+
+			e = find_wl_entry(ubi, &ubi->free, WL_FREE_MAX_DIFF);
+			self_check_in_wl_tree(ubi, e, &ubi->free);
+			rb_erase(&e->u.rb, &ubi->free);
+			ubi->free_count--;
+
+			wl_pool->pebs[wl_pool->size] = e->pnum;
+			wl_pool->size++;
+		} else
+			enough++;
 
-	for (pool->size = 0; pool->size < pool->max_size; pool->size++) {
-		pool->pebs[pool->size] = wl_get_peb(ubi);
-		if (pool->pebs[pool->size] < 0)
+		if (enough == 2)
 			break;
 	}
+
+	wl_pool->used = 0;
 	pool->used = 0;
-}
 
-/**
- * ubi_refill_pools - refills all fastmap PEB pools.
- * @ubi: UBI device description object
- */
-void ubi_refill_pools(struct ubi_device *ubi)
-{
-	refill_wl_pool(ubi);
-	refill_wl_user_pool(ubi);
 }
 
 /* ubi_wl_get_peb - works exaclty like __wl_get_peb but keeps track of
@@ -1792,9 +1798,15 @@ int ubi_wl_init(struct ubi_device *ubi, struct ubi_attach_info *ai)
 
 	dbg_wl("found %i PEBs", found_pebs);
 
-	if (ubi->fm)
+	if (ubi->fm) {
 		ubi_assert(ubi->good_peb_count == \
 			   found_pebs + ubi->fm->used_blocks);
+
+		for (i = 0; i < ubi->fm->used_blocks; i++) {
+			e = ubi->fm->e[i];
+			ubi->lookuptbl[e->pnum] = e;
+		}
+	}
 	else
 		ubi_assert(ubi->good_peb_count == found_pebs);
 
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2016-05-23  8:28 UTC|newest]

Thread overview: 71+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-23  8:25 [PATCH 00/62] Update UBI Teresa Remmet
2016-05-23  8:25 ` [PATCH 01/62] UBI: add missing kmem_cache_free() in process_pool_aeb error path Teresa Remmet
2016-05-23  8:25 ` [PATCH 02/62] UBI: Improve comment on work_sem Teresa Remmet
2016-05-23  8:25 ` [PATCH 03/62] UBI: ubi_eba_read_leb: Remove in vain variable assignment Teresa Remmet
2016-05-23  8:25 ` [PATCH 04/62] UBI: wl: Rename cancel flag to shutdown Teresa Remmet
2016-05-23  8:25 ` [PATCH 05/62] UBI: Fix trivial typo in __schedule_ubi_work Teresa Remmet
2016-05-23  8:25 ` [PATCH 06/62] UBI: Fastmap: Calc fastmap size correctly Teresa Remmet
2016-05-23  8:25 ` [PATCH 07/62] UBI: Extend UBI layer debug/messaging capabilities Teresa Remmet
2016-05-23  8:25 ` [PATCH 08/62] UBI: vtbl: Use ubi_eba_atomic_leb_change() Teresa Remmet
2016-05-23  8:25 ` [PATCH 09/62] UBI: Fix double free after do_sync_erase() Teresa Remmet
2016-05-23  8:25 ` [PATCH 10/62] UBI: Fix invalid vfree() Teresa Remmet
2016-05-23  8:25 ` [PATCH 11/62] UBI: extend UBI layer debug/messaging capabilities - cosmetics Teresa Remmet
2016-05-23  8:26 ` [PATCH 12/62] UBI: clean-up printing helpers Teresa Remmet
2016-05-23  8:26 ` [PATCH 13/62] UBI: do propagate positive error codes up Teresa Remmet
2016-05-23  8:26 ` [PATCH 14/62] UBI: Fastmap: Care about the protection queue Teresa Remmet
2016-05-23  8:26 ` [PATCH 15/62] UBI: fix missing brace control flow Teresa Remmet
2016-05-23  8:26 ` [PATCH 16/62] UBI: account for bitflips in both the VID header and data Teresa Remmet
2016-05-23  8:26 ` [PATCH 17/62] UBI: fix out of bounds write Teresa Remmet
2016-05-23  8:26 ` [PATCH 18/62] UBI: initialize LEB number variable Teresa Remmet
2016-05-23  8:26 ` [PATCH 19/62] UBI: align comment for readability Teresa Remmet
2016-05-23  8:26 ` [PATCH 20/62] UBI: Split __wl_get_peb() Teresa Remmet
2016-05-23  8:26 ` Teresa Remmet [this message]
2016-05-23  8:26 ` [PATCH 22/62] UBI: Fastmap: Don't allocate new ubi_wl_entry objects Teresa Remmet
2016-05-23  8:26 ` [PATCH 23/62] UBI: Fastmap: Fix memory leaks while closing the WL sub-system Teresa Remmet
2016-05-23  8:26 ` [PATCH 24/62] UBI: Fastmap: Notify user in case of an ubi_update_fastmap() failure Teresa Remmet
2016-05-23  8:26 ` [PATCH 25/62] UBI: Fastmap: Wrap fastmap specific function in a ifdef Teresa Remmet
2016-05-23  8:26 ` [PATCH 26/62] UBI: Fastmap: Fix fastmap usage in ubi_volume_notify() Teresa Remmet
2016-05-23  8:26 ` [PATCH 27/62] UBI: Fastmap: Fix race in ubi_eba_atomic_leb_change() Teresa Remmet
2016-05-23  8:26 ` [PATCH 28/62] UBI: Fastmap: Remove bogus ubi_assert() Teresa Remmet
2016-05-23  8:26 ` [PATCH 29/62] UBI: Fastmap: Remove eba_orphans logic Teresa Remmet
2016-05-23  8:26 ` [PATCH 30/62] UBI: Fastmap: Switch to ro mode if invalidate_fastmap() fails Teresa Remmet
2016-05-23  8:26 ` [PATCH 31/62] UBI: Fastmap: Make WL pool size 50% of user pool size Teresa Remmet
2016-05-23  8:26 ` [PATCH 32/62] UBI: Fastmap: Fix leb_count unbalance Teresa Remmet
2016-05-23  8:26 ` [PATCH 33/62] UBI: Fastmap: Set used_ebs only for static volumes Teresa Remmet
2016-05-23  8:26 ` [PATCH 34/62] UBI: Fastmap: Prepare for variable sized fastmaps Teresa Remmet
2016-05-23  8:26 ` [PATCH 35/62] UBI: Fastmap: Rework fastmap error paths Teresa Remmet
2016-05-23  8:26 ` [PATCH 36/62] UBI: Fix stale pointers in ubi->lookuptbl Teresa Remmet
2016-05-23  8:26 ` [PATCH 37/62] UBI: Move fastmap specific functions out of wl.c Teresa Remmet
2016-05-23  8:26 ` [PATCH 38/62] UBI: Add accessor functions for WL data structures Teresa Remmet
2016-05-23  8:26 ` [PATCH 39/62] UBI: Fastmap: Wire up WL accessor functions Teresa Remmet
2016-05-23  8:26 ` [PATCH 40/62] UBI: Fastmap: Introduce ubi_fastmap_init() Teresa Remmet
2016-05-23  8:26 ` [PATCH 41/62] UBI: Fastmap: Introduce may_reserve_for_fm() Teresa Remmet
2016-05-23  8:26 ` [PATCH 42/62] UBI: Fastmap: Remove is_fm_block() Teresa Remmet
2016-05-23  8:26 ` [PATCH 43/62] UBI: Fastmap: Fall back to scanning mode after ECC error Teresa Remmet
2016-05-23  8:26 ` [PATCH 44/62] UBI: Fastmap: Use max() to get the larger value Teresa Remmet
2016-05-23  8:26 ` [PATCH 45/62] UBI: Fastmap: Remove unnecessary `\' Teresa Remmet
2016-05-23  8:26 ` [PATCH 46/62] UBI: Fastmap: Rename variables to make them meaningful Teresa Remmet
2016-05-23  8:26 ` [PATCH 47/62] UBI: Init vol->reserved_pebs by assignment Teresa Remmet
2016-05-23  8:26 ` [PATCH 48/62] UBI: Fastmap: Do not add vol if it already exists Teresa Remmet
2016-05-23  8:26 ` [PATCH 49/62] UBI: add a helper function for updatting on-flash layout volumes Teresa Remmet
2016-05-23  8:26 ` [PATCH 50/62] UBI: Remove unnecessary `\' Teresa Remmet
2016-05-23  8:26 ` [PATCH 51/62] UBI: Validate data_size Teresa Remmet
2016-05-23  8:26 ` [PATCH 52/62] UBI: return ENOSPC if no enough space available Teresa Remmet
2016-05-23  8:26 ` [PATCH 53/62] UBI: Fastmap: Simplify expression Teresa Remmet
2016-05-23  8:26 ` [PATCH 54/62] UBI: Fix typo in comment Teresa Remmet
2016-05-23  8:26 ` [PATCH 55/62] UBI: Fix debug message Teresa Remmet
2016-05-23  8:26 ` [PATCH 56/62] UBI: Fastmap: Fix PEB array type Teresa Remmet
2016-05-23  8:26 ` [PATCH 57/62] UBI: fix use of "VID" vs. "EC" in header self-check Teresa Remmet
2016-05-23  8:26 ` [PATCH 58/62] mtd: ubi: fixup error correction in do_sync_erase() Teresa Remmet
2016-05-23  8:26 ` [PATCH 59/62] mtd: ubi: don't leak e if schedule_erase() fails Teresa Remmet
2016-05-23  8:26 ` [PATCH 60/62] mtd: ubi: wl: avoid erasing a PEB which is empty Teresa Remmet
2016-05-23  8:26 ` [PATCH 61/62] ubi: Fix out of bounds write in volume update code Teresa Remmet
2016-05-23  8:26 ` [PATCH 62/62] mtd: UBI: Remove ubi_free_fastmap Teresa Remmet
2016-05-25  7:29 ` [PATCH 00/62] Update UBI Sascha Hauer
2016-05-25 11:38   ` Teresa Remmet
2016-05-25 13:33 ` Robert Schwebel
2016-05-25 14:42   ` Teresa Remmet
2016-05-25 14:54     ` Robert Schwebel
2016-05-25 20:22     ` Sam Ravnborg
2016-05-27  7:26       ` Teresa Remmet
2016-05-26 17:23     ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1463992010-31537-22-git-send-email-t.remmet@phytec.de \
    --to=t.remmet@phytec.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox