Commit 62652517 authored by Quentin Schulz's avatar Quentin Schulz Committed by Richard Weinberger
Browse files

ubi: provide a way to skip CRC checks 



Some users of static UBI volumes implement their own integrity check,
thus making the volume CRC check done at open time useless. For
instance, this is the case when one use the ubiblock + dm-verity +
squashfs combination, where dm-verity already checks integrity of the
block device but this time at the block granularity instead of verifying
the whole volume.

Skipping this test drastically improves the boot-time.

Suggested-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: default avatarQuentin Schulz <quentin.schulz@bootlin.com>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent a3d21828

drivers/mtd/ubi/kapi.c

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ struct ubi_volume_desc *ubi_open_volume(int ubi_num, int vol_id, int mode) 
	desc->mode = mode;



	mutex_lock(&ubi->ckvol_mutex);

	if (!vol->checked) {

	if (!vol->checked && !vol->skip_check) {

		/* This is the first open - check the volume */

		err = ubi_check_volume(ubi, vol_id);

		if (err < 0) {

drivers/mtd/ubi/ubi-media.h

+6 −0
Original line number Diff line number Diff line
@@ -45,6 +45,11 @@ enum { 
 * Volume flags used in the volume table record.

 *

 * @UBI_VTBL_AUTORESIZE_FLG: auto-resize this volume

 * @UBI_VTBL_SKIP_CRC_CHECK_FLG: skip the CRC check done on a static volume at

 *				 open time. Should only be set on volumes that

 *				 are used by upper layers doing this kind of

 *				 check. Main use-case for this flag is

 *				 boot-time reduction

 *

 * %UBI_VTBL_AUTORESIZE_FLG flag can be set only for one volume in the volume

 * table. UBI automatically re-sizes the volume which has this flag and makes
@@ -76,6 +81,7 @@ enum { 
 */

enum {

	UBI_VTBL_AUTORESIZE_FLG = 0x01,

	UBI_VTBL_SKIP_CRC_CHECK_FLG = 0x02,

};



/*

drivers/mtd/ubi/ubi.h

+4 −0
Original line number Diff line number Diff line
@@ -327,6 +327,9 @@ struct ubi_eba_leb_desc { 
 *           atomic LEB change

 *

 * @eba_tbl: EBA table of this volume (LEB->PEB mapping)

 * @skip_check: %1 if CRC check of this static volume should be skipped.

 *		Directly reflects the presence of the

 *		%UBI_VTBL_SKIP_CRC_CHECK_FLG flag in the vtbl entry

 * @checked: %1 if this static volume was checked

 * @corrupted: %1 if the volume is corrupted (static volumes only)

 * @upd_marker: %1 if the update marker is set for this volume
@@ -374,6 +377,7 @@ struct ubi_volume { 
	void *upd_buf;



	struct ubi_eba_table *eba_tbl;

	unsigned int skip_check:1;

	unsigned int checked:1;

	unsigned int corrupted:1;

	unsigned int upd_marker:1;

drivers/mtd/ubi/vmt.c

+9 −0
Original line number Diff line number Diff line
@@ -299,6 +299,10 @@ int ubi_create_volume(struct ubi_device *ubi, struct ubi_mkvol_req *req) 
		vtbl_rec.vol_type = UBI_VID_DYNAMIC;

	else

		vtbl_rec.vol_type = UBI_VID_STATIC;



	if (vol->skip_check)

		vtbl_rec.flags |= UBI_VTBL_SKIP_CRC_CHECK_FLG;



	memcpy(vtbl_rec.name, vol->name, vol->name_len);



	err = ubi_change_vtbl_record(ubi, vol_id, &vtbl_rec);
@@ -733,6 +737,11 @@ static int self_check_volume(struct ubi_device *ubi, int vol_id) 
			ubi_err(ubi, "bad used_bytes");

			goto fail;

		}



		if (vol->skip_check) {

			ubi_err(ubi, "bad skip_check");

			goto fail;

		}

	} else {

		if (vol->used_ebs < 0 || vol->used_ebs > vol->reserved_pebs) {

			ubi_err(ubi, "bad used_ebs");

drivers/mtd/ubi/vtbl.c

+3 −0
Original line number Diff line number Diff line
@@ -560,6 +560,9 @@ static int init_volumes(struct ubi_device *ubi, 
		vol->name[vol->name_len] = '\0';

		vol->vol_id = i;



		if (vtbl[i].flags & UBI_VTBL_SKIP_CRC_CHECK_FLG)

			vol->skip_check = 1;



		if (vtbl[i].flags & UBI_VTBL_AUTORESIZE_FLG) {

			/* Auto re-size flag may be set only for one volume */

			if (ubi->autoresize_vol_id != -1) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE