blob: cb18032d2417b84bd6d330286091c46dc4a262c2 [file] [log] [blame]
Brad Bishop26bdd442019-08-16 17:08:17 -04001From 8ca8a05d92fa799fe93a6edc27b058802211fddc Mon Sep 17 00:00:00 2001
2From: Jens Axboe <axboe@kernel.dk>
3Date: Sat, 3 Aug 2019 08:33:24 -0600
4Subject: [PATCH] engines/splice: remove buggy ->mem_align set
5
6Two things wrong here:
7
81) We align buffers by default, so no need for splice to do anything
9 extra.
102) ->mem_align is not a true/false setting, it's the alignment itself.
11 Hence the current setting to 1 is just buggy.
12
13Upstream-Status: Backport [https://github.com/axboe/fio/commit/8ca8a05d92fa799fe93a6edc27b058802211fddc]
14
15Fixes: https://github.com/axboe/fio/issues/810
16Reported-by: Sitsofe Wheeler <sitsofe@yahoo.com>
17Signed-off-by: Jens Axboe <axboe@kernel.dk>
18Signed-off-by: Liwei Song <liwei.song@windriver.com>
19---
20 engines/splice.c | 7 -------
21 1 file changed, 7 deletions(-)
22
23diff --git a/engines/splice.c b/engines/splice.c
24index feb764feb2f4..6fc36bb6f154 100644
25--- a/engines/splice.c
26+++ b/engines/splice.c
27@@ -278,13 +278,6 @@ static int fio_spliceio_init(struct thread_data *td)
28 */
29 sd->vmsplice_to_user_map = 1;
30
31- /*
32- * And if vmsplice_to_user works, we definitely need aligned
33- * buffers. Just set ->odirect to force that.
34- */
35- if (td_read(td))
36- td->o.mem_align = 1;
37-
38 td->io_ops_data = sd;
39 return 0;
40 }
41--
422.22.0
43