diff options
| author | Chunwei Chen <[email protected]> | 2017-02-22 16:08:04 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-04-26 13:54:40 -0700 |
| commit | 692e55b8fea00a0d0bd46188d68031292f04e4a8 (patch) | |
| tree | 855589ccee3826a5935b3816e4f3d22e6a3b2408 /include/linux | |
| parent | e815485fe9e1716d92e0e0e1e6e4ce1b95d3bb00 (diff) | |
Reinstate zvol_taskq to fix aio on zvol
Commit 37f9dac removed the zvol_taskq for processing zvol requests.
This was removed as part of switching to make_request_fn and was
motivated by a concern at the time over dispatch latency.
However, this also made all bio request synchronous, and caused
serious performance issues as the bio submitter would wait for
every bio it submitted, effectively making the IO depth 1.
This patch reinstate zvol_taskq, and to make sure overlapped I/Os
are ordered properly, we take range lock in zvol_request, and pass
it along with bio to the I/O functions zvol_{write,discard,read}.
In order to facilitate benchmarks a zvol_request_sync module
option was added to switch between sync and async request handling.
For the moment, the default behavior is synchronous but this is
likely to change pending additional testing.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Chunwei Chen <[email protected]>
Closes #5824
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/blkdev_compat.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/linux/blkdev_compat.h b/include/linux/blkdev_compat.h index ad095cdf1..15824c0b8 100644 --- a/include/linux/blkdev_compat.h +++ b/include/linux/blkdev_compat.h @@ -498,8 +498,15 @@ blk_queue_discard_granularity(struct request_queue *q, unsigned int dg) #define VDEV_HOLDER ((void *)0x2401de7) #ifndef HAVE_GENERIC_IO_ACCT -#define generic_start_io_acct(rw, slen, part) ((void)0) -#define generic_end_io_acct(rw, part, start_jiffies) ((void)0) +static inline void +generic_start_io_acct(int rw, unsigned long sectors, struct hd_struct *part) +{ +} + +static inline void +generic_end_io_acct(int rw, struct hd_struct *part, unsigned long start_time) +{ +} #endif #endif /* _ZFS_BLKDEV_H */ |