Commit be9e62a7 authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

UBIFS: improve lprops dump 



Improve 'dbg_dump_lprop()' and print dark and dead space there,
decode flags, and journal heads.

Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent 055da1b7

fs/ubifs/debug.c

+84 −3
Original line number Diff line number Diff line
@@ -663,9 +663,90 @@ void dbg_dump_budg(struct ubifs_info *c) 


void dbg_dump_lprop(const struct ubifs_info *c, const struct ubifs_lprops *lp)

{

	printk(KERN_DEBUG "LEB %d lprops: free %d, dirty %d (used %d), "

	       "flags %#x\n", lp->lnum, lp->free, lp->dirty,

	       c->leb_size - lp->free - lp->dirty, lp->flags);

	int i, spc, dark = 0, dead = 0;

	struct rb_node *rb;

	struct ubifs_bud *bud;



	spc = lp->free + lp->dirty;

	if (spc < c->dead_wm)

		dead = spc;

	else

		dark = ubifs_calc_dark(c, spc);



	if (lp->flags & LPROPS_INDEX)

		printk(KERN_DEBUG "LEB %-7d free %-8d dirty %-8d used %-8d "

		       "free + dirty %-8d flags %#x (", lp->lnum, lp->free,

		       lp->dirty, c->leb_size - spc, spc, lp->flags);

	else

		printk(KERN_DEBUG "LEB %-7d free %-8d dirty %-8d used %-8d "

		       "free + dirty %-8d dark %-4d dead %-4d nodes fit %-3d "

		       "flags %#-4x (", lp->lnum, lp->free, lp->dirty,

		       c->leb_size - spc, spc, dark, dead,

		       (int)(spc / UBIFS_MAX_NODE_SZ), lp->flags);



	if (lp->flags & LPROPS_TAKEN) {

		if (lp->flags & LPROPS_INDEX)

			printk(KERN_CONT "index, taken");

		else

			printk(KERN_CONT "taken");

	} else {

		const char *s;



		if (lp->flags & LPROPS_INDEX) {

			switch (lp->flags & LPROPS_CAT_MASK) {

			case LPROPS_DIRTY_IDX:

				s = "dirty index";

				break;

			case LPROPS_FRDI_IDX:

				s = "freeable index";

				break;

			default:

				s = "index";

			}

		} else {

			switch (lp->flags & LPROPS_CAT_MASK) {

			case LPROPS_UNCAT:

				s = "not categorized";

				break;

			case LPROPS_DIRTY:

				s = "dirty";

				break;

			case LPROPS_FREE:

				s = "free";

				break;

			case LPROPS_EMPTY:

				s = "empty";

				break;

			case LPROPS_FREEABLE:

				s = "freeable";

				break;

			default:

				s = NULL;

				break;

			}

		}

		printk(KERN_CONT "%s", s);

	}



	for (rb = rb_first((struct rb_root *)&c->buds); rb; rb = rb_next(rb)) {

		bud = rb_entry(rb, struct ubifs_bud, rb);

		if (bud->lnum == lp->lnum) {

			int head = 0;

			for (i = 0; i < c->jhead_cnt; i++) {

				if (lp->lnum == c->jheads[i].wbuf.lnum) {

					printk(KERN_CONT ", jhead %s",

					       dbg_jhead(i));

					head = 1;

				}

			}

			if (!head)

				printk(KERN_CONT ", bud of jhead %s",

				       dbg_jhead(bud->jhead));

		}

	}

	if (lp->lnum == c->gc_lnum)

		printk(KERN_CONT ", GC LEB");

	printk(KERN_CONT ")\n");

}



void dbg_dump_lprops(struct ubifs_info *c)

fs/ubifs/lprops.c

+12 −15
Original line number Diff line number Diff line
@@ -461,21 +461,18 @@ static void change_category(struct ubifs_info *c, struct ubifs_lprops *lprops) 
}



