From nobody Fri May 2 21:48:15 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=fail;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=fail(p=none dis=none) header.from=redhat.com
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1625750483630197.86177734047556;
Thu, 8 Jul 2021 06:21:23 -0700 (PDT)
Received: from localhost ([::1]:60924 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1m1Txy-0008NX-Do
for importer@patchew.org; Thu, 08 Jul 2021 09:21:22 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:47674)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <stefanha@redhat.com>)
id 1m1TpB-0002BA-6C
for qemu-devel@nongnu.org; Thu, 08 Jul 2021 09:12:17 -0400
Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:41899)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <stefanha@redhat.com>)
id 1m1Tp0-0000fe-Kx
for qemu-devel@nongnu.org; Thu, 08 Jul 2021 09:12:16 -0400
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
[209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
us-mta-428-DRgt8TjaOfmm8mF2OJTQ1Q-1; Thu, 08 Jul 2021 09:11:56 -0400
Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com
[10.5.11.23])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 181EF10A4043;
Thu, 8 Jul 2021 13:11:55 +0000 (UTC)
Received: from localhost (ovpn-114-141.ams2.redhat.com [10.36.114.141])
by smtp.corp.redhat.com (Postfix) with ESMTP id 343E819C66;
Thu, 8 Jul 2021 13:11:51 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1625749925;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=KrYVBHC3vnFNE5ZaL5/G6mEcyR9PcvRAlapWZn6AUoY=;
b=HYpFUI6aN02XbjLTIIiZNq8gLZf3VsYOPuMdgurp0D3ozSBhGzpRf4EIkgWAGreDUk928U
lSd43dLlLTXuG3be96aXj2hcQdezyAMt9YR3zsO3UW23QMEcV1xWqEYvjoXH2qBBZGZgPn
8bGnZrc1yImdP+INblitoRRpEBM5S+0=
X-MC-Unique: DRgt8TjaOfmm8mF2OJTQ1Q-1
From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org,
Peter Maydell <peter.maydell@linaro.org>
Subject: [PULL 3/5] block/file-posix: Optimize for macOS
Date: Thu, 8 Jul 2021 14:11:41 +0100
Message-Id: <20210708131143.240647-4-stefanha@redhat.com>
In-Reply-To: <20210708131143.240647-1-stefanha@redhat.com>
References: <20210708131143.240647-1-stefanha@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23
Authentication-Results: relay.mimecast.com;
auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=170.10.133.124;
envelope-from=stefanha@redhat.com;
helo=us-smtp-delivery-124.mimecast.com
X-Spam_score_int: -14
X-Spam_score: -1.5
X-Spam_bar: -
X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.45,
DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001,
RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: Fam Zheng <fam@euphon.net>, Kevin Wolf <kwolf@redhat.com>,
Akihiko Odaki <akihiko.odaki@gmail.com>, qemu-block@nongnu.org,
Max Reitz <mreitz@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>, John Snow <jsnow@redhat.com>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: fail (Header signature does not verify)
X-ZM-MESSAGEID: 1625750485493100001
Content-Type: text/plain; charset="utf-8"
From: Akihiko Odaki <akihiko.odaki@gmail.com>
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#gistco=
mment-3654667
Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Message-id: 20210705130458.97642-1-akihiko.odaki@gmail.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.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 a26eab0ac3..cb9bffe047 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -46,6 +46,7 @@
#if defined(HAVE_HOST_BLOCK_DEVICE)
#include <paths.h>
#include <sys/param.h>
+#include <sys/mount.h>
#include <IOKit/IOKitLib.h>
#include <IOKit/IOBSD.h>
#include <IOKit/storage/IOMediaBSDClient.h>
@@ -1254,6 +1255,15 @@ static void raw_refresh_limits(BlockDriverState *bs,=
Error **errp)
return;
}
=20
+#if defined(__APPLE__) && (__MACH__)
+ struct statfs buf;
+
+ if (!fstatfs(s->fd, &buf)) {
+ bs->bl.opt_transfer =3D buf.f_iosize;
+ bs->bl.pdiscard_alignment =3D buf.f_bsize;
+ }
+#endif
+
if (bs->sg || S_ISBLK(st.st_mode)) {
int ret =3D hdev_get_max_hw_transfer(s->fd, &st);
=20
@@ -1591,6 +1601,7 @@ out:
}
}
=20
+#if defined(CONFIG_FALLOCATE) || defined(BLKZEROOUT) || defined(BLKDISCARD)
static int translate_err(int err)
{
if (err =3D=3D -ENODEV || err =3D=3D -ENOSYS || err =3D=3D -EOPNOTSUPP=
||
@@ -1599,6 +1610,7 @@ static int translate_err(int err)
}
return err;
}
+#endif
=20
#ifdef CONFIG_FALLOCATE
static int do_fallocate(int fd, int mode, off_t offset, off_t len)
@@ -1811,16 +1823,27 @@ static int handle_aiocb_discard(void *opaque)
}
} while (errno =3D=3D EINTR);
=20
- ret =3D -errno;
+ ret =3D translate_err(-errno);
#endif
} else {
#ifdef CONFIG_FALLOCATE_PUNCH_HOLE
ret =3D do_fallocate(s->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_=
SIZE,
aiocb->aio_offset, aiocb->aio_nbytes);
+ ret =3D translate_err(-errno);
+#elif defined(__APPLE__) && (__MACH__)
+ fpunchhole_t fpunchhole;
+ fpunchhole.fp_flags =3D 0;
+ fpunchhole.reserved =3D 0;
+ fpunchhole.fp_offset =3D aiocb->aio_offset;
+ fpunchhole.fp_length =3D aiocb->aio_nbytes;
+ if (fcntl(s->fd, F_PUNCHHOLE, &fpunchhole) =3D=3D -1) {
+ ret =3D errno =3D=3D ENODEV ? -ENOTSUP : -errno;
+ } else {
+ ret =3D 0;
+ }
#endif
}
=20
- ret =3D translate_err(ret);
if (ret =3D=3D -ENOTSUP) {
s->has_discard =3D false;
}
--=20
2.31.1