Skip to content

Commit 674b128

Browse files
Fabian-Gruenbichleramotin
authored andcommitted
linux: zvols: correctly detect flush requests (openzfs#17131)
since 4.10, bio->bi_opf needs to be checked to determine all kinds of flush requests. this was the case prior to the commit referenced below, but the order of ifdefs was not the usual one (newest up top), which might have caused this to slip through. this fixes a regression when using zvols as Qemu block devices, but might have broken other use cases as well. the symptoms are that all sync writes from within a VM configured to use such a virtual block devices are ignored and treated as async writes by the host ZFS layer. this can be verified using fio in sync mode inside the VM, for example with fio \ --filename=/dev/sda --ioengine=libaio --loops=1 --size=10G \ --time_based --runtime=60 --group_reporting --stonewall --name=cc1 \ --description="CC1" --rw=write --bs=4k --direct=1 --iodepth=1 \ --numjobs=1 --sync=1 which shows an IOPS number way above what the physical device underneath supports, with "zpool iostat -r 1" on the hypervisor side showing no sync IO occuring during the benchmark. with the regression fixed, both fio inside the VM and the IO stats on the host show the expected numbers. Fixes: 846b598 "config: remove HAVE_REQ_OP_* and HAVE_REQ_*" Signed-off-by: Fabian-Gruenbichler <f.gruenbichler@proxmox.com> Co-authored-by: Alexander Motin <mav@FreeBSD.org> Reviewed-by: Alexander Motin <mav@FreeBSD.org> Reviewed-by: Tony Hutter <hutter2@llnl.gov> (cherry picked from commit 41823a0)
1 parent 72cb68a commit 674b128

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

include/os/linux/kernel/linux/blkdev_compat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ bio_set_flush(struct bio *bio)
356356
static inline boolean_t
357357
bio_is_flush(struct bio *bio)
358358
{
359-
return (bio_op(bio) == REQ_OP_FLUSH);
359+
return (bio_op(bio) == REQ_OP_FLUSH || op_is_flush(bio->bi_opf));
360360
}
361361

362362
/*

0 commit comments

Comments
 (0)