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

Commit d141a8ef authored by Richard Weinberger's avatar Richard Weinberger
Browse files

UBI: Fastmap: Remove eba_orphans logic 



This logic is in vain as we treat protected PEBs also as used, so this
case must not happen.
If a PEB is found which is in the EBA table but not known as used
has to be issued as fatal error.

Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent a83832a7

drivers/mtd/ubi/fastmap.c

+8 −83
Original line number Diff line number Diff line
@@ -376,7 +376,6 @@ static void unmap_peb(struct ubi_attach_info *ai, int pnum) 
 * @pebs: an array of all PEB numbers in the to be scanned pool

 * @pool_size: size of the pool (number of entries in @pebs)

 * @max_sqnum: pointer to the maximal sequence number

 * @eba_orphans: list of PEBs which need to be scanned

 * @free: list of PEBs which are most likely free (and go into @ai->free)

 *

 * Returns 0 on success, if the pool is unusable UBI_BAD_FASTMAP is returned.
@@ -384,12 +383,12 @@ static void unmap_peb(struct ubi_attach_info *ai, int pnum) 
 */

static int scan_pool(struct ubi_device *ubi, struct ubi_attach_info *ai,

		     int *pebs, int pool_size, unsigned long long *max_sqnum,

		     struct list_head *eba_orphans, struct list_head *free)

		     struct list_head *free)

{

	struct ubi_vid_hdr *vh;

	struct ubi_ec_hdr *ech;

	struct ubi_ainf_peb *new_aeb, *tmp_aeb;

	int i, pnum, err, found_orphan, ret = 0;

	struct ubi_ainf_peb *new_aeb;

	int i, pnum, err, ret = 0;



	ech = kzalloc(ubi->ec_hdr_alsize, GFP_KERNEL);

	if (!ech)
@@ -457,18 +456,6 @@ static int scan_pool(struct ubi_device *ubi, struct ubi_attach_info *ai, 
			if (err == UBI_IO_BITFLIPS)

				scrub = 1;



			found_orphan = 0;

			list_for_each_entry(tmp_aeb, eba_orphans, u.list) {

				if (tmp_aeb->pnum == pnum) {

					found_orphan = 1;

					break;

				}

			}

			if (found_orphan) {

				list_del(&tmp_aeb->u.list);

				kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);

			}



			new_aeb = kmem_cache_alloc(ai->aeb_slab_cache,

						   GFP_KERNEL);

			if (!new_aeb) {
@@ -543,10 +530,9 @@ static int ubi_attach_fastmap(struct ubi_device *ubi, 
			      struct ubi_attach_info *ai,

			      struct ubi_fastmap_layout *fm)

{

	struct list_head used, eba_orphans, free;

	struct list_head used, free;

	struct ubi_ainf_volume *av;

	struct ubi_ainf_peb *aeb, *tmp_aeb, *_tmp_aeb;

	struct ubi_ec_hdr *ech;

	struct ubi_fm_sb *fmsb;

	struct ubi_fm_hdr *fmhdr;

	struct ubi_fm_scan_pool *fmpl1, *fmpl2;
@@ -560,7 +546,6 @@ static int ubi_attach_fastmap(struct ubi_device *ubi, 


	INIT_LIST_HEAD(&used);

	INIT_LIST_HEAD(&free);

	INIT_LIST_HEAD(&eba_orphans);

	ai->min_ec = UBI_MAX_ERASECOUNTER;



	fmsb = (struct ubi_fm_sb *)(fm_raw);
@@ -728,28 +713,9 @@ static int ubi_attach_fastmap(struct ubi_device *ubi, 
				}

			}



			/* This can happen if a PEB is already in an EBA known

			 * by this fastmap but the PEB itself is not in the used

			 * list.

			 * In this case the PEB can be within the fastmap pool

			 * or while writing the fastmap it was in the protection

			 * queue.

			 */

			if (!aeb) {

				aeb = kmem_cache_alloc(ai->aeb_slab_cache,

						       GFP_KERNEL);

			if (!aeb) {

					ret = -ENOMEM;



					goto fail;

				}



				aeb->lnum = j;

				aeb->pnum = be32_to_cpu(fm_eba->pnum[j]);

				aeb->ec = -1;

				aeb->scrub = aeb->copy_flag = aeb->sqnum = 0;

				list_add_tail(&aeb->u.list, &eba_orphans);

				continue;

				ubi_err(ubi, "PEB %i is in EBA but not in used list", pnum);

				goto fail_bad;

			}



			aeb->lnum = j;
@@ -762,49 +728,13 @@ static int ubi_attach_fastmap(struct ubi_device *ubi, 
			dbg_bld("inserting PEB:%i (LEB %i) to vol %i",

				aeb->pnum, aeb->lnum, av->vol_id);

		}



		ech = kzalloc(ubi->ec_hdr_alsize, GFP_KERNEL);

		if (!ech) {

			ret = -ENOMEM;

			goto fail;

		}



		list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &eba_orphans,

					 u.list) {

			int err;



			if (ubi_io_is_bad(ubi, tmp_aeb->pnum)) {

				ubi_err(ubi, "bad PEB in fastmap EBA orphan list");

				ret = UBI_BAD_FASTMAP;

				kfree(ech);

				goto fail;

	}



			err = ubi_io_read_ec_hdr(ubi, tmp_aeb->pnum, ech, 0);

			if (err && err != UBI_IO_BITFLIPS) {

				ubi_err(ubi, "unable to read EC header! PEB:%i err:%i",

					tmp_aeb->pnum, err);

				ret = err > 0 ? UBI_BAD_FASTMAP : err;

				kfree(ech);



				goto fail;

			} else if (err == UBI_IO_BITFLIPS)

				tmp_aeb->scrub = 1;



			tmp_aeb->ec = be64_to_cpu(ech->ec);

			assign_aeb_to_av(ai, tmp_aeb, av);

		}



		kfree(ech);

	}



	ret = scan_pool(ubi, ai, fmpl1->pebs, pool_size, &max_sqnum,

			&eba_orphans, &free);

	ret = scan_pool(ubi, ai, fmpl1->pebs, pool_size, &max_sqnum, &free);

	if (ret)

		goto fail;



	ret = scan_pool(ubi, ai, fmpl2->pebs, wl_pool_size, &max_sqnum,

			&eba_orphans, &free);

	ret = scan_pool(ubi, ai, fmpl2->pebs, wl_pool_size, &max_sqnum, &free);

	if (ret)

		goto fail;
@@ -817,7 +747,6 @@ static int ubi_attach_fastmap(struct ubi_device *ubi, 
	list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &used, u.list)

		list_move_tail(&tmp_aeb->u.list, &ai->erase);



	ubi_assert(list_empty(&eba_orphans));

	ubi_assert(list_empty(&free));



	/*
@@ -839,10 +768,6 @@ static int ubi_attach_fastmap(struct ubi_device *ubi, 
		list_del(&tmp_aeb->u.list);

		kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);

	}

	list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &eba_orphans, u.list) {

		list_del(&tmp_aeb->u.list);

		kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);

	}

	list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &free, u.list) {

		list_del(&tmp_aeb->u.list);

		kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);