[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[v5 1/3] block/file-posix: Optimize for macOS
From: |
Akihiko Odaki |
Subject: |
[v5 1/3] block/file-posix: Optimize for macOS |
Date: |
Sat, 3 Apr 2021 01:02:54 +0900 |
This commit introduces "punch hole" operation and optimizes transfer
block size for macOS.
Thanks to Konstantin Nazarov for detailed analysis of a flaw in an
old version of this change:
https://gist.github.com/akihikodaki/87df4149e7ca87f18dc56807ec5a1bc5#gistcomment-3654667
Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
---
block/file-posix.c | 27 +++++++++++++++++++++++++--
1 file changed, 25 insertions(+), 2 deletions(-)
diff --git a/block/file-posix.c b/block/file-posix.c
index 05079b40cae..89e8ed9f801 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -44,6 +44,7 @@
#if defined(__APPLE__) && (__MACH__)
#include <paths.h>
#include <sys/param.h>
+#include <sys/mount.h>
#include <IOKit/IOKitLib.h>
#include <IOKit/IOBSD.h>
#include <IOKit/storage/IOMediaBSDClient.h>
@@ -1248,6 +1249,15 @@ static void raw_refresh_limits(BlockDriverState *bs,
Error **errp)
{
BDRVRawState *s = bs->opaque;
+#if defined(__APPLE__) && (__MACH__)
+ struct statfs buf;
+
+ if (!fstatfs(s->fd, &buf)) {
+ bs->bl.opt_transfer = buf.f_iosize;
+ bs->bl.pdiscard_alignment = buf.f_bsize;
+ }
+#endif
+
if (bs->sg) {
int ret = sg_get_max_transfer_length(s->fd);
@@ -1586,6 +1596,7 @@ out:
}
}
+#if defined(CONFIG_FALLOCATE) || defined(BLKZEROOUT) || defined(BLKDISCARD)
static int translate_err(int err)
{
if (err == -ENODEV || err == -ENOSYS || err == -EOPNOTSUPP ||
@@ -1594,6 +1605,7 @@ static int translate_err(int err)
}
return err;
}
+#endif
#ifdef CONFIG_FALLOCATE
static int do_fallocate(int fd, int mode, off_t offset, off_t len)
@@ -1795,16 +1807,27 @@ static int handle_aiocb_discard(void *opaque)
}
} while (errno == EINTR);
- ret = -errno;
+ ret = translate_err(-errno);
#endif
} else {
#ifdef CONFIG_FALLOCATE_PUNCH_HOLE
ret = do_fallocate(s->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
aiocb->aio_offset, aiocb->aio_nbytes);
+ ret = translate_err(-errno);
+#elif defined(__APPLE__) && (__MACH__)
+ fpunchhole_t fpunchhole;
+ fpunchhole.fp_flags = 0;
+ fpunchhole.reserved = 0;
+ fpunchhole.fp_offset = aiocb->aio_offset;
+ fpunchhole.fp_length = aiocb->aio_nbytes;
+ if (fcntl(s->fd, F_PUNCHHOLE, &fpunchhole) == -1) {
+ ret = errno == ENODEV ? -ENOTSUP : -errno;
+ } else {
+ ret = 0;
+ }
#endif
}
- ret = translate_err(ret);
if (ret == -ENOTSUP) {
s->has_discard = false;
}
--
2.24.3 (Apple Git-128)
- [v5 1/3] block/file-posix: Optimize for macOS,
Akihiko Odaki <=