From nobody Fri Dec 19 08:02: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 ARC-Seal: i=1; a=rsa-sha256; t=1579000159; cv=none; d=zohomail.com; s=zohoarc; b=ecLeEaJ6Rm6cR8Py/ee0/VOW4qr9m/jZd8VDEbRNZbLxnoiw3/scFD748iM4qfHZImcF3gd8fsltEOVA+XJ7TaWAt1YtROBicn4204ZpovLITxHVbnVOvlj7rhPHDyCxlrToU7mE6YRk9LVrAYajW+QIMC0QF4GPdTl2Up83ezo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579000159; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=T4C7H8US9C+0o3jOaH4jJKW81pnBF5wlB3cYpsUWEzs=; b=nhgU6dWsfUebS4v0+pfP0oHA0LlpyStFWyK5RLyLpjLYgLRRHuSRo9T1RYcDZWRgMw5CxsHq2vhDNmaWO8G/WZ1stYwZ16zFb1FJ/SMrLu6tRGHKJ/z1nFejGWQ5dbPVGh1ZxG5AiLvSMNw0/U4cGz+yv2yVxdP04S0uSriJZnQ= ARC-Authentication-Results: i=1; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157900015985072.90603816884584; Tue, 14 Jan 2020 03:09:19 -0800 (PST) Received: from localhost ([::1]:37022 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irK4U-0000zq-8Y for importer@patchew.org; Tue, 14 Jan 2020 06:09:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47778) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irJwG-00006x-E0 for qemu-devel@nongnu.org; Tue, 14 Jan 2020 06:00:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1irJwC-0006uW-O8 for qemu-devel@nongnu.org; Tue, 14 Jan 2020 06:00:48 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:53865 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1irJwC-0006ty-1L for qemu-devel@nongnu.org; Tue, 14 Jan 2020 06:00:44 -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-277-wat8oZMlNmmDgUA5J8iZJg-1; Tue, 14 Jan 2020 06:00:34 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2A9A88024CC; Tue, 14 Jan 2020 11:00:33 +0000 (UTC) Received: from localhost (unknown [10.36.118.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id B73B15DA70; Tue, 14 Jan 2020 11:00:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578999643; 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=T4C7H8US9C+0o3jOaH4jJKW81pnBF5wlB3cYpsUWEzs=; b=Au4+iiE1YVHaXNA0bIBR/aPjjR/mFfj+tO++/g+jU66zdtqTbgIfE++VqHKSnvjvnHCwZi U6TxMZ+4bkZPAjZ9OmTlBEhQz3iGhKpEUPFmbFTrpOX2rwYzhgdTNUM3GpTytyF95CkRrP NdmTV1vpXZwu2RdJTONuRscENSQEjk4= From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH v4 07/15] blockdev: adds bdrv_parse_aio to use io_uring Date: Tue, 14 Jan 2020 10:59:13 +0000 Message-Id: <20200114105921.131880-8-stefanha@redhat.com> In-Reply-To: <20200114105921.131880-1-stefanha@redhat.com> References: <20200114105921.131880-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: wat8oZMlNmmDgUA5J8iZJg-1 X-Mimecast-Spam-Score: 0 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.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , qemu-block@nongnu.org, oleksandr@redhat.com, Julia Suvorova , Markus Armbruster , Max Reitz , Stefan Hajnoczi , Paolo Bonzini , Aarushi Mehta , Stefano Garzarella Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Aarushi Mehta Signed-off-by: Aarushi Mehta Acked-by: Stefano Garzarella Signed-off-by: Stefan Hajnoczi --- block.c | 22 ++++++++++++++++++++++ blockdev.c | 12 ++++-------- include/block/block.h | 1 + 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/block.c b/block.c index ecd09dbbfd..6c2b2bd2e2 100644 --- a/block.c +++ b/block.c @@ -845,6 +845,28 @@ static BlockdevDetectZeroesOptions bdrv_parse_detect_z= eroes(QemuOpts *opts, return detect_zeroes; } =20 +/** + * Set open flags for aio engine + * + * Return 0 on success, -1 if the engine specified is invalid + */ +int bdrv_parse_aio(const char *mode, int *flags) +{ + if (!strcmp(mode, "threads")) { + /* do nothing, default */ + } else if (!strcmp(mode, "native")) { + *flags |=3D BDRV_O_NATIVE_AIO; +#ifdef CONFIG_LINUX_IO_URING + } else if (!strcmp(mode, "io_uring")) { + *flags |=3D BDRV_O_IO_URING; +#endif + } else { + return -1; + } + + return 0; +} + /** * Set open flags for a given discard mode * diff --git a/blockdev.c b/blockdev.c index 8e029e9c01..6523f9551d 100644 --- a/blockdev.c +++ b/blockdev.c @@ -385,13 +385,9 @@ static void extract_common_blockdev_options(QemuOpts *= opts, int *bdrv_flags, } =20 if ((aio =3D qemu_opt_get(opts, "aio")) !=3D NULL) { - if (!strcmp(aio, "native")) { - *bdrv_flags |=3D BDRV_O_NATIVE_AIO; - } else if (!strcmp(aio, "threads")) { - /* this is the default */ - } else { - error_setg(errp, "invalid aio option"); - return; + if (bdrv_parse_aio(aio, bdrv_flags) < 0) { + error_setg(errp, "invalid aio option"); + return; } } } @@ -4641,7 +4637,7 @@ QemuOptsList qemu_common_drive_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 BDRV_OPT_CACHE_WB, .type =3D QEMU_OPT_BOOL, diff --git a/include/block/block.h b/include/block/block.h index ea155da45a..2eba61e750 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -301,6 +301,7 @@ void bdrv_append(BlockDriverState *bs_new, BlockDriverS= tate *bs_top, void bdrv_replace_node(BlockDriverState *from, BlockDriverState *to, Error **errp); =20 +int bdrv_parse_aio(const char *mode, int *flags); int bdrv_parse_cache_mode(const char *mode, int *flags, bool *writethrough= ); int bdrv_parse_discard_flags(const char *mode, int *flags); BdrvChild *bdrv_open_child(const char *filename, --=20 2.24.1