@@ -359,6 +359,20 @@ void ubi_conso_schedule(struct ubi_device *ubi)
BUG();
}
+int ubi_conso_sync(struct ubi_device *ubi)
+{
+ int ret = -ENOMEM;
+
+ struct ubi_work *wrk = ubi_alloc_work(ubi);
+
+ if (wrk) {
+ wrk->func = &consolidation_worker;
+ ret = ubi_schedule_work_sync(ubi, wrk);
+ }
+
+ return ret;
+}
+
void ubi_eba_consolidate(struct ubi_device *ubi)
{
if (consolidation_possible(ubi) && ubi->consolidation_pnum >= 0)
@@ -378,6 +378,11 @@ static ssize_t dfs_file_write(struct file *file, const char __user *user_buf,
d->emulate_io_failures = val;
else if (dent == d->dfs_force_leb_consolidation)
d->force_leb_consolidation = val;
+ else if (dent == d->dfs_trigger_leb_consolidation) {
+ val = ubi_conso_sync(ubi);
+ if (val < 0)
+ count = val;
+ }
else
count = -EINVAL;
@@ -490,6 +495,13 @@ int ubi_debugfs_init_dev(struct ubi_device *ubi)
if (IS_ERR_OR_NULL(dent))
goto out_remove;
d->dfs_force_leb_consolidation = dent;
+
+ fname = "trigger_leb_consolidation";
+ dent = debugfs_create_file(fname, S_IWUSR, d->dfs_dir, (void *)ubi_num,
+ &dfs_fops);
+ if (IS_ERR_OR_NULL(dent))
+ goto out_remove;
+ d->dfs_trigger_leb_consolidation = dent;
return 0;
out_remove:
@@ -449,6 +449,7 @@ struct ubi_debug_info {
struct dentry *dfs_emulate_bitflips;
struct dentry *dfs_emulate_io_failures;
struct dentry *dfs_force_leb_consolidation;
+ struct dentry *dfs_trigger_leb_consolidation;
struct dentry *dfs_emulate_power_cut;
struct dentry *dfs_power_cut_min;
struct dentry *dfs_power_cut_max;
@@ -932,6 +933,7 @@ bool ubi_conso_invalidate_leb(struct ubi_device *ubi, int pnum,
int ubi_coso_add_full_leb(struct ubi_device *ubi, int vol_id, int lnum, int lpos);
int ubi_conso_init(struct ubi_device *ubi);
void ubi_conso_close(struct ubi_device *ubi);
+int ubi_conso_sync(struct ubi_device *ubi);
#else
static inline bool ubi_conso_consolidation_needed(struct ubi_device *ubi)
{
@@ -954,6 +956,7 @@ static inline int ubi_coso_add_full_leb(struct ubi_device *ubi, int vol_id, int
}
static inline int ubi_conso_init(struct ubi_device *ubi) { return 0; }
static inline void ubi_conso_close(struct ubi_device *ubi) {}
+static inline int ubi_conso_sync(struct ubi_device *ubi) { return 0; }
#endif
/* wl.c */
@@ -982,6 +985,8 @@ bool ubi_work_join_one(struct ubi_device *ubi);
struct ubi_work *ubi_alloc_erase_work(struct ubi_device *ubi,
struct ubi_wl_entry *e,
int torture);
+int ubi_schedule_work_sync(struct ubi_device *ubi, struct ubi_work *wrk);
+
/* io.c */
int ubi_io_read(const struct ubi_device *ubi, void *buf, int pnum, int offset,
int len);
@@ -18,6 +18,18 @@ static bool work_suspended(struct ubi_device *ubi)
return ubi->thread_suspended || !ubi->thread_enabled;
}
+/**
+ * destroy_work - destroy an UBI work.
+ * @ref: kref object
+ *
+ * This function is called by kref upon the last reference is gone.
+ */
+static void destroy_work(struct kref *ref)
+{
+ struct ubi_work *wrk = container_of(ref, struct ubi_work, ref);
+
+ kfree(wrk);
+}
/**
* ubi_schedule_work - schedule a work.
@@ -42,6 +54,23 @@ void ubi_schedule_work(struct ubi_device *ubi, struct ubi_work *wrk)
mutex_unlock(&ubi->work_mutex);
}
+int ubi_schedule_work_sync(struct ubi_device *ubi, struct ubi_work *wrk)
+{
+ int ret;
+
+ kref_get(&wrk->ref);
+
+ ubi_schedule_work(ubi, wrk);
+ wait_for_completion(&wrk->comp);
+
+ spin_lock(&ubi->wl_lock);
+ ret = wrk->ret;
+ kref_put(&wrk->ref, destroy_work);
+ spin_unlock(&ubi->wl_lock);
+
+ return ret;
+}
+
struct ubi_work *ubi_alloc_work(struct ubi_device *ubi)
{
struct ubi_work *wrk;
@@ -57,19 +86,6 @@ struct ubi_work *ubi_alloc_work(struct ubi_device *ubi)
return wrk;
}
-/**
- * destroy_work - destroy an UBI work.
- * @ref: kref object
- *
- * This function is called by kref upon the last reference is gone.
- */
-static void destroy_work(struct kref *ref)
-{
- struct ubi_work *wrk = container_of(ref, struct ubi_work, ref);
-
- kfree(wrk);
-}
-
static void shutdown_work(struct ubi_device *ubi, int error)
{
struct ubi_work *wrk;
...useful in combination with force_leb_consolidation to test the worker. Signed-off-by: Richard Weinberger <richard@nod.at> --- drivers/mtd/ubi/consolidate.c | 14 ++++++++++++++ drivers/mtd/ubi/debug.c | 12 ++++++++++++ drivers/mtd/ubi/ubi.h | 5 +++++ drivers/mtd/ubi/work.c | 42 +++++++++++++++++++++++++++++------------- 4 files changed, 60 insertions(+), 13 deletions(-)