ext4/056: add a check to make sure ext4 uuid ioctls get/set during fsstress.
PATCH v3 1/1 ext4/056: add a check to make sure ext4 uuid ioctls get/set during fsstress.
Adds a utility to set/get uuid through ext4 ioctl. Executes the ioctls while running fsstress. These ioctls are used by tune2fs to safely change the uuid without racing other filesystem modifications.
--- .gitignore | 1 + src/Makefile | 4 +- src/uuid_ioctl.c | 104 +++++++++++++++++++++++++++++++++++++++++++++ tests/ext4/056 | 61 ++++++++++++++++++++++++++ tests/ext4/056.out | 2 + 5 files changed, 170 insertions(+), 2 deletions(-) create mode 100644 src/uuid_ioctl.c create mode 100755 tests/ext4/056 create mode 100644 tests/ext4/056.out
.gitignore +1 -0
@@ -169,6 +169,7 @@ tags /src/unwritten_mmap /src/unwritten_sync /src/usemem +/src/uuid_ioctl /src/writemod /src/writev_on_pagefault /src/xfsctl
src/Makefile +2 -2
@@ -31,14 +31,14 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \ dio-invalidate-cache stat_test t_encrypted_d_revalidate \ attr_replace_test swapon mkswap t_attr_corruption t_open_tmpfiles \ fscrypt-crypt-util bulkstat_null_ocount splice-test chprojid_fail \ - detached_mounts_propagation ext4_resize + detached_mounts_propagation ext4_resize uuid_ioctl EXTRA_EXECS = dmerror fill2attr fill2fs fill2fs_check scaleread.sh \ btrfs_crc32c_forged_name.py SUBDIRS = log-writes perf -LLDLIBS = $(LIBHANDLE) $(LIBACL) -lpthread -lrt +LLDLIBS = $(LIBHANDLE) $(LIBACL) -lpthread -lrt -luuid ifeq ($(HAVE_XLOG_ASSIGN_LSN), true) LINUX_TARGETS += loggen
src/uuid_ioctl.c new file +104 -0
104 lines not on this page · raw message
tests/ext4/056 new file +61 -0
61 lines not on this page · raw message
tests/ext4/056.out new file +2 -0
@@ -0,0 +1,2 @@ +QA output created by 056 +Silence is golden
Signature · 1 line
2.37.0.144.g8ac04bfd2-goog
Quoted 170 lines · Jeremy Bongio
Adds a utility to set/get uuid through ext4 ioctl. Executes the ioctls while running fsstress. These ioctls are used by tune2fs to safely change the uuid without racing other filesystem modifications.
Signed-off-by Jeremy Bongio <[email protected]>--- .gitignore | 1 + src/Makefile | 4 +- src/uuid_ioctl.c | 104 +++++++++++++++++++++++++++++++++++++++++++++ tests/ext4/056 | 61 ++++++++++++++++++++++++++ tests/ext4/056.out | 2 + 5 files changed, 170 insertions(+), 2 deletions(-) create mode 100644 src/uuid_ioctl.c create mode 100755 tests/ext4/056 create mode 100644 tests/ext4/056.out.gitignore +1
-0@@ -169,6 +169,7 @@ tags /src/unwritten_mmap /src/unwritten_sync /src/usemem +/src/uuid_ioctl /src/writemod /src/writev_on_pagefault /src/xfsctlsrc/Makefile +2
-2@@ -31,14 +31,14 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \ dio-invalidate-cache stat_test t_encrypted_d_revalidate \ attr_replace_test swapon mkswap t_attr_corruption t_open_tmpfiles \ fscrypt-crypt-util bulkstat_null_ocount splice-test chprojid_fail \ - detached_mounts_propagation ext4_resize + detached_mounts_propagation ext4_resize uuid_ioctl EXTRA_EXECS = dmerror fill2attr fill2fs fill2fs_check scaleread.sh \ btrfs_crc32c_forged_name.py SUBDIRS = log-writes perf -LLDLIBS = $(LIBHANDLE) $(LIBACL) -lpthread -lrt +LLDLIBS = $(LIBHANDLE) $(LIBACL) -lpthread -lrt -luuid ifeq ($(HAVE_XLOG_ASSIGN_LSN), true) LINUX_TARGETS += loggensrc/uuid_ioctl.c new file +104
-0@@ -0,0 +1,104 @@ +// SPDX-License-Identifier: GPL-2.0 + +/* +* Test program which uses the raw ext4 set_fsuuid ioctl directly. +* SYNOPSIS: +* $0 COMMAND MOUNT_POINT [UUID] +* +* COMMAND must be either "get" or "set". +* The UUID must be a 16 octet represented as 32 hexadecimal digits in canonical +* textual representation, e.g. output from `uuidgen`. +* +*/ + +#include <stdio.h> +#include <fcntl.h> +#include <errno.h> +#include <unistd.h> +#include <stdint.h> +#include <stdlib.h> +#include <string.h> +#include <sys/ioctl.h> +#include <uuid/uuid.h> +#include <linux/fs.h> + +struct fsuuid { +__u32 fu_len; +__u32 fu_flags; +__u8 fu_uuid[]; +}; + +#ifndef EXT4_IOC_GETFSUUID +#define EXT4_IOC_GETFSUUID _IOR('f', 44, struct fsuuid) +#endif + +#ifndef EXT4_IOC_SETFSUUID +#define EXT4_IOC_SETFSUUID _IOW('f', 44, struct fsuuid) +#endif + +int main (int argc,char **argv) +{ +int error, fd; +struct fsuuid *fsuuid =NULL ; + +if (argc <3 ) { +fprintf (stderr,"Invalid arguments\n" ); +return 1 ; + } + + fd =open (argv[2 ],O_RDONLY ); +if (!fd) { +perror (argv[2 ]); +return 1 ; + } + + fsuuid =malloc (sizeof (*fsuuid) +sizeof (uuid_t)); +if (!fsuuid) { +perror ("malloc" ); +return 1 ; + } + fsuuid->fu_len =sizeof (uuid_t); + fsuuid->fu_flags =0 ; + +if (strcmp (argv[1 ],"get" ) ==0 ) { +uuid_t uuid; +char uuid_str[37 ]; + +if (ioctl (fd,EXT4_IOC_GETFSUUID , fsuuid)) { +fprintf (stderr,"%s while trying to get fs uuid\n" , +strerror (errno)); +return 1 ; + } + +memcpy (&uuid, fsuuid->fu_uuid,sizeof (uuid)); +uuid_unparse (uuid, uuid_str); +printf ("%s" , uuid_str); + }else if (strcmp (argv[1 ],"set" ) ==0 ) { +uuid_t uuid; + +if (argc !=4 ) { +fprintf (stderr,"UUID argument missing.\n" ); +return 1 ; + } + + error =uuid_parse (argv[3 ], uuid); +if (error <0 ) { +fprintf (stderr,"Invalid UUID. The UUID should be in " +"canonical format. Example: " +"8c628557-6987-42b2-ba16-b7cc79ddfb43\n" ); +return 1 ; + } + +memcpy (&fsuuid->fu_uuid, uuid,sizeof (uuid)); +if (ioctl (fd,EXT4_IOC_SETFSUUID , fsuuid)) { +fprintf (stderr,"%s while trying to set fs uuid\n" , +strerror (errno)); +return 1 ; + } + }else { +fprintf (stderr,"Invalid command\n" ); +return 1 ; + } + +return 0 ; +}tests/ext4/056 new file +5
-0@@ -0,0 +1,61 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# +# Test the set/get UUID ioctl. +#
tests/ext4/056 line 15
Quoted 10 lines
tests/ext4/056 new file +10
-0+ +. ./common/preamble +_begin_fstest auto ioctl + +# Override the default cleanup function. +_cleanup() +{ + cd / + rm -r -f $tmp.* + $KILLALL_PROG -9 $FSSTRESS_PROG > /dev/null 2>&1
Better to refer to generic/390 ($fsstress_pid related part), it's current recommended way to kill fsstress processes (before we have a fsstress_cleanup). Others looks good to me, welcome more review points.
Thanks,
Zorro
Quoted 57 lines
tests/ext4/056 new file +46
-0+} + +# Import common functions. +. ./common/filter + +# real QA test starts here +_supported_fs ext4 +_require_scratch +_require_test_program uuid_ioctl +_require_command $UUIDGEN_PROG uuidgen + +UUID_IOCTL=$here/src/uuid_ioctl + +# If the ioctl is not supported by the kernel, then skip test. +current_uuid=$($UUID_IOCTL get $SCRATCH_MNT 2>&1) +if [[ "$current_uuid" =~ ^Inappropriate[[:space:]]ioctl ]]; then + _notrun "UUID ioctls are not supported by kernel." +fi + +# metadata_csum_seed must be set to decouple checksums from the uuid. +# Otherwise, checksums need to be recomputed when the uuid changes, which +# is not supported by the ioctl. +_scratch_mkfs_ext4 -O metadata_csum_seed >> $seqres.full 2>&1 +_scratch_mount >> $seqres.full + +# Begin fsstress while modifying UUID +fsstress_args=$(_scale_fsstress_args -d $SCRATCH_MNT -p 15 -n 999999) +$FSSTRESS_PROG $fsstress_args > /dev/null 2>&1 & + +for n in $(seq 1 20); do + new_uuid=$($UUIDGEN_PROG) + + echo "Setting UUID to ${new_uuid}" >> $seqres.full 2>&1 + $UUID_IOCTL set $SCRATCH_MNT $new_uuid + + current_uuid=$($UUID_IOCTL get $SCRATCH_MNT) + echo "$UUID_IOCTL get $SCARTCH_MNT: $current_uuid" >> $seqres.full 2>&1 + if [[ "$current_uuid" != "$new_uuid" ]]; then + echo "Current UUID ($current_uuid) does not equal what was sent with the ioctl ($new_uuid)" + fi +done + +# success, all done +echo "Silence is golden" +status=0 +exittests/ext4/056.out new file +2
-0@@ -0,0 +1,2 @@ +QA output created by 056 +Silence is goldenSignature · 1 line
2.37.0.144.g8ac04bfd2-goog
Quoted 55 lines · Jeremy Bongio
Adds a utility to set/get uuid through ext4 ioctl. Executes the ioctls while running fsstress. These ioctls are used by tune2fs to safely change the uuid without racing other filesystem modifications.
Signed-off-by Jeremy Bongio <[email protected]>--- .gitignore | 1 + src/Makefile | 4 +- src/uuid_ioctl.c | 104 +++++++++++++++++++++++++++++++++++++++++++++ tests/ext4/056 | 61 ++++++++++++++++++++++++++ tests/ext4/056.out | 2 + 5 files changed, 170 insertions(+), 2 deletions(-) create mode 100644 src/uuid_ioctl.c create mode 100755 tests/ext4/056 create mode 100644 tests/ext4/056.out.gitignore +1
-0@@ -169,6 +169,7 @@ tags /src/unwritten_mmap /src/unwritten_sync /src/usemem +/src/uuid_ioctl /src/writemod /src/writev_on_pagefault /src/xfsctlsrc/Makefile +2
-2@@ -31,14 +31,14 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \ dio-invalidate-cache stat_test t_encrypted_d_revalidate \ attr_replace_test swapon mkswap t_attr_corruption t_open_tmpfiles \ fscrypt-crypt-util bulkstat_null_ocount splice-test chprojid_fail \ - detached_mounts_propagation ext4_resize + detached_mounts_propagation ext4_resize uuid_ioctl EXTRA_EXECS = dmerror fill2attr fill2fs fill2fs_check scaleread.sh \ btrfs_crc32c_forged_name.py SUBDIRS = log-writes perf -LLDLIBS = $(LIBHANDLE) $(LIBACL) -lpthread -lrt +LLDLIBS = $(LIBHANDLE) $(LIBACL) -lpthread -lrt -luuid ifeq ($(HAVE_XLOG_ASSIGN_LSN), true) LINUX_TARGETS += loggensrc/uuid_ioctl.c new file +0
-0
src/uuid_ioctl.c line 9
Quoted 9 lines
src/uuid_ioctl.c new file +9
-0@@ -0,0 +1,104 @@ +// SPDX-License-Identifier: GPL-2.0 + +/* +* Test program which uses the raw ext4 set_fsuuid ioctl directly. +* SYNOPSIS: +* $0 COMMAND MOUNT_POINT [UUID] +* +* COMMAND must be either "get" or "set". +* The UUID must be a 16 octet represented as 32 hexadecimal digits in canonical
Nit: "16 octet sequence", not just "16 octet" ?
Quoted 56 lines
src/uuid_ioctl.c new file +56
-0+* textual representation, e.g. output from `uuidgen`. +* +*/ + +#include <stdio.h> +#include <fcntl.h> +#include <errno.h> +#include <unistd.h> +#include <stdint.h> +#include <stdlib.h> +#include <string.h> +#include <sys/ioctl.h> +#include <uuid/uuid.h> +#include <linux/fs.h> + +struct fsuuid { +__u32 fu_len; +__u32 fu_flags; +__u8 fu_uuid[]; +}; + +#ifndef EXT4_IOC_GETFSUUID +#define EXT4_IOC_GETFSUUID _IOR('f', 44, struct fsuuid) +#endif + +#ifndef EXT4_IOC_SETFSUUID +#define EXT4_IOC_SETFSUUID _IOW('f', 44, struct fsuuid) +#endif + +int main (int argc,char **argv) +{ +int error, fd; +struct fsuuid *fsuuid =NULL ; + +if (argc <3 ) { +fprintf (stderr,"Invalid arguments\n" ); +return 1 ; + } + + fd =open (argv[2 ],O_RDONLY ); +if (!fd) { +perror (argv[2 ]); +return 1 ; + } + + fsuuid =malloc (sizeof (*fsuuid) +sizeof (uuid_t)); +if (!fsuuid) { +perror ("malloc" ); +return 1 ; + } + fsuuid->fu_len =sizeof (uuid_t); + fsuuid->fu_flags =0 ; + +if (strcmp (argv[1 ],"get" ) ==0 ) { +uuid_t uuid; +char uuid_str[37 ];
src/uuid_ioctl.c line 75
Quoted 10 lines
src/uuid_ioctl.c new file +10
-0+ +if (ioctl (fd,EXT4_IOC_GETFSUUID , fsuuid)) { +fprintf (stderr,"%s while trying to get fs uuid\n" , +strerror (errno)); +return 1 ; + } + +memcpy (&uuid, fsuuid->fu_uuid,sizeof (uuid)); +uuid_unparse (uuid, uuid_str); +printf ("%s" , uuid_str);
printf("%s\n", uuid_str); perhaps?
Quoted 35 lines
src/uuid_ioctl.c new file +29
-0+ }else if (strcmp (argv[1 ],"set" ) ==0 ) { +uuid_t uuid; + +if (argc !=4 ) { +fprintf (stderr,"UUID argument missing.\n" ); +return 1 ; + } + + error =uuid_parse (argv[3 ], uuid); +if (error <0 ) { +fprintf (stderr,"Invalid UUID. The UUID should be in " +"canonical format. Example: " +"8c628557-6987-42b2-ba16-b7cc79ddfb43\n" ); +return 1 ; + } + +memcpy (&fsuuid->fu_uuid, uuid,sizeof (uuid)); +if (ioctl (fd,EXT4_IOC_SETFSUUID , fsuuid)) { +fprintf (stderr,"%s while trying to set fs uuid\n" , +strerror (errno)); +return 1 ; + } + }else { +fprintf (stderr,"Invalid command\n" ); +return 1 ; + } + +return 0 ; +}tests/ext4/056 new file +0
-0
tests/ext4/056 line 4
Quoted 4 lines
tests/ext4/056 new file +4
-0@@ -0,0 +1,61 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# +# Test the set/get UUID ioctl.
It's unusual that there's no copyright or authorship attribution in any of these new files, but perhaps that's deliberate?
tests/ext4/056 line 15
Quoted 11 lines
tests/ext4/056 new file +11
-0+# + +. ./common/preamble +_begin_fstest auto ioctl + +# Override the default cleanup function. +_cleanup() +{ + cd / + rm -r -f $tmp.* + $KILLALL_PROG -9 $FSSTRESS_PROG > /dev/null 2>&1
Same thing Zorro said about using the new generic/390 method of starting and killing fsstress pids.
With those bits fixed up I think this is more or less ready to go.
--D
Quoted 57 lines
tests/ext4/056 new file +46
-0+} + +# Import common functions. +. ./common/filter + +# real QA test starts here +_supported_fs ext4 +_require_scratch +_require_test_program uuid_ioctl +_require_command $UUIDGEN_PROG uuidgen + +UUID_IOCTL=$here/src/uuid_ioctl + +# If the ioctl is not supported by the kernel, then skip test. +current_uuid=$($UUID_IOCTL get $SCRATCH_MNT 2>&1) +if [[ "$current_uuid" =~ ^Inappropriate[[:space:]]ioctl ]]; then + _notrun "UUID ioctls are not supported by kernel." +fi + +# metadata_csum_seed must be set to decouple checksums from the uuid. +# Otherwise, checksums need to be recomputed when the uuid changes, which +# is not supported by the ioctl. +_scratch_mkfs_ext4 -O metadata_csum_seed >> $seqres.full 2>&1 +_scratch_mount >> $seqres.full + +# Begin fsstress while modifying UUID +fsstress_args=$(_scale_fsstress_args -d $SCRATCH_MNT -p 15 -n 999999) +$FSSTRESS_PROG $fsstress_args > /dev/null 2>&1 & + +for n in $(seq 1 20); do + new_uuid=$($UUIDGEN_PROG) + + echo "Setting UUID to ${new_uuid}" >> $seqres.full 2>&1 + $UUID_IOCTL set $SCRATCH_MNT $new_uuid + + current_uuid=$($UUID_IOCTL get $SCRATCH_MNT) + echo "$UUID_IOCTL get $SCARTCH_MNT: $current_uuid" >> $seqres.full 2>&1 + if [[ "$current_uuid" != "$new_uuid" ]]; then + echo "Current UUID ($current_uuid) does not equal what was sent with the ioctl ($new_uuid)" + fi +done + +# success, all done +echo "Silence is golden" +status=0 +exittests/ext4/056.out new file +2
-0@@ -0,0 +1,2 @@ +QA output created by 056 +Silence is goldenSignature · 1 line
2.37.0.144.g8ac04bfd2-goog