/**

 * calc_dark - calculate LEB dark space size.

 * ubifs_calc_dark - calculate LEB dark space size.

 * @c: the UBIFS file-system description object

 * @spc: amount of free and dirty space in the LEB

 *

 * This function calculates amount of dark space in an LEB which has @spc bytes

 * of free and dirty space. Returns the calculations result.

 * This function calculates and returns amount of dark space in an LEB which

 * has @spc bytes of free and dirty space.

 *

 * Dark space is the space which is not always usable - it depends on which

 * nodes are written in which order. E.g., if an LEB has only 512 free bytes,

 * it is dark space, because it cannot fit a large data node. So UBIFS cannot

 * count on this LEB and treat these 512 bytes as usable because it is not true

 * if, for example, only big chunks of uncompressible data will be written to

 * the FS.

 * UBIFS is trying to account the space which might not be usable, and this

 * space is called "dark space". For example, if an LEB has only %512 free

 * bytes, it is dark space, because it cannot fit a large data node.

 */

static int calc_dark(struct ubifs_info *c, int spc)

int ubifs_calc_dark(const struct ubifs_info *c, int spc)

{

	ubifs_assert(!(spc & 7));
@@ -575,7 +572,7 @@ const struct ubifs_lprops *ubifs_change_lp(struct ubifs_info *c, 
		if (old_spc < c->dead_wm)

			c->lst.total_dead -= old_spc;

		else

			c->lst.total_dark -= calc_dark(c, old_spc);

			c->lst.total_dark -= ubifs_calc_dark(c, old_spc);



		c->lst.total_used -= c->leb_size - old_spc;

	}
@@ -616,7 +613,7 @@ const struct ubifs_lprops *ubifs_change_lp(struct ubifs_info *c, 
		if (new_spc < c->dead_wm)

			c->lst.total_dead += new_spc;

		else

			c->lst.total_dark += calc_dark(c, new_spc);

			c->lst.total_dark += ubifs_calc_dark(c, new_spc);



		c->lst.total_used += c->leb_size - new_spc;

	}
@@ -1107,7 +1104,7 @@ static int scan_check_cb(struct ubifs_info *c, 
				  "- continuing checking");

			lst->empty_lebs += 1;

			lst->total_free += c->leb_size;

			lst->total_dark += calc_dark(c, c->leb_size);

			lst->total_dark += ubifs_calc_dark(c, c->leb_size);

			return LPT_SCAN_CONTINUE;

		}
@@ -1117,7 +1114,7 @@ static int scan_check_cb(struct ubifs_info *c, 
				  "- continuing checking");

			lst->total_free  += lp->free;

			lst->total_dirty += lp->dirty;

			lst->total_dark  +=  calc_dark(c, c->leb_size);

			lst->total_dark  +=  ubifs_calc_dark(c, c->leb_size);

			return LPT_SCAN_CONTINUE;

		}

		data->err = PTR_ERR(sleb);
@@ -1235,7 +1232,7 @@ static int scan_check_cb(struct ubifs_info *c, 
		if (spc < c->dead_wm)

			lst->total_dead += spc;

		else

			lst->total_dark += calc_dark(c, spc);

			lst->total_dark += ubifs_calc_dark(c, spc);

	}



	ubifs_scan_destroy(sleb);

fs/ubifs/ubifs.h

+1 −0
Original line number Diff line number Diff line
@@ -1674,6 +1674,7 @@ const struct ubifs_lprops *ubifs_fast_find_free(struct ubifs_info *c); 
const struct ubifs_lprops *ubifs_fast_find_empty(struct ubifs_info *c);

const struct ubifs_lprops *ubifs_fast_find_freeable(struct ubifs_info *c);

const struct ubifs_lprops *ubifs_fast_find_frdi_idx(struct ubifs_info *c);

int ubifs_calc_dark(const struct ubifs_info *c, int spc);



/* file.c */

int ubifs_fsync(struct file *file, struct dentry *dentry, int datasync);