Recent changes (master)
The following changes since commit 41508de67c06661ff1d473d108a8a01912ade114:
fio/server: fix confusing sk_out check (2023-07-03 09:16:45 -0600)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 8e2b81b854286f32eae7951a434dddebd968f9d5:
zbd: Support finishing zones on Android (2023-07-05 15:48:11 -0600)
----------------------------------------------------------------
Bart Van Assche (1):
zbd: Support finishing zones on Android
Jens Axboe (1):
Merge branch 'makefile-hardening-cpp-flags' of https://github.com/proact-de/fio
Martin Steigerwald (1):
Keep C pre processor hardening build flags.
Vincent Fu (4):
engines/io_uring_cmd: make trims async engines/io_uring: remove dead code related to trim t/nvmept: add check for iodepth
t/nvmept: add trim test with ioengine options enabled
Makefile | 2 +- engines/io_uring.c | 49 ++++++++++---------------- engines/nvme.c | 96 ++++++++++++++++++++++++-------------------------- engines/nvme.h | 5 +-- oslib/linux-blkzoned.c | 24 ++++++------- t/nvmept.py | 21 +++++++++++ 6 files changed, 100 insertions(+), 97 deletions(-)
---
Diff of recent changes:
Makefile +1 -1
@@ -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)
engines/io_uring.c +19 -30
100 lines not on this page · raw message
engines/nvme.c +46 -50
120 lines not on this page · raw message
engines/nvme.h +1 -4
@@ -216,9 +216,6 @@ struct nvme_dsm_range {__le64 slba; }; -int fio_nvme_trim (const struct thread_data *td,struct fio_file *f, -unsigned long long offset,unsigned long long len); -int fio_nvme_iomgmt_ruhs (struct thread_data *td,struct fio_file *f,struct nvme_fdp_ruh_status *ruhs,__u32 bytes);
@@ -226,7 +223,7 @@ int fio_nvme_get_info(struct fio_file *f, __u32 *nsid, __u32 *lba_sz, __u32 *ms, __u64 *nlba);int fio_nvme_uring_cmd_prep (struct nvme_uring_cmd *cmd,struct io_u *io_u, -struct iovec *iov); +struct iovec *iov,struct nvme_dsm_range *dsm);int fio_nvme_get_zoned_model (struct thread_data *td,struct fio_file *f,enum zbd_zoned_model *model);
oslib/linux-blkzoned.c +12 -12
@@ -22,6 +22,9 @@#include "zbd_types.h" #include <linux/blkzoned.h> +#ifndef BLKFINISHZONE +#define BLKFINISHZONE _IOW(0x12, 136, struct blk_zone_range) +#endif /* * If the uapi headers installed on the system lacks zone capacity support,
@@ -312,7 +315,6 @@ int blkzoned_reset_wp(struct thread_data *td, struct fio_file *f,int blkzoned_finish_zone (struct thread_data *td,struct fio_file *f,uint64_t offset,uint64_t length) { -#ifdef BLKFINISHZONE struct blk_zone_range zr = { .sector = offset >>9 , .nr_sectors = length >>9 ,
@@ -327,21 +329,19 @@ int blkzoned_finish_zone(struct thread_data *td, struct fio_file *f,return -errno; } -if (ioctl (fd,BLKFINISHZONE , &zr) <0 ) +if (ioctl (fd,BLKFINISHZONE , &zr) <0 ) { ret = -errno; +/* +* Kernel versions older than 5.5 do not support BLKFINISHZONE +* and return the ENOTTY error code. These old kernels only +* support block devices that close zones automatically. +*/ +if (ret ==ENOTTY ) + ret =0 ; + }if (f->fd <0 )close (fd);return ret; -#else -/* -* Kernel versions older than 5.5 does not support BLKFINISHZONE. These -* old kernels assumed zones are closed automatically at max_open_zones -* limit. Also they did not support max_active_zones limit. Then there -* was no need to finish zones to avoid errors caused by max_open_zones -* or max_active_zones. For those old versions, just do nothing. -*/ -return 0 ; -#endif }
t/nvmept.py +21 -0
@@ -80,6 +80,10 @@ class PassThruTest(FioJobCmdTest): print(f"Unhandled rw value {self.fio_opts['rw']}") self.passed = False + if job['iodepth_level']['8'] < 95: + print("Did not achieve requested iodepth") + self.passed = False + TEST_LIST = [ {
@@ -232,6 +236,23 @@ TEST_LIST = [ }, "test_class": PassThruTest, }, + { + # We can't enable fixedbufs because for trim-only + # workloads fio actually does not allocate any buffers + "test_id": 15, + "fio_opts": { + "rw": 'randtrim', + "timebased": 1, + "runtime": 3, + "fixedbufs": 0, + "nonvectored": 1, + "force_async": 1, + "registerfiles": 1, + "sqthread_poll": 1, + "output-format": "json", + }, + "test_class": PassThruTest, + }, ] def parse_args():