Recent changes (master)
The following changes since commit df0ab55ff9e28f4b85c199e207aec904f8a76440:
Merge branch 'master' of https://github.com/dpronin/fio (2022-03-09 06:20:31 -0700)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 16b1e24562347d371d6d62e0bb9a03ad4e2a8a96:
t/dedupe: handle errors more gracefully (2022-03-11 05:09:20 -0700)
----------------------------------------------------------------
Denis Pronin (4):
configure script refactoring
improvements in dup_files function
fixed memory leak detected by ASAN
ASAN enabling when configuring
Jens Axboe (7):
Merge branch 'master' of https://github.com/dpronin/fio
Merge branch 'refactoring/configure' of https://github.com/dpronin/fio
Merge branch 'improvement/prevent-sigsegv-when-dup-files' of https://github.com/dpronin/fio
Merge branch 'improvement/enable-asan' of https://github.com/dpronin/fio
t/io_uring: only enable sync if we have preadv2
Merge branch 'fuzz-cleanup' of https://github.com/vincentkfu/fio
t/dedupe: handle errors more gracefully
Vincent Fu (1):
fuzz: avoid building t/fuzz/parse_ini by default
Makefile | 8 +++++++- backend.c | 6 ++++++ configure | 14 ++++++++++---- filesetup.c | 3 ++- t/dedupe.c | 57 +++++++++++++++++++++++++++++++++++---------------------- t/io_uring.c | 13 +++++++++++++ 6 files changed, 73 insertions(+), 28 deletions(-)
---
Diff of recent changes:
Makefile +7 -1
@@ -385,14 +385,16 @@ T_MEMLOCK_PROGS = t/memlock T_TT_OBJS = t/time-test.o T_TT_PROGS = t/time-test +ifneq (,$(findstring -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION,$(CFLAGS))) T_FUZZ_OBJS = t/fuzz/fuzz_parseini.o T_FUZZ_OBJS += $(OBJS) ifdef CONFIG_ARITHMETIC T_FUZZ_OBJS += lex.yy.o y.tab.o endif +# For proper fio code teardown CFLAGS needs to include -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION # in case there is no fuzz driver defined by environment variable LIB_FUZZING_ENGINE, use a simple one # For instance, with compiler clang, address sanitizer and libFuzzer as a fuzzing engine, you should define -# export CFLAGS="-fsanitize=address,fuzzer-no-link" +# export CFLAGS="-fsanitize=address,fuzzer-no-link -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" # export LIB_FUZZING_ENGINE="-fsanitize=address" # export CC=clang # before running configure && make
@@ -401,6 +403,10 @@ ifndef LIB_FUZZING_ENGINE T_FUZZ_OBJS += t/fuzz/onefile.o endif T_FUZZ_PROGS = t/fuzz/fuzz_parseini +else # CFLAGS includes -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION +T_FUZZ_OBJS = +T_FUZZ_PROGS = +endif T_OBJS = $(T_SMALLOC_OBJS) T_OBJS += $(T_IEEE_OBJS)
backend.c +6 -0
@@ -2432,7 +2432,10 @@ reap: strerror(ret)); }else {pid_t pid; +struct fio_file **files;dprint (FD_PROCESS ,"will fork\n" ); + files = td->files; +read_barrier (); pid =fork ();if (!pid) {int ret;
@@ -2441,6 +2444,9 @@ reap:_exit (ret); }else if (i == fio_debug_jobno) *fio_debug_jobp = pid; +// freeing previously allocated memory for files +// this memory freed MUST NOT be shared between processes, only the pointer itself may be shared within TD +free (files);free (fd); fd =NULL ; }
configure +10 -4
@@ -248,6 +248,8 @@ for opt do ;; --disable-dfs) dfs="no" ;; + --enable-asan) asan="yes" + ;; --help) show_help="yes" ;;
@@ -290,9 +292,10 @@ if test "$show_help" = "yes" ; then echo "--enable-libiscsi Enable iscsi support" echo "--enable-libnbd Enable libnbd (NBD engine) support" echo "--disable-libzbc Disable libzbc even if found" - echo "--disable-tcmalloc Disable tcmalloc support" - echo "--dynamic-libengines Lib-based ioengines as dynamic libraries" - echo "--disable-dfs Disable DAOS File System support even if found" + echo "--disable-tcmalloc Disable tcmalloc support" + echo "--dynamic-libengines Lib-based ioengines as dynamic libraries" + echo "--disable-dfs Disable DAOS File System support even if found" + echo "--enable-asan Enable address sanitizer" exit $exit_val fi
@@ -3196,7 +3199,10 @@ fi if test "$fcntl_sync" = "yes" ; then output_sym "CONFIG_FCNTL_SYNC" fi - +if test "$asan" = "yes"; then + CFLAGS="$CFLAGS -fsanitize=address" + LDFLAGS="$LDFLAGS -fsanitize=address" +fi print_config "Lib-based ioengines dynamic" "$dynamic_engines" cat > $TMPC << EOF int main(int argc, char **argv)
filesetup.c +2 -1
@@ -2031,11 +2031,12 @@ void dup_files(struct thread_data *td, struct thread_data *org)if (!org->files)return ; - td->files =malloc (org->files_index *sizeof (f)); + td->files =calloc (org->files_index,sizeof (f));if (td->o.file_lock_mode !=FILE_LOCK_NONE ) td->file_locks =malloc (org->files_index); +assert (org->files_index >= org->o.nr_files);for_each_file (org, f, i) {struct fio_file *__f;
t/dedupe.c +35 -22
130 lines not on this page · raw message
t/io_uring.c +13 -0
@@ -939,6 +939,7 @@ submit:return NULL ; } +#ifdef CONFIG_PWRITEV2 static void *submitter_sync_fn (void *data) {struct submitter *s = data;
@@ -1004,6 +1005,13 @@ static void *submitter_sync_fn(void *data) finish =1 ; return NULL; } +#else +static void *submitter_sync_fn (void *data) +{ + finish =1 ; +return NULL ; +} +#endif static struct submitter *get_submitter (int offset) {
@@ -1346,7 +1354,12 @@ int main(int argc, char *argv[]) register_ring = !!atoi (optarg);break ;case 'S' : +#ifdef CONFIG_PWRITEV2 use_sync = !!atoi (optarg); +#else +fprintf (stderr,"preadv2 not supported\n" ); +exit (1 ); +#endif break ;case 'h' :case '?' :