From 633b699bfda06d9fcdb7f9466e2d2c9b4bc3e63c Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Wed, 20 Sep 2017 16:25:56 +0100 Subject: [PATCH] iohelper: avoid calling read() with misaligned buffers for O_DIRECT The iohelper currently calls saferead() to get data from the underlying file. This has a problem with O_DIRECT when hitting end-of-file. saferead() is asked to read 1MB, but the first read() it does may return only a few KB, so it'll try another read() to fill the remaining buffer. Unfortunately the buffer pointer passed into this 2nd read() is likely not aligned to the extent that O_DIRECT requires, so rather than seeing '0' for end-of-file, we'll get -1 + EINVAL due to misaligned buffer. The way the iohelper is currently written, it already handles getting short reads, so there is actually no need to use saferead() at all. We can simply call read() directly. The benefit of this is that we can now write() the data immediately so when we go into the subsequent reads() we'll always have a correctly aligned buffer. Technically the file position ought to be aligned for O_DIRECT too, but this does not appear to matter when at end-of-file. Tested-by: Nikolay Shirokovskiy Reviewed-by: Eric Blake Signed-off-by: Daniel P. Berrange --- src/util/iohelper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/util/iohelper.c b/src/util/iohelper.c index fe15a92e6c..5416d45066 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -109,7 +109,9 @@ runIO(const char *path, int fd, int oflags) while (1) { ssize_t got; - if ((got = saferead(fdin, buf, buflen)) < 0) { + if ((got = read(fdin, buf, buflen)) < 0) { + if (errno == EINTR) + continue; virReportSystemError(errno, _("Unable to read %s"), fdinname); goto cleanup; }