X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=Makefile;h=027b62bcbb6f0bf573a15ddf6488e20cb7818567;hp=ca454318f71538bd1b5102420751c49b42f955c1;hb=HEAD;hpb=d4946e79e833d3b89bddf7d065e9f66560755e75 diff --git a/Makefile b/Makefile index ca454318..be57e296 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ include config-host.mak endif DEBUGFLAGS = -DFIO_INC_DEBUG -CPPFLAGS= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFIO_INTERNAL $(DEBUGFLAGS) +CPPFLAGS+= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFIO_INTERNAL $(DEBUGFLAGS) OPTFLAGS= -g -ffast-math FIO_CFLAGS= -std=gnu99 -Wwrite-strings -Wall -Wdeclaration-after-statement $(OPTFLAGS) $(EXTFLAGS) $(BUILD_CFLAGS) -I. -I$(SRCDIR) LIBS += -lm $(EXTLIBS) @@ -28,7 +28,7 @@ PROGS = fio SCRIPTS = $(addprefix $(SRCDIR)/,tools/fio_generate_plots tools/plot/fio2gnuplot tools/genfio tools/fiologparser.py tools/hist/fiologparser_hist.py tools/hist/fio-histo-log-pctiles.py tools/fio_jsonplus_clat2csv) ifndef CONFIG_FIO_NO_OPT - FIO_CFLAGS += -O3 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 + FIO_CFLAGS += -O3 endif ifdef CONFIG_BUILD_NATIVE FIO_CFLAGS += -march=native @@ -40,6 +40,11 @@ ifdef CONFIG_PDB LDFLAGS += -fuse-ld=lld $(LINK_PDBFILE) endif +# If clang, do not use builtin stpcpy as it breaks the build +ifeq ($(CC),clang) + FIO_CFLAGS += -fno-builtin-stpcpy +endif + ifdef CONFIG_GFIO PROGS += gfio endif @@ -51,12 +56,13 @@ SOURCE := $(sort $(patsubst $(SRCDIR)/%,%,$(wildcard $(SRCDIR)/crc/*.c)) \ pshared.c options.c \ smalloc.c filehash.c profile.c debug.c engines/cpu.c \ engines/mmap.c engines/sync.c engines/null.c engines/net.c \ - engines/ftruncate.c engines/filecreate.c engines/filestat.c \ + engines/ftruncate.c engines/fileoperations.c \ + engines/exec.c \ server.c client.c iolog.c backend.c libfio.c flow.c cconv.c \ gettime-thread.c helpers.c json.c idletime.c td_error.c \ profiles/tiobench.c profiles/act.c io_u_queue.c filelock.c \ workqueue.c rate-submit.c optgroup.c helper_thread.c \ - steadystate.c zone-dist.c zbd.c + steadystate.c zone-dist.c zbd.c dedupe.c dataplacement.c ifdef CONFIG_LIBHDFS HDFSFLAGS= -I $(JAVA_HOME)/include -I $(JAVA_HOME)/include/linux -I $(FIO_LIBHDFS_INCLUDE) @@ -79,6 +85,12 @@ ifdef CONFIG_LIBNBD ENGINES += nbd endif +ifdef CONFIG_LIBNFS + CFLAGS += $(LIBNFS_CFLAGS) + LIBS += $(LIBNFS_LIBS) + SOURCE += engines/nfs.c +endif + ifdef CONFIG_64BIT CPPFLAGS += -DBITS_PER_LONG=64 else ifdef CONFIG_32BIT @@ -86,6 +98,8 @@ else ifdef CONFIG_32BIT endif ifdef CONFIG_LIBAIO libaio_SRCS = engines/libaio.c + cmdprio_SRCS = engines/cmdprio.c + LIBS += -laio libaio_LIBS = -laio ENGINES += libaio endif @@ -94,6 +108,29 @@ ifdef CONFIG_RDMA rdma_LIBS = -libverbs -lrdmacm ENGINES += rdma endif +ifdef CONFIG_LIBRPMA_APM + librpma_apm_SRCS = engines/librpma_apm.c + librpma_fio_SRCS = engines/librpma_fio.c + ifdef CONFIG_LIBPMEM2_INSTALLED + librpma_apm_LIBS = -lrpma -lpmem2 + else + librpma_apm_LIBS = -lrpma -lpmem + endif + ENGINES += librpma_apm +endif +ifdef CONFIG_LIBRPMA_GPSPM + librpma_gpspm_SRCS = engines/librpma_gpspm.c engines/librpma_gpspm_flush.pb-c.c + librpma_fio_SRCS = engines/librpma_fio.c + ifdef CONFIG_LIBPMEM2_INSTALLED + librpma_gpspm_LIBS = -lrpma -lpmem2 -lprotobuf-c + else + librpma_gpspm_LIBS = -lrpma -lpmem -lprotobuf-c + endif + ENGINES += librpma_gpspm +endif +ifdef librpma_fio_SRCS + SOURCE += $(librpma_fio_SRCS) +endif ifdef CONFIG_POSIXAIO SOURCE += engines/posixaio.c endif @@ -103,6 +140,9 @@ endif ifdef CONFIG_LINUX_EXT4_MOVE_EXTENT SOURCE += engines/e4defrag.c endif +ifdef CONFIG_LIBCUFILE + SOURCE += engines/libcufile.c +endif ifdef CONFIG_LINUX_SPLICE SOURCE += engines/splice.c endif @@ -127,6 +167,11 @@ ifdef CONFIG_HTTP http_LIBS = -lcurl -lssl -lcrypto ENGINES += http endif +ifdef CONFIG_DFS + dfs_SRCS = engines/dfs.c + dfs_LIBS = -luuid -ldaos -ldfs + ENGINES += dfs +endif SOURCE += oslib/asprintf.c ifndef CONFIG_STRSEP SOURCE += oslib/strsep.c @@ -163,11 +208,6 @@ ifdef CONFIG_MTD SOURCE += oslib/libmtd.c SOURCE += oslib/libmtd_legacy.c endif -ifdef CONFIG_PMEMBLK - pmemblk_SRCS = engines/pmemblk.c - pmemblk_LIBS = -lpmemblk - ENGINES += pmemblk -endif ifdef CONFIG_LINUX_DEVDAX dev-dax_SRCS = engines/dev-dax.c dev-dax_LIBS = -lpmem @@ -186,10 +226,22 @@ ifdef CONFIG_LIBZBC libzbc_LIBS = -lzbc ENGINES += libzbc endif - +ifdef CONFIG_LIBXNVME + xnvme_SRCS = engines/xnvme.c + xnvme_LIBS = $(LIBXNVME_LIBS) + xnvme_CFLAGS = $(LIBXNVME_CFLAGS) + ENGINES += xnvme +endif +ifdef CONFIG_LIBBLKIO + libblkio_SRCS = engines/libblkio.c + libblkio_LIBS = $(LIBBLKIO_LIBS) + libblkio_CFLAGS = $(LIBBLKIO_CFLAGS) + ENGINES += libblkio +endif ifeq ($(CONFIG_TARGET_OS), Linux) SOURCE += diskutil.c fifo.c blktrace.c cgroup.c trim.c engines/sg.c \ - oslib/linux-dev-lookup.c engines/io_uring.c + oslib/linux-dev-lookup.c engines/io_uring.c engines/nvme.c + cmdprio_SRCS = engines/cmdprio.c ifdef CONFIG_HAS_BLKZONED SOURCE += oslib/linux-blkzoned.c endif @@ -198,7 +250,9 @@ endif endif ifeq ($(CONFIG_TARGET_OS), Android) SOURCE += diskutil.c fifo.c blktrace.c cgroup.c trim.c profiles/tiobench.c \ - oslib/linux-dev-lookup.c + oslib/linux-dev-lookup.c engines/io_uring.c engines/nvme.c \ + engines/sg.c + cmdprio_SRCS = engines/cmdprio.c ifdef CONFIG_HAS_BLKZONED SOURCE += oslib/linux-blkzoned.c endif @@ -240,29 +294,37 @@ ifeq ($(CONFIG_TARGET_OS), Darwin) LIBS += -lpthread -ldl endif ifneq (,$(findstring CYGWIN,$(CONFIG_TARGET_OS))) - SOURCE += os/windows/cpu-affinity.c os/windows/posix.c - WINDOWS_OBJS = os/windows/cpu-affinity.o os/windows/posix.o lib/hweight.o + SOURCE += os/windows/cpu-affinity.c os/windows/posix.c os/windows/dlls.c + WINDOWS_OBJS = os/windows/cpu-affinity.o os/windows/posix.o os/windows/dlls.o lib/hweight.o LIBS += -lpthread -lpsapi -lws2_32 -lssp FIO_CFLAGS += -DPSAPI_VERSION=1 -Ios/windows/posix/include -Wno-format endif +ifdef cmdprio_SRCS + SOURCE += $(cmdprio_SRCS) +endif + ifdef CONFIG_DYNAMIC_ENGINES DYNAMIC_ENGS := $(ENGINES) define engine_template = $(1)_OBJS := $$($(1)_SRCS:.c=.o) $$($(1)_OBJS): CFLAGS := -fPIC $$($(1)_CFLAGS) $(CFLAGS) engines/fio-$(1).so: $$($(1)_OBJS) - $$(QUIET_LINK)$(CC) -shared -rdynamic -fPIC -Wl,-soname,fio-$(1).so.1 $$($(1)_LIBS) -o $$@ $$< + $$(QUIET_LINK)$(CC) $(LDFLAGS) -shared -rdynamic -fPIC -Wl,-soname,fio-$(1).so.1 -o $$@ $$< $$($(1)_LIBS) ENGS_OBJS += engines/fio-$(1).so endef else # !CONFIG_DYNAMIC_ENGINES define engine_template = SOURCE += $$($(1)_SRCS) LIBS += $$($(1)_LIBS) -CFLAGS += $$($(1)_CFLAGS) +override CFLAGS += $$($(1)_CFLAGS) endef endif +FIO-VERSION-FILE: FORCE + @$(SHELL) $(SRCDIR)/FIO-VERSION-GEN +-include FIO-VERSION-FILE + override CFLAGS := -DFIO_VERSION='"$(FIO_VERSION)"' $(FIO_CFLAGS) $(CFLAGS) $(foreach eng,$(ENGINES),$(eval $(call engine_template,$(eng)))) @@ -329,8 +391,7 @@ T_VS_PROGS = t/fio-verify-state T_PIPE_ASYNC_OBJS = t/read-to-pipe-async.o T_PIPE_ASYNC_PROGS = t/read-to-pipe-async -T_IOU_RING_OBJS = t/io_uring.o -T_IOU_RING_OBJS += t/arch.o +T_IOU_RING_OBJS = t/io_uring.o lib/rand.o lib/pattern.o lib/strntol.o T_IOU_RING_PROGS = t/io_uring T_MEMLOCK_OBJS = t/memlock.o @@ -339,6 +400,29 @@ 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 -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" +# export LIB_FUZZING_ENGINE="-fsanitize=address" +# export CC=clang +# before running configure && make +# You can adapt this with different compilers, sanitizers, and fuzzing engines +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) T_OBJS += $(T_ZIPF_OBJS) @@ -352,6 +436,7 @@ T_OBJS += $(T_PIPE_ASYNC_OBJS) T_OBJS += $(T_MEMLOCK_OBJS) T_OBJS += $(T_TT_OBJS) T_OBJS += $(T_IOU_RING_OBJS) +T_OBJS += $(T_FUZZ_OBJS) ifneq (,$(findstring CYGWIN,$(CONFIG_TARGET_OS))) T_DEDUPE_OBJS += $(WINDOWS_OBJS) @@ -366,7 +451,9 @@ T_TEST_PROGS += $(T_AXMAP_PROGS) T_TEST_PROGS += $(T_LFSR_TEST_PROGS) T_TEST_PROGS += $(T_GEN_RAND_PROGS) T_PROGS += $(T_BTRACE_FIO_PROGS) +ifdef CONFIG_ZLIB T_PROGS += $(T_DEDUPE_PROGS) +endif T_PROGS += $(T_VS_PROGS) T_TEST_PROGS += $(T_MEMLOCK_PROGS) ifdef CONFIG_PREAD @@ -375,6 +462,7 @@ endif ifneq (,$(findstring Linux,$(CONFIG_TARGET_OS))) T_TEST_PROGS += $(T_IOU_RING_PROGS) endif +T_TEST_PROGS += $(T_FUZZ_PROGS) PROGS += $(T_PROGS) @@ -433,10 +521,6 @@ all: $(PROGS) $(T_TEST_PROGS) $(UT_PROGS) $(SCRIPTS) $(ENGS_OBJS) FORCE .PHONY: all install clean test .PHONY: FORCE cscope -FIO-VERSION-FILE: FORCE - @$(SHELL) $(SRCDIR)/FIO-VERSION-GEN --include FIO-VERSION-FILE - %.o : %.c @mkdir -p $(dir $@) $(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $< @@ -461,11 +545,19 @@ else $(QUIET_LEX)$(LEX) $< endif +ifneq (,$(findstring -Wimplicit-fallthrough,$(CFLAGS))) +LEX_YY_CFLAGS := -Wno-implicit-fallthrough +endif + +ifdef CONFIG_HAVE_NO_STRINGOP +YTAB_YY_CFLAGS := -Wno-stringop-truncation +endif + lex.yy.o: lex.yy.c y.tab.h - $(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $< + $(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) $(LEX_YY_CFLAGS) -c $< y.tab.o: y.tab.c y.tab.h - $(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $< + $(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) $(YTAB_YY_CFLAGS) -c $< y.tab.c: exp/expression-parser.y $(QUIET_YACC)$(YACC) -o $@ -l -d -b y $< @@ -530,6 +622,13 @@ t/ieee754: $(T_IEEE_OBJS) fio: $(FIO_OBJS) $(QUIET_LINK)$(CC) $(LDFLAGS) -o $@ $(FIO_OBJS) $(LIBS) $(HDFSLIB) +t/fuzz/fuzz_parseini: $(T_FUZZ_OBJS) +ifndef LIB_FUZZING_ENGINE + $(QUIET_LINK)$(CC) $(LDFLAGS) -o $@ $(T_FUZZ_OBJS) $(LIBS) $(HDFSLIB) +else + $(QUIET_LINK)$(CXX) $(LDFLAGS) -o $@ $(T_FUZZ_OBJS) $(LIB_FUZZING_ENGINE) $(LIBS) $(HDFSLIB) +endif + gfio: $(GFIO_OBJS) $(QUIET_LINK)$(CC) $(filter-out -static, $(LDFLAGS)) -o gfio $(GFIO_OBJS) $(LIBS) $(GFIO_LIBS) $(GTK_LDFLAGS) $(HDFSLIB) @@ -550,8 +649,10 @@ t/fio-btrace2fio: $(T_BTRACE_FIO_OBJS) $(QUIET_LINK)$(CC) $(LDFLAGS) -o $@ $(T_BTRACE_FIO_OBJS) $(LIBS) endif +ifdef CONFIG_ZLIB t/fio-dedupe: $(T_DEDUPE_OBJS) $(QUIET_LINK)$(CC) $(LDFLAGS) -o $@ $(T_DEDUPE_OBJS) $(LIBS) +endif t/fio-verify-state: $(T_VS_OBJS) $(QUIET_LINK)$(CC) $(LDFLAGS) -o $@ $(T_VS_OBJS) $(LIBS) @@ -565,7 +666,7 @@ unittests/unittest: $(UT_OBJS) $(UT_TARGET_OBJS) endif clean: FORCE - @rm -f .depend $(FIO_OBJS) $(GFIO_OBJS) $(OBJS) $(T_OBJS) $(UT_OBJS) $(PROGS) $(T_PROGS) $(T_TEST_PROGS) core.* core gfio unittests/unittest FIO-VERSION-FILE *.[do] lib/*.d oslib/*.[do] crc/*.d engines/*.[do] engines/*.so profiles/*.[do] t/*.[do] unittests/*.[do] unittests/*/*.[do] config-host.mak config-host.h y.tab.[ch] lex.yy.c exp/*.[do] lexer.h + @rm -f .depend $(FIO_OBJS) $(GFIO_OBJS) $(OBJS) $(T_OBJS) $(UT_OBJS) $(PROGS) $(T_PROGS) $(T_TEST_PROGS) core.* core gfio unittests/unittest FIO-VERSION-FILE *.[do] lib/*.d oslib/*.[do] crc/*.d engines/*.[do] engines/*.so profiles/*.[do] t/*.[do] t/*/*.[do] unittests/*.[do] unittests/*/*.[do] config-host.mak config-host.h y.tab.[ch] lex.yy.c exp/*.[do] lexer.h @rm -f t/fio-btrace2fio t/io_uring t/read-to-pipe-async @rm -rf doc/output @@ -590,16 +691,17 @@ test: fio fulltest: sudo modprobe null_blk && \ if [ ! -e /usr/include/libzbc/zbc.h ]; then \ - git clone https://github.com/hgst/libzbc && \ + git clone https://github.com/westerndigitalcorporation/libzbc && \ (cd libzbc && \ ./autogen.sh && \ ./configure --prefix=/usr && \ make -j && \ sudo make install) \ fi && \ - sudo t/zbd/run-tests-against-regular-nullb && \ + sudo t/zbd/run-tests-against-nullb -s 1 && \ if [ -e /sys/module/null_blk/parameters/zoned ]; then \ - sudo t/zbd/run-tests-against-zoned-nullb; \ + sudo t/zbd/run-tests-against-nullb -s 2; \ + sudo t/zbd/run-tests-against-nullb -s 4; \ fi install: $(PROGS) $(SCRIPTS) $(ENGS_OBJS) tools/plot/fio2gnuplot.1 FORCE