diff mbox

ubi: fastmap: Implement produce_free_peb()

Message ID 1439328464-5521-1-git-send-email-richard@nod.at
State Accepted
Headers show

Commit Message

Richard Weinberger Aug. 11, 2015, 9:27 p.m. UTC
If fastmap requests a free PEB for a pool and UBI is busy
with erasing PEBs we need to offer a function to wait for one.
We can reuse produce_free_peb() from the non-fastmap WL code
but with different locking semantics.

Reported-and-tested-by: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Richard Weinberger <richard@nod.at>
---
This time the correct patch with error handling.
I need some sleep. ;-\

---
 drivers/mtd/ubi/fastmap-wl.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

Comments

Richard Weinberger Oct. 3, 2015, 9:28 p.m. UTC | #1
Am 11.08.2015 um 23:27 schrieb Richard Weinberger:
> If fastmap requests a free PEB for a pool and UBI is busy
> with erasing PEBs we need to offer a function to wait for one.
> We can reuse produce_free_peb() from the non-fastmap WL code
> but with different locking semantics.
> 
> Reported-and-tested-by: Jörg Krause <joerg.krause@embedded.rocks>
> Signed-off-by: Richard Weinberger <richard@nod.at>

Applied.

Thanks,
//richard
diff mbox

Patch

diff --git a/drivers/mtd/ubi/fastmap-wl.c b/drivers/mtd/ubi/fastmap-wl.c
index b2a6653..30d3999 100644
--- a/drivers/mtd/ubi/fastmap-wl.c
+++ b/drivers/mtd/ubi/fastmap-wl.c
@@ -172,6 +172,30 @@  void ubi_refill_pools(struct ubi_device *ubi)
 }
 
 /**
+ * produce_free_peb - produce a free physical eraseblock.
+ * @ubi: UBI device description object
+ *
+ * This function tries to make a free PEB by means of synchronous execution of
+ * pending works. This may be needed if, for example the background thread is
+ * disabled. Returns zero in case of success and a negative error code in case
+ * of failure.
+ */
+static int produce_free_peb(struct ubi_device *ubi)
+{
+	int err;
+
+	while (!ubi->free.rb_node && ubi->works_count) {
+		dbg_wl("do one work synchronously");
+		err = do_work(ubi);
+
+		if (err)
+			return err;
+	}
+
+	return 0;
+}
+
+/**
  * ubi_wl_get_peb - get a physical eraseblock.
  * @ubi: UBI device description object
  *
@@ -213,6 +237,11 @@  again:
 		}
 		retried = 1;
 		up_read(&ubi->fm_eba_sem);
+		ret = produce_free_peb(ubi);
+		if (ret < 0) {
+			down_read(&ubi->fm_eba_sem);
+			goto out;
+		}
 		goto again;
 	}