| Message ID | 20170531085433.26865-3-david.oberhollenzer@sigma-star.at |
|---|---|
| State | Not Applicable |
| Headers | show |
On Wed, May 31, 2017 at 10:54:31AM +0200, David Oberhollenzer wrote: > UBIFS is a filesystem for unmanaged flash memory devices. It works on top of > UBI (Unsorted Block Images) which is a wear leveling and volume management > layer on top of flash memory devices, which are handled by the MTD subsystem > (memory technology device). > > Since the semantics of flash devices are drastically different from regular > block devices (blocks or "pages" must be erased before writing, only larger > groups of pages or "erase blocks" can be erased at once, page write must be > in order within an erase block, etc...) it was decided to expose MTD devices > as character devices with ioctls for operations like erase. > > Since erasing a flash erase block causes physical wear on the device, > eventually causing the erase blocks to go bad, the UBI layer provides mainly > transparent wear leveling on top of MTD devices. UBI does not attempt to > emulate a regular block device, but rather something like a flash memory with > idealized characteristics that can be partitioned into multiple UBI volumes > in a fashion somewhat similar to LVM. UBI volumes are also exposed to user > space as character devices. > > This patch mainly deals with some quirks of UBIFS like working on top of > character devices instead of block devices. Also UBIFS automatically formats > UBI devices when trying to mount an empty device. The mkfs.ubifs program is > mainly used for creating images. This patch changes _scratch_mkfs and > _scratch_mkfs_encrypted to truncate the UBI volume instead, relying on the > kernel to reformat it on the next mount. > > For _scratch_mkfs_encrypted this is actually required to get the encryption > tests to run, because mkfs.ubifs, at the time of writing this, the kernel > support for UBIFS encryption is fairly recent and mkfs.ubifs does not have > proper support yet. > > Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at> > --- > check | 2 ++ > common/config | 16 +++++++++++++--- > common/encrypt | 4 ++++ > common/rc | 34 ++++++++++++++++++++++++++++++++++ > 4 files changed, 53 insertions(+), 3 deletions(-) > > diff --git a/check b/check > index 9cef58b4..f8db3cd6 100755 > --- a/check > +++ b/check > @@ -70,6 +70,7 @@ check options > -overlay test overlay > -pvfs2 test PVFS2 > -tmpfs test TMPFS > + -ubifs test ubifs > -l line mode diff > -udiff show unified diff (default) > -n show me, do not run tests > @@ -267,6 +268,7 @@ while [ $# -gt 0 ]; do > -overlay) FSTYP=overlay; export OVERLAY=true ;; > -pvfs2) FSTYP=pvfs2 ;; > -tmpfs) FSTYP=tmpfs ;; > + -ubifs) FSTYP=ubifs ;; > > -g) group=$2 ; shift ; > GROUP_LIST="$GROUP_LIST ${group//,/ }" > diff --git a/common/config b/common/config > index 8211356c..5bf3f65f 100644 > --- a/common/config > +++ b/common/config > @@ -320,6 +320,9 @@ _mount_opts() > # We need to specify the size at mount, use 1G by default > export MOUNT_OPTIONS="-o size=1G $TMPFS_MOUNT_OPTIONS" > ;; > + ubifs) > + export MOUNT_OPTIONS=$UBIFS_MOUNT_OPTIONS > + ;; > *) > ;; > esac > @@ -455,13 +458,20 @@ _check_device() > return 0 > fi > > - if [ "$FSTYP" == "overlay" ]; then > + case "$FSTYP" in > + overlay) > if [ ! -d "$dev" ]; then > _fatal "common/config: $name ($dev) is not a directory for overlay" > fi > - else > + ;; > + ubifs) > + if [ ! -c "$dev" ]; then > + _fatal "common/config: $name ($dev) is not a character device" > + fi > + ;; > + *) > _fatal "common/config: $name ($dev) is not a block device or a network filesystem" > - fi > + esac > } > > # check and return a canonical mount point path > diff --git a/common/encrypt b/common/encrypt > index 723f1b11..83ef918a 100644 > --- a/common/encrypt > +++ b/common/encrypt > @@ -71,6 +71,10 @@ _scratch_mkfs_encrypted() > ext4|f2fs) > _scratch_mkfs -O encrypt > ;; > + ubifs) > + # erase the UBI volume; reformated automatically on next mount > + ubiupdatevol ${SCRATCH_DEV} -t $UBIUPDATEVOL_PROG ${SCRATCH_DEV} -t, see below. > + ;; > *) > _notrun "No encryption support for $FSTYP" > ;; > diff --git a/common/rc b/common/rc > index ae8ea550..7a97e5d6 100644 > --- a/common/rc > +++ b/common/rc > @@ -176,6 +176,11 @@ case "$FSTYP" in > ;; > pvfs2) > ;; > + ubifs) > + if ! type "ubiupdatevol" > /dev/null; then > + _fatal "mtd-utils ubiupdatevol not found" > + fi > + ;; Please define a UBIUPDATEVOL_PROG in common/rc and check for $UBIUPDATEVOL_PROG here, like other fs types do. Once it's validated, we can use $UBIUPDATEVOL_PROG elsewhere in fstests. Thanks, Eryu > esac > > if [ ! -z "$REPORT_LIST" ]; then > @@ -812,6 +817,11 @@ _scratch_mkfs() > # do nothing for tmpfs > return 0 > ;; > + ubifs) > + # erase the UBI volume; reformated automatically on next mount > + ubiupdatevol ${SCRATCH_DEV} -t > + return 0 > + ;; > ext4) > _scratch_mkfs_ext4 $* > return $? > @@ -1576,6 +1586,15 @@ _require_scratch_nocheck() > _notrun "this test requires a valid \$SCRATCH_MNT and unique $SCRATCH_DEV" > fi > ;; > + ubifs) > + # ubifs needs an UBI volume. This will be a char device, not a block device. > + if [ ! -c "$SCRATCH_DEV" ]; then > + _notrun "this test requires a valid UBI volume for \$SCRATCH_DEV" > + fi > + if [ ! -d "$SCRATCH_MNT" ]; then > + _notrun "this test requires a valid \$SCRATCH_MNT" > + fi > + ;; > *) > if [ -z "$SCRATCH_DEV" -o "`_is_block_dev "$SCRATCH_DEV"`" = "" ] > then > @@ -1670,6 +1689,15 @@ _require_test() > _notrun "this test requires a valid \$TEST_DIR and unique $TEST_DEV" > fi > ;; > + ubifs) > + # ubifs needs an UBI volume. This will be a char device, not a block device. > + if [ ! -c "$TEST_DEV" ]; then > + _notrun "this test requires a valid UBI volume for \$TEST_DEV" > + fi > + if [ ! -d "$TEST_DIR" ]; then > + _notrun "this test requires a valid \$TEST_DIR" > + fi > + ;; > *) > if [ -z "$TEST_DEV" ] || [ "`_is_block_dev "$TEST_DEV"`" = "" ] > then > @@ -2555,6 +2583,9 @@ _check_test_fs() > tmpfs) > # no way to check consistency for tmpfs > ;; > + ubifs) > + # there is no fsck program for ubifs yet > + ;; > *) > _check_generic_filesystem $TEST_DEV > ;; > @@ -2604,6 +2635,9 @@ _check_scratch_fs() > tmpfs) > # no way to check consistency for tmpfs > ;; > + ubifs) > + # there is no fsck program for ubifs yet > + ;; > *) > _check_generic_filesystem $device > ;; > -- > 2.12.0 > > -- > To unsubscribe from this list: send the line "unsubscribe fstests" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/check b/check index 9cef58b4..f8db3cd6 100755 --- a/check +++ b/check @@ -70,6 +70,7 @@ check options -overlay test overlay -pvfs2 test PVFS2 -tmpfs test TMPFS + -ubifs test ubifs -l line mode diff -udiff show unified diff (default) -n show me, do not run tests @@ -267,6 +268,7 @@ while [ $# -gt 0 ]; do -overlay) FSTYP=overlay; export OVERLAY=true ;; -pvfs2) FSTYP=pvfs2 ;; -tmpfs) FSTYP=tmpfs ;; + -ubifs) FSTYP=ubifs ;; -g) group=$2 ; shift ; GROUP_LIST="$GROUP_LIST ${group//,/ }" diff --git a/common/config b/common/config index 8211356c..5bf3f65f 100644 --- a/common/config +++ b/common/config @@ -320,6 +320,9 @@ _mount_opts() # We need to specify the size at mount, use 1G by default export MOUNT_OPTIONS="-o size=1G $TMPFS_MOUNT_OPTIONS" ;; + ubifs) + export MOUNT_OPTIONS=$UBIFS_MOUNT_OPTIONS + ;; *) ;; esac @@ -455,13 +458,20 @@ _check_device() return 0 fi - if [ "$FSTYP" == "overlay" ]; then + case "$FSTYP" in + overlay) if [ ! -d "$dev" ]; then _fatal "common/config: $name ($dev) is not a directory for overlay" fi - else + ;; + ubifs) + if [ ! -c "$dev" ]; then + _fatal "common/config: $name ($dev) is not a character device" + fi + ;; + *) _fatal "common/config: $name ($dev) is not a block device or a network filesystem" - fi + esac } # check and return a canonical mount point path diff --git a/common/encrypt b/common/encrypt index 723f1b11..83ef918a 100644 --- a/common/encrypt +++ b/common/encrypt @@ -71,6 +71,10 @@ _scratch_mkfs_encrypted() ext4|f2fs) _scratch_mkfs -O encrypt ;; + ubifs) + # erase the UBI volume; reformated automatically on next mount + ubiupdatevol ${SCRATCH_DEV} -t + ;; *) _notrun "No encryption support for $FSTYP" ;; diff --git a/common/rc b/common/rc index ae8ea550..7a97e5d6 100644 --- a/common/rc +++ b/common/rc @@ -176,6 +176,11 @@ case "$FSTYP" in ;; pvfs2) ;; + ubifs) + if ! type "ubiupdatevol" > /dev/null; then + _fatal "mtd-utils ubiupdatevol not found" + fi + ;; esac if [ ! -z "$REPORT_LIST" ]; then @@ -812,6 +817,11 @@ _scratch_mkfs() # do nothing for tmpfs return 0 ;; + ubifs) + # erase the UBI volume; reformated automatically on next mount + ubiupdatevol ${SCRATCH_DEV} -t + return 0 + ;; ext4) _scratch_mkfs_ext4 $* return $? @@ -1576,6 +1586,15 @@ _require_scratch_nocheck() _notrun "this test requires a valid \$SCRATCH_MNT and unique $SCRATCH_DEV" fi ;; + ubifs) + # ubifs needs an UBI volume. This will be a char device, not a block device. + if [ ! -c "$SCRATCH_DEV" ]; then + _notrun "this test requires a valid UBI volume for \$SCRATCH_DEV" + fi + if [ ! -d "$SCRATCH_MNT" ]; then + _notrun "this test requires a valid \$SCRATCH_MNT" + fi + ;; *) if [ -z "$SCRATCH_DEV" -o "`_is_block_dev "$SCRATCH_DEV"`" = "" ] then @@ -1670,6 +1689,15 @@ _require_test() _notrun "this test requires a valid \$TEST_DIR and unique $TEST_DEV" fi ;; + ubifs) + # ubifs needs an UBI volume. This will be a char device, not a block device. + if [ ! -c "$TEST_DEV" ]; then + _notrun "this test requires a valid UBI volume for \$TEST_DEV" + fi + if [ ! -d "$TEST_DIR" ]; then + _notrun "this test requires a valid \$TEST_DIR" + fi + ;; *) if [ -z "$TEST_DEV" ] || [ "`_is_block_dev "$TEST_DEV"`" = "" ] then @@ -2555,6 +2583,9 @@ _check_test_fs() tmpfs) # no way to check consistency for tmpfs ;; + ubifs) + # there is no fsck program for ubifs yet + ;; *) _check_generic_filesystem $TEST_DEV ;; @@ -2604,6 +2635,9 @@ _check_scratch_fs() tmpfs) # no way to check consistency for tmpfs ;; + ubifs) + # there is no fsck program for ubifs yet + ;; *) _check_generic_filesystem $device ;;
UBIFS is a filesystem for unmanaged flash memory devices. It works on top of UBI (Unsorted Block Images) which is a wear leveling and volume management layer on top of flash memory devices, which are handled by the MTD subsystem (memory technology device). Since the semantics of flash devices are drastically different from regular block devices (blocks or "pages" must be erased before writing, only larger groups of pages or "erase blocks" can be erased at once, page write must be in order within an erase block, etc...) it was decided to expose MTD devices as character devices with ioctls for operations like erase. Since erasing a flash erase block causes physical wear on the device, eventually causing the erase blocks to go bad, the UBI layer provides mainly transparent wear leveling on top of MTD devices. UBI does not attempt to emulate a regular block device, but rather something like a flash memory with idealized characteristics that can be partitioned into multiple UBI volumes in a fashion somewhat similar to LVM. UBI volumes are also exposed to user space as character devices. This patch mainly deals with some quirks of UBIFS like working on top of character devices instead of block devices. Also UBIFS automatically formats UBI devices when trying to mount an empty device. The mkfs.ubifs program is mainly used for creating images. This patch changes _scratch_mkfs and _scratch_mkfs_encrypted to truncate the UBI volume instead, relying on the kernel to reformat it on the next mount. For _scratch_mkfs_encrypted this is actually required to get the encryption tests to run, because mkfs.ubifs, at the time of writing this, the kernel support for UBIFS encryption is fairly recent and mkfs.ubifs does not have proper support yet. Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at> --- check | 2 ++ common/config | 16 +++++++++++++--- common/encrypt | 4 ++++ common/rc | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 3 deletions(-)