Commit 235c362b authored by Sheng Yong's avatar Sheng Yong Committed by Artem Bityutskiy
Browse files

UBIFS: extend debug/message capabilities 



In the case where we have more than one volumes on different UBI
devices, it may be not that easy to tell which volume prints the
messages.  Add ubi number and volume id in ubifs_msg/warn/error
to help debug. These two values are passed by struct ubifs_info.

For those where ubifs_info is not initialized yet, ubifs_* is
replaced by pr_*. For those where ubifs_info is not avaliable,
ubifs_info is passed to the calling function as a const parameter.

The output looks like,

[   95.444879] UBIFS (ubi0:1): background thread "ubifs_bgt0_1" started, PID 696
[   95.484688] UBIFS (ubi0:1): UBIFS: mounted UBI device 0, volume 1, name "test1"
[   95.484694] UBIFS (ubi0:1): LEB size: 126976 bytes (124 KiB), min./max. I/O unit sizes: 2048 bytes/2048 bytes
[   95.484699] UBIFS (ubi0:1): FS size: 30220288 bytes (28 MiB, 238 LEBs), journal size 1523712 bytes (1 MiB, 12 LEBs)
[   95.484703] UBIFS (ubi0:1): reserved for root: 1427378 bytes (1393 KiB)
[   95.484709] UBIFS (ubi0:1): media format: w4/r0 (latest is w4/r0), UUID 40DFFC0E-70BE-4193-8905-F7D6DFE60B17, small LPT model
[   95.489875] UBIFS (ubi1:0): background thread "ubifs_bgt1_0" started, PID 699
[   95.529713] UBIFS (ubi1:0): UBIFS: mounted UBI device 1, volume 0, name "test2"
[   95.529718] UBIFS (ubi1:0): LEB size: 126976 bytes (124 KiB), min./max. I/O unit sizes: 2048 bytes/2048 bytes
[   95.529724] UBIFS (ubi1:0): FS size: 19808256 bytes (18 MiB, 156 LEBs), journal size 1015809 bytes (0 MiB, 8 LEBs)
[   95.529727] UBIFS (ubi1:0): reserved for root: 935592 bytes (913 KiB)
[   95.529733] UBIFS (ubi1:0): media format: w4/r0 (latest is w4/r0), UUID EEB7779D-F419-4CA9-811B-831CAC7233D4, small LPT model

[  954.264767] UBIFS error (ubi1:0 pid 756): ubifs_read_node: bad node type (255 but expected 6)
[  954.367030] UBIFS error (ubi1:0 pid 756): ubifs_read_node: bad node at LEB 0:0, LEB mapping status 1

Signed-off-by: default avatarSheng Yong <shengyong1@huawei.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent 8a87dc55

fs/ubifs/budget.c

+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ again: 
			c->bi.nospace_rp = 1;

		smp_wmb();

	} else

		ubifs_err("cannot budget space, error %d", err);

		ubifs_err(c, "cannot budget space, error %d", err);

	return err;

}

fs/ubifs/commit.c

+6 −6
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ out_cancel: 
out_up:

	up_write(&c->commit_sem);

out:

	ubifs_err("commit failed, error %d", err);

	ubifs_err(c, "commit failed, error %d", err);

	spin_lock(&c->cs_lock);

	c->cmt_state = COMMIT_BROKEN;

	wake_up(&c->cmt_wq);
@@ -289,7 +289,7 @@ int ubifs_bg_thread(void *info) 
	int err;

	struct ubifs_info *c = info;



	ubifs_msg("background thread \"%s\" started, PID %d",

	ubifs_msg(c, "background thread \"%s\" started, PID %d",

		  c->bgt_name, current->pid);

	set_freezable();
@@ -324,7 +324,7 @@ int ubifs_bg_thread(void *info) 
		cond_resched();

	}



	ubifs_msg("background thread \"%s\" stops", c->bgt_name);

	ubifs_msg(c, "background thread \"%s\" stops", c->bgt_name);

	return 0;

}
@@ -712,13 +712,13 @@ out: 
	return 0;



