From nobody Thu Apr 17 09:37:28 2025
Delivered-To: importer@patchew.org
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;
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 1580420136565452.3245938950895;
Thu, 30 Jan 2020 13:35:36 -0800 (PST)
Received: from localhost ([::1]:39356 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 1ixHTL-0003y2-8w
for importer@patchew.org; Thu, 30 Jan 2020 16:35:35 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:56399)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <stefanha@redhat.com>) id 1ixHQO-0008EO-Q8
for qemu-devel@nongnu.org; Thu, 30 Jan 2020 16:32:34 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <stefanha@redhat.com>) id 1ixHQM-0006R3-Uw
for qemu-devel@nongnu.org; Thu, 30 Jan 2020 16:32:32 -0500
Received: from us-smtp-1.mimecast.com ([207.211.31.81]:25891
helo=us-smtp-delivery-1.mimecast.com)
by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <stefanha@redhat.com>) id 1ixHQM-0006QQ-QH
for qemu-devel@nongnu.org; Thu, 30 Jan 2020 16:32:30 -0500
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-303-nV4jhI_WPSe9XlVjAbonMQ-1; Thu, 30 Jan 2020 16:32:28 -0500
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
[10.5.11.12])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 166A213E6;
Thu, 30 Jan 2020 21:32:27 +0000 (UTC)
Received: from localhost (unknown [10.36.118.87])
by smtp.corp.redhat.com (Postfix) with ESMTP id 9D1B560BE0;
Thu, 30 Jan 2020 21:32:26 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1580419950;
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=KcnVVs+GyUpD4I2Efw+5RJEEQNSFTzcNphIoht67I54=;
b=hlHlRXr1vc3Das2qd3SCAgbvfOmgtvdCXU2LRZ48eZe7yh+KpZzEvsgIjV7q6orR1PvxMQ
f8YtKcIfFjnOvfcu7IPGnKzzCfSSu4WgT95o00368KER7a3khzAq1f6xGAJet6Ab5znCii
JKlgPZwaBwYH62Bllceaisg1uJBV8tE=
From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PULL 11/18] block/file-posix.c: extend to use io_uring
Date: Thu, 30 Jan 2020 21:31:07 +0000
Message-Id: <20200130213114.325157-12-stefanha@redhat.com>
In-Reply-To: <20200130213114.325157-1-stefanha@redhat.com>
References: <20200130213114.325157-1-stefanha@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-MC-Unique: nV4jhI_WPSe9XlVjAbonMQ-1
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
[fuzzy]
X-Received-From: 207.211.31.81
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: Kevin Wolf <kwolf@redhat.com>, Peter Maydell <peter.maydell@linaro.org>,
Maxim Levitsky <maximlevitsky@gmail.com>, qemu-block@nongnu.org,
Julia Suvorova <jusual@redhat.com>, Markus Armbruster <armbru@redhat.com>,
Max Reitz <mreitz@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>, Fam Zheng <fam@euphon.net>,
Aarushi Mehta <mehta.aaru20@gmail.com>,
Stefano Garzarella <sgarzare@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)
Content-Type: text/plain; charset="utf-8"
From: Aarushi Mehta <mehta.aaru20@gmail.com>
Signed-off-by: Aarushi Mehta <mehta.aaru20@gmail.com>
Reviewed-by: Maxim Levitsky <maximlevitsky@gmail.com>
Acked-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20200120141858.587874-9-stefanha@redhat.com
Message-Id: <20200120141858.587874-9-stefanha@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
block/file-posix.c | 98 +++++++++++++++++++++++++++++++++++++---------
1 file changed, 79 insertions(+), 19 deletions(-)
diff --git a/block/file-posix.c b/block/file-posix.c
index 2b08b02d27..ab82ee1a67 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -156,6 +156,7 @@ typedef struct BDRVRawState {
bool has_write_zeroes:1;
bool discard_zeroes:1;
bool use_linux_aio:1;
+ bool use_linux_io_uring:1;
bool page_cache_inconsistent:1;
bool has_fallocate;
bool needs_alignment;
@@ -444,7 +445,7 @@ static QemuOptsList raw_runtime_opts =3D {
{
.name =3D "aio",
.type =3D QEMU_OPT_STRING,
- .help =3D "host AIO implementation (threads, native)",
+ .help =3D "host AIO implementation (threads, native, io_uring)=
",
},
{
.name =3D "locking",
@@ -503,9 +504,16 @@ static int raw_open_common(BlockDriverState *bs, QDict=
*options,
goto fail;
}
=20
- aio_default =3D (bdrv_flags & BDRV_O_NATIVE_AIO)
- ? BLOCKDEV_AIO_OPTIONS_NATIVE
- : BLOCKDEV_AIO_OPTIONS_THREADS;
+ if (bdrv_flags & BDRV_O_NATIVE_AIO) {
+ aio_default =3D BLOCKDEV_AIO_OPTIONS_NATIVE;
+#ifdef CONFIG_LINUX_IO_URING
+ } else if (bdrv_flags & BDRV_O_IO_URING) {
+ aio_default =3D BLOCKDEV_AIO_OPTIONS_IO_URING;
+#endif
+ } else {
+ aio_default =3D BLOCKDEV_AIO_OPTIONS_THREADS;
+ }
+
aio =3D qapi_enum_parse(&BlockdevAioOptions_lookup,
qemu_opt_get(opts, "aio"),
aio_default, &local_err);
@@ -514,7 +522,11 @@ static int raw_open_common(BlockDriverState *bs, QDict=
*options,
ret =3D -EINVAL;
goto fail;
}
+
s->use_linux_aio =3D (aio =3D=3D BLOCKDEV_AIO_OPTIONS_NATIVE);
+#ifdef CONFIG_LINUX_IO_URING
+ s->use_linux_io_uring =3D (aio =3D=3D BLOCKDEV_AIO_OPTIONS_IO_URING);
+#endif
=20
locking =3D qapi_enum_parse(&OnOffAuto_lookup,
qemu_opt_get(opts, "locking"),
@@ -600,6 +612,22 @@ static int raw_open_common(BlockDriverState *bs, QDict=
*options,
}
#endif /* !defined(CONFIG_LINUX_AIO) */
=20
+#ifdef CONFIG_LINUX_IO_URING
+ if (s->use_linux_io_uring) {
+ if (!aio_setup_linux_io_uring(bdrv_get_aio_context(bs), errp)) {
+ error_prepend(errp, "Unable to use io_uring: ");
+ goto fail;
+ }
+ }
+#else
+ if (s->use_linux_io_uring) {
+ error_setg(errp, "aio=3Dio_uring was specified, but is not support=
ed "
+ "in this build.");
+ ret =3D -EINVAL;
+ goto fail;
+ }
+#endif /* !defined(CONFIG_LINUX_IO_URING) */
+
s->has_discard =3D true;
s->has_write_zeroes =3D true;
if ((bs->open_flags & BDRV_O_NOCACHE) !=3D 0) {
@@ -1877,21 +1905,25 @@ static int coroutine_fn raw_co_prw(BlockDriverState=
*bs, uint64_t offset,
return -EIO;
=20
/*
- * Check if the underlying device requires requests to be aligned,
- * and if the request we are trying to submit is aligned or not.
- * If this is the case tell the low-level driver that it needs
- * to copy the buffer.
+ * When using O_DIRECT, the request must be aligned to be able to use
+ * either libaio or io_uring interface. If not fail back to regular th=
read
+ * pool read/write code which emulates this for us if we
+ * set QEMU_AIO_MISALIGNED.
*/
- if (s->needs_alignment) {
- if (!bdrv_qiov_is_aligned(bs, qiov)) {
- type |=3D QEMU_AIO_MISALIGNED;
+ if (s->needs_alignment && !bdrv_qiov_is_aligned(bs, qiov)) {
+ type |=3D QEMU_AIO_MISALIGNED;
+#ifdef CONFIG_LINUX_IO_URING
+ } else if (s->use_linux_io_uring) {
+ LuringState *aio =3D aio_get_linux_io_uring(bdrv_get_aio_context(b=
s));
+ assert(qiov->size =3D=3D bytes);
+ return luring_co_submit(bs, aio, s->fd, offset, qiov, type);
+#endif
#ifdef CONFIG_LINUX_AIO
- } else if (s->use_linux_aio) {
- LinuxAioState *aio =3D aio_get_linux_aio(bdrv_get_aio_context(=
bs));
- assert(qiov->size =3D=3D bytes);
- return laio_co_submit(bs, aio, s->fd, offset, qiov, type);
+ } else if (s->use_linux_aio) {
+ LinuxAioState *aio =3D aio_get_linux_aio(bdrv_get_aio_context(bs));
+ assert(qiov->size =3D=3D bytes);
+ return laio_co_submit(bs, aio, s->fd, offset, qiov, type);
#endif
- }
}
=20
acb =3D (RawPosixAIOData) {
@@ -1927,24 +1959,36 @@ static int coroutine_fn raw_co_pwritev(BlockDriverS=
tate *bs, uint64_t offset,
=20
static void raw_aio_plug(BlockDriverState *bs)
{
+ BDRVRawState __attribute__((unused)) *s =3D bs->opaque;
#ifdef CONFIG_LINUX_AIO
- BDRVRawState *s =3D bs->opaque;
if (s->use_linux_aio) {
LinuxAioState *aio =3D aio_get_linux_aio(bdrv_get_aio_context(bs));
laio_io_plug(bs, aio);
}
#endif
+#ifdef CONFIG_LINUX_IO_URING
+ if (s->use_linux_io_uring) {
+ LuringState *aio =3D aio_get_linux_io_uring(bdrv_get_aio_context(b=
s));
+ luring_io_plug(bs, aio);
+ }
+#endif
}
=20
static void raw_aio_unplug(BlockDriverState *bs)
{
+ BDRVRawState __attribute__((unused)) *s =3D bs->opaque;
#ifdef CONFIG_LINUX_AIO
- BDRVRawState *s =3D bs->opaque;
if (s->use_linux_aio) {
LinuxAioState *aio =3D aio_get_linux_aio(bdrv_get_aio_context(bs));
laio_io_unplug(bs, aio);
}
#endif
+#ifdef CONFIG_LINUX_IO_URING
+ if (s->use_linux_io_uring) {
+ LuringState *aio =3D aio_get_linux_io_uring(bdrv_get_aio_context(b=
s));
+ luring_io_unplug(bs, aio);
+ }
+#endif
}
=20
static int raw_co_flush_to_disk(BlockDriverState *bs)
@@ -1964,14 +2008,20 @@ static int raw_co_flush_to_disk(BlockDriverState *b=
s)
.aio_type =3D QEMU_AIO_FLUSH,
};
=20
+#ifdef CONFIG_LINUX_IO_URING
+ if (s->use_linux_io_uring) {
+ LuringState *aio =3D aio_get_linux_io_uring(bdrv_get_aio_context(b=
s));
+ return luring_co_submit(bs, aio, s->fd, 0, NULL, QEMU_AIO_FLUSH);
+ }
+#endif
return raw_thread_pool_submit(bs, handle_aiocb_flush, &acb);
}
=20
static void raw_aio_attach_aio_context(BlockDriverState *bs,
AioContext *new_context)
{
+ BDRVRawState __attribute__((unused)) *s =3D bs->opaque;
#ifdef CONFIG_LINUX_AIO
- BDRVRawState *s =3D bs->opaque;
if (s->use_linux_aio) {
Error *local_err =3D NULL;
if (!aio_setup_linux_aio(new_context, &local_err)) {
@@ -1981,6 +2031,16 @@ static void raw_aio_attach_aio_context(BlockDriverSt=
ate *bs,
}
}
#endif
+#ifdef CONFIG_LINUX_IO_URING
+ if (s->use_linux_io_uring) {
+ Error *local_err;
+ if (!aio_setup_linux_io_uring(new_context, &local_err)) {
+ error_reportf_err(local_err, "Unable to use linux io_uring, "
+ "falling back to thread pool: ");
+ s->use_linux_io_uring =3D false;
+ }
+ }
+#endif
}
=20
static void raw_close(BlockDriverState *bs)
--=20
2.24.1