out_dump:

	ubifs_err("dumping index node (iip=%d)", i->iip);

	ubifs_err(c, "dumping index node (iip=%d)", i->iip);

	ubifs_dump_node(c, idx);

	list_del(&i->list);

	kfree(i);

	if (!list_empty(&list)) {

		i = list_entry(list.prev, struct idx_node, list);

		ubifs_err("dumping parent index node");

		ubifs_err(c, "dumping parent index node");

		ubifs_dump_node(c, &i->idx);

	}

out_free:
@@ -727,7 +727,7 @@ out_free: 
		list_del(&i->list);

		kfree(i);

	}

	ubifs_err("failed, error %d", err);

	ubifs_err(c, "failed, error %d", err);

	if (err > 0)

		err = -EINVAL;

	return err;

fs/ubifs/compress.c

+11 −11
Original line number Diff line number Diff line
@@ -92,8 +92,8 @@ struct ubifs_compressor *ubifs_compressors[UBIFS_COMPR_TYPES_CNT]; 
 * Note, if the input buffer was not compressed, it is copied to the output

 * buffer and %UBIFS_COMPR_NONE is returned in @compr_type.

 */

void ubifs_compress(const void *in_buf, int in_len, void *out_buf, int *out_len,

		    int *compr_type)

void ubifs_compress(const struct ubifs_info *c, const void *in_buf,

		    int in_len, void *out_buf, int *out_len, int *compr_type)

{

	int err;

	struct ubifs_compressor *compr = ubifs_compressors[*compr_type];
@@ -112,7 +112,7 @@ void ubifs_compress(const void *in_buf, int in_len, void *out_buf, int *out_len, 
	if (compr->comp_mutex)

		mutex_unlock(compr->comp_mutex);

	if (unlikely(err)) {

		ubifs_warn("cannot compress %d bytes, compressor %s, error %d, leave data uncompressed",

		ubifs_warn(c, "cannot compress %d bytes, compressor %s, error %d, leave data uncompressed",

			   in_len, compr->name, err);

		goto no_compr;

	}
@@ -144,21 +144,21 @@ no_compr: 
 * The length of the uncompressed data is returned in @out_len. This functions

 * returns %0 on success or a negative error code on failure.

 */

int ubifs_decompress(const void *in_buf, int in_len, void *out_buf,

		     int *out_len, int compr_type)

int ubifs_decompress(const struct ubifs_info *c, const void *in_buf,

		     int in_len, void *out_buf, int *out_len, int compr_type)

{

	int err;

	struct ubifs_compressor *compr;



	if (unlikely(compr_type < 0 || compr_type >= UBIFS_COMPR_TYPES_CNT)) {

		ubifs_err("invalid compression type %d", compr_type);

		ubifs_err(c, "invalid compression type %d", compr_type);

		return -EINVAL;

	}



	compr = ubifs_compressors[compr_type];



	if (unlikely(!compr->capi_name)) {

		ubifs_err("%s compression is not compiled in", compr->name);

		ubifs_err(c, "%s compression is not compiled in", compr->name);

		return -EINVAL;

	}
@@ -175,7 +175,7 @@ int ubifs_decompress(const void *in_buf, int in_len, void *out_buf, 
	if (compr->decomp_mutex)

		mutex_unlock(compr->decomp_mutex);

	if (err)

		ubifs_err("cannot decompress %d bytes, compressor %s, error %d",

		ubifs_err(c, "cannot decompress %d bytes, compressor %s, error %d",

			  in_len, compr->name, err);



	return err;
@@ -193,8 +193,8 @@ static int __init compr_init(struct ubifs_compressor *compr) 
	if (compr->capi_name) {

		compr->cc = crypto_alloc_comp(compr->capi_name, 0, 0);

		if (IS_ERR(compr->cc)) {

			ubifs_err("cannot initialize compressor %s, error %ld",

				  compr->name, PTR_ERR(compr->cc));

			pr_err("UBIFS error (pid %d): cannot initialize compressor %s, error %ld",

			       current->pid, compr->name, PTR_ERR(compr->cc));

			return PTR_ERR(compr->cc);

		}

	}

fs/ubifs/debug.c

+93 −93

File changed.

Preview size limit exceeded, changes collapsed.

fs/ubifs/dir.c

+6 −6

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE