From nobody Tue Nov 11 15:57:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564413817; cv=none; d=zoho.com; s=zohoarc; b=b5BIKO/vY1JoJmhpcjkM6EutNZDMxfisfawLxixGYzbKOIzc3zSPSyOhbM0ggo+51rRD4ZNmCG4mYg3fJw1D/gXAyi9sBxCc0oC2HNeqif5eA+rr9e3SU4Tn/5bNxpmmYU9LYXOTP/E2xmDz1wadV/ioWaeJ+jx0dlfoSIwS+xc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564413817; h=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:ARC-Authentication-Results; bh=dbXKSdV5tn5FcTOHM2GayIdaoxtdtsUeiXsLP0/PfEA=; b=ogpa73S18rB8Frb/09wJI4bNi7vfAdB6SLp2X+IwQ8ChaL6oGMgMdQFKdJfUDa6T+PxPgz2fPVqeFUZoIYWv2PdIVoK55yGo1OSutIziyDxWlvGg/Q1EScyRtZtLqhGiQLUmYfdel9l0N2FPEg3braSlhq8FoA0MMNRdgWpkDVA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 156441381726578.54891174716647; Mon, 29 Jul 2019 08:23:37 -0700 (PDT) Received: from localhost ([::1]:53736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7Uu-0001eh-Ai for importer@patchew.org; Mon, 29 Jul 2019 11:23:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43493) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7P8-0006DB-Eh for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:17:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hs7P7-0006nA-Dm for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:17:38 -0400 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]:45803) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hs7P7-0006ls-7N; Mon, 29 Jul 2019 11:17:37 -0400 Received: by mail-pf1-x443.google.com with SMTP id r1so28193024pfq.12; Mon, 29 Jul 2019 08:17:37 -0700 (PDT) Received: from localhost.localdomain ([136.233.9.97]) by smtp.gmail.com with ESMTPSA id h129sm58693941pfb.110.2019.07.29.08.17.28 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 08:17:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dbXKSdV5tn5FcTOHM2GayIdaoxtdtsUeiXsLP0/PfEA=; b=FaYq2WWRYuMymDWVl/iaKLoUG5kdYOHO0tzuCxEWNmJPXN1nY2E9G/GCh34gFPVUVH MV33u+ilM/fgIoagP7dhj49A0J1XAd4SacNByTPJstIPzqrwHyQ9ieDQZL41N1tzNafY 8rZEChyR1WTMxfLvK1tPLjG14l3P9J1BEwCNlRgi2L6kChHiuduQmaQTua5Km2OZbQoY IOu50MBDxL2JnfxxxJZMJdbbapxpQz/gIShwBRoYXkCBP5eIcPYVe0GpkcbCjAk0xPra qL7KIfLyl4mBUMlTtxfdjScXs4SFh/3d9Xv5dd13hNyJgjl/jM8yXah1uLSUBgk3VWU6 YMaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dbXKSdV5tn5FcTOHM2GayIdaoxtdtsUeiXsLP0/PfEA=; b=SQLMG1aLDj1ax6Jnv7mW4RK79/Q+xwh4xMqSmShJOE29xeYiUVh0pMq5p963tE+VvS 6x2KDNwY8aKQB4mlw89LHHlc/azkROhOq72Jw10f27ivBR07VQ5dyKAWjElhIZiW0a3n xhpQrO7iOShVUATNElaLu6DzOuPjEBb0fENujrvFQJFdJpChPfBH5t5ySUbHNfz8cjrb NqHkBEtF05KfhgqsDfyBCehM2eX9qbndPbaRgLfSorO2VqbmmukCmqduIWOoGxroCzRM HadSpZ2u6Upf3OC8IZw0+d3vbmgGZlEraT+O8ZT0aArG1+QTLFNolcq8MSWrfGaxRAIG Jaiw== X-Gm-Message-State: APjAAAUnoC3U4R2YLRYgGwpEwcXMfoWZC4sMEOVj0qkuxAdcJqF5MsnK ztU9FK5DUbT2ap7CF1gwBvVbJWnMQmjXfQ== X-Google-Smtp-Source: APXvYqzYLM3VoeH98v4I54eB4N9PUQZDfHBJOWHTvzgWRxVM48cRbWLKC7gNFsntw1MyXOeoVdLd/w== X-Received: by 2002:a17:90a:1c17:: with SMTP id s23mr113243093pjs.108.1564413455755; Mon, 29 Jul 2019 08:17:35 -0700 (PDT) From: Aarushi Mehta To: qemu-devel@nongnu.org Date: Mon, 29 Jul 2019 20:46:37 +0530 Message-Id: <20190729151651.21306-2-mehta.aaru20@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190729151651.21306-1-mehta.aaru20@gmail.com> References: <20190729151651.21306-1-mehta.aaru20@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::443 Subject: [Qemu-devel] [PATCH v7 01/15] configure: permit use of io_uring 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: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, Sergio Lopez , Markus Armbruster , Maxim Levitsky , saket.sinha89@gmail.com, Max Reitz , Stefan Hajnoczi , Paolo Bonzini , Stefan Hajnoczi , Julia Suvorova , Aarushi Mehta , Maxim Levitsky 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" Signed-off-by: Aarushi Mehta Reviewed-by: Stefan Hajnoczi Reviewed-by: Maxim Levitsky --- configure | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/configure b/configure index 714e7fb6a1..493dbc2ec5 100755 --- a/configure +++ b/configure @@ -371,6 +371,7 @@ xen=3D"" xen_ctrl_version=3D"" xen_pci_passthrough=3D"" linux_aio=3D"" +linux_io_uring=3D"" cap_ng=3D"" attr=3D"" libattr=3D"" @@ -1272,6 +1273,10 @@ for opt do ;; --enable-linux-aio) linux_aio=3D"yes" ;; + --disable-linux-io-uring) linux_io_uring=3D"no" + ;; + --enable-linux-io-uring) linux_io_uring=3D"yes" + ;; --disable-attr) attr=3D"no" ;; --enable-attr) attr=3D"yes" @@ -1790,6 +1795,7 @@ disabled with --disable-FEATURE, default is enabled i= f available: vde support for vde network netmap support for netmap network linux-aio Linux AIO support + linux-io-uring Linux io_uring support cap-ng libcap-ng support attr attr and xattr support vhost-net vhost-net kernel acceleration support @@ -3975,6 +3981,21 @@ EOF linux_aio=3Dno fi fi +########################################## +# linux-io-uring probe + +if test "$linux_io_uring" !=3D "no" ; then + if $pkg_config liburing; then + linux_io_uring_cflags=3D$($pkg_config --cflags liburing) + linux_io_uring_libs=3D$($pkg_config --libs liburing) + linux_io_uring=3Dyes + else + if test "$linux_io_uring" =3D "yes" ; then + feature_not_found "linux io_uring" "Install liburing devel" + fi + linux_io_uring=3Dno + fi +fi =20 ########################################## # TPM emulation is only on POSIX @@ -6398,6 +6419,7 @@ echo "PIE $pie" echo "vde support $vde" echo "netmap support $netmap" echo "Linux AIO support $linux_aio" +echo "Linux io_uring support $linux_io_uring" echo "ATTR/XATTR support $attr" echo "Install blobs $blobs" echo "KVM support $kvm" @@ -6885,6 +6907,11 @@ fi if test "$linux_aio" =3D "yes" ; then echo "CONFIG_LINUX_AIO=3Dy" >> $config_host_mak fi +if test "$linux_io_uring" =3D "yes" ; then + echo "CONFIG_LINUX_IO_URING=3Dy" >> $config_host_mak + echo "LINUX_IO_URING_CFLAGS=3D$linux_io_uring_cflags" >> $config_host_mak + echo "LINUX_IO_URING_LIBS=3D$linux_io_uring_libs" >> $config_host_mak +fi if test "$attr" =3D "yes" ; then echo "CONFIG_ATTR=3Dy" >> $config_host_mak fi --=20 2.21.0 From nobody Tue Nov 11 15:57:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564413685; cv=none; d=zoho.com; s=zohoarc; b=AGW3zIp/TCF1++6VuLivRIrpq6A+J7SuuAIF7EW6Hn4dkIw+DQ+2h7IS/cc88L4K4FbkpQxndaTFW6bnp++KIIsEa15JBWA9L0gs9Qgm49dPVJLWdNH0gt6nHRUj1WQdjeOY8r+howbWBU2qp2JonqROt5K7CaBuPr5cGrhTIQk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564413685; h=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:ARC-Authentication-Results; bh=kq+GocMZNBzs7h+JrH4HUXS6sT3wW7TSwegih8ayQCc=; b=LXCT72uqLI274xOA4aPw1E6DHbsr+WPFvUirOhrB+ZiklDt3BhKZrYrc0FYB0wGWj1hDzWi9Rm4bxtT5onnr52Fy5+SrNIDEg9aR6EVsFXIERvUOEyS1+Z4qDaJ9iOV1eEtiKVMTzN6HFhxyC10s6Yxp91AJ6bxkc6PMoAAegi8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1564413685896532.8585862815315; Mon, 29 Jul 2019 08:21:25 -0700 (PDT) Received: from localhost ([::1]:53600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7Sm-00056D-Rn for importer@patchew.org; Mon, 29 Jul 2019 11:21:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43528) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7PF-0006Vc-GD for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:17:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hs7PE-00070C-Iy for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:17:45 -0400 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:33206) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hs7PE-0006zW-D7; Mon, 29 Jul 2019 11:17:44 -0400 Received: by mail-pg1-x542.google.com with SMTP id f20so19193774pgj.0; Mon, 29 Jul 2019 08:17:44 -0700 (PDT) Received: from localhost.localdomain ([136.233.9.97]) by smtp.gmail.com with ESMTPSA id h129sm58693941pfb.110.2019.07.29.08.17.36 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 08:17:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kq+GocMZNBzs7h+JrH4HUXS6sT3wW7TSwegih8ayQCc=; b=QGS4tzm7A9L671zmlDCqPUdFRUyjotBK5zxFxo2k3hRIu8U4DyIR/y2QC0Rbc41RaE RfGn74Mby75wt6zS0vfiZBHwFdPiiro7SNdwUH3sSNyx4lD0XhTQkyN+vPahoojQL2zJ rB4b+liAm32VlvWJzqoMx+CFEHC0+RDEpYHBdUoGOrK+N+U1nLipQXM7mUdSBn4H4YFl jZz6KSL/6H8CHb6UbgZalsjm+U7ynvKdcUkC4H3nTlssNnNp2nnVxWh4Oubpv1AuasAO 02tC0X53YvtnkQwgrwuNZnrjudiF0ZHQnXsbYJx7/L1NXVXAAmQsL8Dm8YUQXZYLdCfB pSYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kq+GocMZNBzs7h+JrH4HUXS6sT3wW7TSwegih8ayQCc=; b=fgL+59yNB0eYsSZcogdyW9rvQs/QlflRKgMLXWPtP6JkULxJGbltBp2hfheBMh4iBt 1S4xTelZ5Htnv6e72Hm6yuyxs9tbGB5O7Pbbjp0QrUjkTDFVextwjTSCNihG36fQ/3tQ q3HIdE6JKFaNBRqOJf33+tppSpZ3C/KuchsbvUst6AvfA0xx/P2kH2wkMaC7tV15YKXy gFDIKY1c7QvkXO5VUuvDbFJBtrmqmFO53b+gUPIzGCMhTvBgVO3oMJ//5z/uHsbTnOjW uNUoxxQIOiL6OTY8znqJhqfVjktj9Horlw3bFbbzjKAPpymvnDl/lK1YT+TEUcuKi16t U7fg== X-Gm-Message-State: APjAAAUY8W4RmtZ3VENuAIP4OGkBoDIOmZbnmN1qWXDQhSirxsnNBjHW O3EhXAJbx0qw2qlq+gjNJqKGCgXFUoKTbw== X-Google-Smtp-Source: APXvYqwp2RZp0ZUUnZ07WpEyKOm5SgzAl0TdXKac4UI2ZNWa7xU7CUMtw2IvME9LRQy0BPEm73Aq1Q== X-Received: by 2002:a63:1765:: with SMTP id 37mr36148266pgx.447.1564413463042; Mon, 29 Jul 2019 08:17:43 -0700 (PDT) From: Aarushi Mehta To: qemu-devel@nongnu.org Date: Mon, 29 Jul 2019 20:46:38 +0530 Message-Id: <20190729151651.21306-3-mehta.aaru20@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190729151651.21306-1-mehta.aaru20@gmail.com> References: <20190729151651.21306-1-mehta.aaru20@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::542 Subject: [Qemu-devel] [PATCH v7 02/15] qapi/block-core: add option for io_uring 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: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, Sergio Lopez , Markus Armbruster , Maxim Levitsky , saket.sinha89@gmail.com, Max Reitz , Stefan Hajnoczi , Paolo Bonzini , Stefan Hajnoczi , Julia Suvorova , Aarushi Mehta 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" Only enumerates option for devices that support it. Since QAPI schema supports io_uring, which is the actual name of the Linux API, it is preferred over io-uring. Signed-off-by: Aarushi Mehta Reviewed-by: Stefan Hajnoczi --- qapi/block-core.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index 0d43d4f37c..3dc93b483f 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2792,11 +2792,13 @@ # # @threads: Use qemu's thread pool # @native: Use native AIO backend (only Linux and Windows) +# @io_uring: Use linux io_uring (since 4.2) # # Since: 2.9 ## { 'enum': 'BlockdevAioOptions', - 'data': [ 'threads', 'native' ] } + 'data': [ 'threads', 'native', + { 'name': 'io_uring', 'if': 'defined(CONFIG_LINUX_IO_URING)' }= ] } =20 ## # @BlockdevCacheOptions: --=20 2.21.0 From nobody Tue Nov 11 15:57:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564413569; cv=none; d=zoho.com; s=zohoarc; b=COwuPXY6SHF7xxVeccM+IRqCZOe+PnYf9+w4ghGmWIQADQzv1WgLhcfXVQJ0CDw/IE4d71uduV6Zql36AhrMrKV8qTj6OCEYk6aEDkRnOYfX842kG7unN3/JtUB7nZxq6RZEARUBOo/y+YyjcPOe0Yt1mp4Djz0e+keVyOKqku8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564413569; h=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:ARC-Authentication-Results; bh=2qHkahVEkN1zu8CSs6/qp7V0fV616Ybkp0QDQj4tHxQ=; b=SLgyOLokx/TMqsCiuGOh7G+rmua187JuNCloqPPDtthLXOtfKbQU8W62KIUhpNM/jgFsySD/SmPhC5xNiUngNJruc2xfLNGZ7XzbLyLV9PrvvxP3eWY19vsI50HxYYaLA149MUHCv+kEL6Tc99JJPOVyXr7lMPF/GeDmjRkVBJ0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1564413569897188.43005877548796; Mon, 29 Jul 2019 08:19:29 -0700 (PDT) Received: from localhost ([::1]:53542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7Qs-0000Ff-FF for importer@patchew.org; Mon, 29 Jul 2019 11:19:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43561) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7PM-0006pe-P5 for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:17:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hs7PL-0007AD-SJ for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:17:52 -0400 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]:42326) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hs7PL-00079p-Lk; Mon, 29 Jul 2019 11:17:51 -0400 Received: by mail-pg1-x544.google.com with SMTP id t132so28415138pgb.9; Mon, 29 Jul 2019 08:17:51 -0700 (PDT) Received: from localhost.localdomain ([136.233.9.97]) by smtp.gmail.com with ESMTPSA id h129sm58693941pfb.110.2019.07.29.08.17.43 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 08:17:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2qHkahVEkN1zu8CSs6/qp7V0fV616Ybkp0QDQj4tHxQ=; b=WCxLK1lkWaRPKpbvSdxkBLv1HcNsF3ywlDY+z/zCCq/BOmwKYJ3jwYFFZInEvRg1cV fJPvE+4rPvS/JyTVH89DtxX7dJtnD49ceY9+IX7vMO23T86PGhiJyHIIDa4bXI3/deJ/ qaNW5SpsuFS/+QSosm2ecl726wjLpkcxkX3HlZpxeGzMmnTJjyU601MzxSduQWgC9xQo R6/jjcQwiO7OXQhPPoxfqMMAJUG4U28VrBJHMH0NDl/cZUSESF/Mk2KYfcgKsuThHEcy v4nGEZEVZZsfDemWhEOguimIJ/WHx4lJ3b+iUJ0zekvFFYaju9Tj4EMllGUw0adYpXSR ZEBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2qHkahVEkN1zu8CSs6/qp7V0fV616Ybkp0QDQj4tHxQ=; b=UFWsnJlw8UrN7eaQxlVAQajRmrQNeCPovZOqveYlS07SQDnxcdTZ69R95tAkCfirkB EveYUQzZgsrY1el+q8t4QlmnOoFc3MhYem6jLqInj4mRAnD6oxNxOEO0hZJW3T/PLCF1 6ksuCO9Gqb64+Myfqc+q4PllT7LXSr0qfJlnUaFyQ1SrlKLd0A2UYnS8KMfpjuA0Yki0 Z7YHKlItyc5t2c/EhmHf3ktnGEWunnDIdVMmhv/J8JNQZ4+Gp1lSGYI0lbp0ZzaV/3xl wGV48H7equgwBsP9ie3GEcX08V3TqkOw//bjW+bL5zXWjTq5tbVQXIBAeHcxc+xV1laS 7WuQ== X-Gm-Message-State: APjAAAU+Qw6NfTfdf3ZPxAxlQIw3KJpBhXXJyuw1xkYMWrA0qhj5kl1T Q6uOwC4hiPfNQdWzUC5JtO2Cln/RGsgVkQ== X-Google-Smtp-Source: APXvYqwy0340v6Bhv9d0IE0r+GKW65wsAumSUsrydFW191dJjTVErfvTWN4hJ84VGjHcfAntsrF7DQ== X-Received: by 2002:aa7:8007:: with SMTP id j7mr36857767pfi.154.1564413470389; Mon, 29 Jul 2019 08:17:50 -0700 (PDT) From: Aarushi Mehta To: qemu-devel@nongnu.org Date: Mon, 29 Jul 2019 20:46:39 +0530 Message-Id: <20190729151651.21306-4-mehta.aaru20@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190729151651.21306-1-mehta.aaru20@gmail.com> References: <20190729151651.21306-1-mehta.aaru20@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::544 Subject: [Qemu-devel] [PATCH v7 03/15] block/block: add BDRV flag for io_uring 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: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, Sergio Lopez , Markus Armbruster , Maxim Levitsky , saket.sinha89@gmail.com, Max Reitz , Stefan Hajnoczi , Paolo Bonzini , Stefan Hajnoczi , Julia Suvorova , Aarushi Mehta , Maxim Levitsky 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" Signed-off-by: Aarushi Mehta Reviewed-by: Stefan Hajnoczi Reviewed-by: Maxim Levitsky --- include/block/block.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/block/block.h b/include/block/block.h index 50a07c1c33..e29baa172c 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -121,6 +121,7 @@ typedef struct HDGeometry { ignoring the format layer */ #define BDRV_O_NO_IO 0x10000 /* don't initialize for I/O */ #define BDRV_O_AUTO_RDONLY 0x20000 /* degrade to read-only if opening read= -write fails */ +#define BDRV_O_IO_URING 0x40000 /* use io_uring instead of the thread p= ool */ =20 #define BDRV_O_CACHE_MASK (BDRV_O_NOCACHE | BDRV_O_NO_FLUSH) =20 --=20 2.21.0 From nobody Tue Nov 11 15:57:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564413657; cv=none; d=zoho.com; s=zohoarc; b=FcGg3nC4hT+cdVJhoDFAvfN5PISCZgfshyQjaKvOElg4Jb5Cu2E9nKIBGkLEjTcqjztXPT5m9oUCHAIzQFyqhTGMspLvVQ7Z4JdjUO0OSrcVWBdXTC1jxQReiUFANPDMqr9uFRp9IZpAwUsGdjPY8YkYZzT9hxYXga7Bl76gWUg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564413657; h=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:ARC-Authentication-Results; bh=nG6PnZSv2c3rm9orASq5KhxujUzGJmurDHv3h8bq90w=; b=MovBq2ci2f1NuXFAJNLFfHzsIi8RJhUS/9rvSI06NrbzqYS18wcII+J7x+m0ce8oKA4d0DgaIj8RbCF1gyxk5UJSm0NhLlfvOBOrRQQx0oo4QatsITFgYARgMJApg8ohctBVvFYZs+er6Qlwi8e+r2tu2XeR2Y8XeqkHh4J8KzI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1564413657826325.6710097833454; Mon, 29 Jul 2019 08:20:57 -0700 (PDT) Received: from localhost ([::1]:53592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7SK-0003nt-Qy for importer@patchew.org; Mon, 29 Jul 2019 11:20:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43609) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7PV-0006xV-BK for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:18:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hs7PT-0007YX-7r for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:18:01 -0400 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:42857) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hs7PS-0007UW-LR; Mon, 29 Jul 2019 11:17:59 -0400 Received: by mail-pf1-x444.google.com with SMTP id q10so28186361pff.9; Mon, 29 Jul 2019 08:17:58 -0700 (PDT) Received: from localhost.localdomain ([136.233.9.97]) by smtp.gmail.com with ESMTPSA id h129sm58693941pfb.110.2019.07.29.08.17.50 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 08:17:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nG6PnZSv2c3rm9orASq5KhxujUzGJmurDHv3h8bq90w=; b=iHXLNufsfn/TRRJTLIroAXHMZfs8xquFN35E1X2Dn1s4EDwi0iFW7UmFgm+xCOBKrV y61Eyn0AObgKTl3k5z+r5tmV4uGxjYcpKgHC3ke7IOnEQgSWUx8UTncf4EIwvOlSj9LI 9fuxpqi7owzEEqwqRmlDRwazkByL7OkqLsPlycoFnDehU1FP2uli2iNvFeRuxe1mmF54 97K2JvDWGkpd29j/s15xMZd1SKg1cZnf0+RtXqzJM6KmzN2CgliTGDTCIsv6rYuRLITP zNJRHmCFErJMthVCaal08vI+YRK7yclTa6nu4dO9U8rYeUIZclC0jZgoS9Om7IOtXLkU VaMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nG6PnZSv2c3rm9orASq5KhxujUzGJmurDHv3h8bq90w=; b=dhsZLT9LUbHyMa4iHijWCVXCo/ysqFRCCt5hGn7z65I0KO9rPkplRnDw603QrdAXAk krVAr1ZwwG8yyaiDTGHXuDPKOxL0OqflYFQITES9Jjx67G8+uvGuoUgOreYJqAQiwQm2 BvJ5chj0dB8kdSct1f0zp2iCVC/CffqdSWuJtI1WNMyyeZcwsg7oieKxDOds3begeiy0 sn241VqHuV8bImvj2cIx0Qomvf3NakmNqIz+a8HU28HFKfJ8Ll3qQmupIEmnL1EWQC8E ohXHszWAd3pttGWDjM/TVXWrBMdH4D5Ak4Ee+uF7xDVT7aw79wIjAtDlubaE/ILz/6RB 1JMQ== X-Gm-Message-State: APjAAAUbjYRnDOsHWN72znGl7yWN7nImezkpEwZw7KNP/Rg0ciVl2eVN LtDreFvmsjrP3SXy/YF7Q1yFuccOqIAIWQ== X-Google-Smtp-Source: APXvYqws41pt+QgMcCwpdxvMBDrunN/f8Kpp5jYP5yLF8B6yHWyKNnxosPA4dWk/whxB7isPfB7VQQ== X-Received: by 2002:a17:90a:37ac:: with SMTP id v41mr107748168pjb.6.1564413476924; Mon, 29 Jul 2019 08:17:56 -0700 (PDT) From: Aarushi Mehta To: qemu-devel@nongnu.org Date: Mon, 29 Jul 2019 20:46:40 +0530 Message-Id: <20190729151651.21306-5-mehta.aaru20@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190729151651.21306-1-mehta.aaru20@gmail.com> References: <20190729151651.21306-1-mehta.aaru20@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::444 Subject: [Qemu-devel] [PATCH v7 04/15] block/io_uring: implements interfaces for io_uring 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: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, Sergio Lopez , Markus Armbruster , Maxim Levitsky , saket.sinha89@gmail.com, Max Reitz , Stefan Hajnoczi , Paolo Bonzini , Stefan Hajnoczi , Julia Suvorova , Aarushi Mehta 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" Aborts when sqe fails to be set as sqes cannot be returned to the ring. Adds slow path for short reads for older kernels Signed-off-by: Aarushi Mehta Signed-off-by: Stefan Hajnoczi Reviewed-by: Stefan Hajnoczi --- MAINTAINERS | 7 + block/Makefile.objs | 3 + block/io_uring.c | 408 ++++++++++++++++++++++++++++++++++++++++ include/block/aio.h | 16 +- include/block/raw-aio.h | 12 ++ 5 files changed, 445 insertions(+), 1 deletion(-) create mode 100644 block/io_uring.c diff --git a/MAINTAINERS b/MAINTAINERS index d6de200453..be688fcd5e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2530,6 +2530,13 @@ F: block/file-posix.c F: block/file-win32.c F: block/win32-aio.c =20 +Linux io_uring +M: Aarushi Mehta +R: Stefan Hajnoczi +L: qemu-block@nongnu.org +S: Maintained +F: block/io_uring.c + qcow2 M: Kevin Wolf M: Max Reitz diff --git a/block/Makefile.objs b/block/Makefile.objs index 35f3bca4d9..6a548af8ed 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -18,6 +18,7 @@ block-obj-y +=3D block-backend.o snapshot.o qapi.o block-obj-$(CONFIG_WIN32) +=3D file-win32.o win32-aio.o block-obj-$(CONFIG_POSIX) +=3D file-posix.o block-obj-$(CONFIG_LINUX_AIO) +=3D linux-aio.o +block-obj-$(CONFIG_LINUX_IO_URING) +=3D io_uring.o block-obj-y +=3D null.o mirror.o commit.o io.o create.o block-obj-y +=3D throttle-groups.o block-obj-$(CONFIG_LINUX) +=3D nvme.o @@ -61,5 +62,7 @@ block-obj-$(if $(CONFIG_LZFSE),m,n) +=3D dmg-lzfse.o dmg-lzfse.o-libs :=3D $(LZFSE_LIBS) qcow.o-libs :=3D -lz linux-aio.o-libs :=3D -laio +io_uring.o-cflags :=3D $(LINUX_IO_URING_CFLAGS) +io_uring.o-libs :=3D $(LINUX_IO_URING_LIBS) parallels.o-cflags :=3D $(LIBXML2_CFLAGS) parallels.o-libs :=3D $(LIBXML2_LIBS) diff --git a/block/io_uring.c b/block/io_uring.c new file mode 100644 index 0000000000..d33e554862 --- /dev/null +++ b/block/io_uring.c @@ -0,0 +1,408 @@ +/* + * Linux io_uring support. + * + * Copyright (C) 2009 IBM, Corp. + * Copyright (C) 2009 Red Hat, Inc. + * Copyright (C) 2019 Aarushi Mehta + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ +#include "qemu/osdep.h" +#include +#include "qemu-common.h" +#include "block/aio.h" +#include "qemu/queue.h" +#include "block/block.h" +#include "block/raw-aio.h" +#include "qemu/coroutine.h" +#include "qapi/error.h" + +#define MAX_EVENTS 128 + +typedef struct LuringAIOCB { + Coroutine *co; + struct io_uring_sqe sqeq; + ssize_t ret; + QEMUIOVector *qiov; + bool is_read; + QSIMPLEQ_ENTRY(LuringAIOCB) next; + + /* + * Buffered reads may require resubmission, see + * luring_resubmit_short_read(). + */ + int total_read; + QEMUIOVector resubmit_qiov; +} LuringAIOCB; + +typedef struct LuringQueue { + int plugged; + unsigned int in_queue; + unsigned int in_flight; + bool blocked; + QSIMPLEQ_HEAD(, LuringAIOCB) submit_queue; +} LuringQueue; + +typedef struct LuringState { + AioContext *aio_context; + + struct io_uring ring; + + /* io queue for submit at batch. Protected by AioContext lock. */ + LuringQueue io_q; + + /* I/O completion processing. Only runs in I/O thread. */ + QEMUBH *completion_bh; +} LuringState; + +/** + * ioq_submit: + * @s: AIO state + * + * Queues pending sqes and submits them + * + */ +static int ioq_submit(LuringState *s); + +/** + * luring_resubmit: + * + * Resubmit a request by appending it to submit_queue. The caller must en= sure + * that ioq_submit() is called later so that submit_queue requests are sta= rted. + */ +static void luring_resubmit(LuringState *s, LuringAIOCB *luringcb) +{ + QSIMPLEQ_INSERT_TAIL(&s->io_q.submit_queue, luringcb, next); + s->io_q.in_queue++; +} + +/** + * luring_resubmit_short_read: + * + * Before Linux commit 9d93a3f5a0c ("io_uring: punt short reads to async + * context") a buffered I/O request with the start of the file range in the + * page cache could result in a short read. Applications need to resubmit= the + * remaining read request. + * + * This is a slow path but recent kernels never take it. + */ +static void luring_resubmit_short_read(LuringState *s, LuringAIOCB *luring= cb, + int nread) +{ + QEMUIOVector *resubmit_qiov; + size_t remaining; + + /* Update read position */ + luringcb->total_read =3D nread; + remaining =3D luringcb->qiov->size - luringcb->total_read; + + /* Shorten qiov */ + resubmit_qiov =3D &luringcb->resubmit_qiov; + if (resubmit_qiov->iov =3D=3D NULL) { + qemu_iovec_init(resubmit_qiov, luringcb->qiov->niov); + } else { + qemu_iovec_reset(resubmit_qiov); + } + qemu_iovec_concat(resubmit_qiov, luringcb->qiov, luringcb->total_read, + remaining); + + /* Update sqe */ + luringcb->sqeq.off =3D nread; + luringcb->sqeq.addr =3D (__u64)(uintptr_t)luringcb->resubmit_qiov.iov; + luringcb->sqeq.len =3D luringcb->resubmit_qiov.niov; + + luring_resubmit(s, luringcb); +} + +/** + * luring_process_completions: + * @s: AIO state + * + * Fetches completed I/O requests, consumes cqes and invokes their callbac= ks + * The function is somewhat tricky because it supports nested event loops,= for + * example when a request callback invokes aio_poll(). In order to do thi= s, + * indices are kept in LuringState. Function schedules BH completion so it + * can be called again in a nested event loop. When there are no events l= eft + * to complete the BH is being canceled. + * + */ +static void luring_process_completions(LuringState *s) +{ + struct io_uring_cqe *cqes; + int total_bytes; + /* + * Request completion callbacks can run the nested event loop. + * Schedule ourselves so the nested event loop will "see" remaining + * completed requests and process them. Without this, completion + * callbacks that wait for other requests using a nested event loop + * would hang forever. + * + * This workaround is needed because io_uring uses poll_wait, which + * is woken up when new events are added to the uring, thus polling on + * the same uring fd will block unless more events are received. + * + * Other leaf block drivers (drivers that access the data themselves) + * are networking based, so they poll sockets for data and run the + * correct coroutine. + */ + qemu_bh_schedule(s->completion_bh); + + while (io_uring_peek_cqe(&s->ring, &cqes) =3D=3D 0) { + LuringAIOCB *luringcb; + int ret; + + if (!cqes) { + break; + } + + luringcb =3D io_uring_cqe_get_data(cqes); + ret =3D cqes->res; + io_uring_cqe_seen(&s->ring, cqes); + cqes =3D NULL; + + /* Change counters one-by-one because we can be nested. */ + s->io_q.in_flight--; + + /* total_read is non-zero only for resubmitted read requests */ + total_bytes =3D ret + luringcb->total_read; + + if (ret < 0) { + if (ret =3D=3D -EINTR) { + luring_resubmit(s, luringcb); + continue; + } + } else if (!luringcb->qiov) { + goto end; + } else if (total_bytes =3D=3D luringcb->qiov->size) { + ret =3D 0; + /* Only read/write */ + } else { + /* Short Read/Write */ + if (luringcb->is_read) { + if (ret > 0) { + luring_resubmit_short_read(s, luringcb, ret); + continue; + } else { + /* Pad with zeroes */ + qemu_iovec_memset(luringcb->qiov, total_bytes, 0, + luringcb->qiov->size - total_bytes); + ret =3D 0; + } + } else { + ret =3D -ENOSPC;; + } + } +end: + luringcb->ret =3D ret; + qemu_iovec_destroy(&luringcb->resubmit_qiov); + + /* + * If the coroutine is already entered it must be in ioq_submit() + * and will notice luringcb->ret has been filled in when it + * eventually runs later. Coroutines cannot be entered recursively + * so avoid doing that! + */ + if (!qemu_coroutine_entered(luringcb->co)) { + aio_co_wake(luringcb->co); + } + } + qemu_bh_cancel(s->completion_bh); +} + +static void luring_process_completions_and_submit(LuringState *s) +{ + aio_context_acquire(s->aio_context); + luring_process_completions(s); + + if (!s->io_q.plugged && s->io_q.in_queue > 0) { + ioq_submit(s); + } + aio_context_release(s->aio_context); +} + +static void qemu_luring_completion_bh(void *opaque) +{ + LuringState *s =3D opaque; + luring_process_completions_and_submit(s); +} + +static void qemu_luring_completion_cb(void *opaque) +{ + LuringState *s =3D opaque; + luring_process_completions_and_submit(s); +} + +static void ioq_init(LuringQueue *io_q) +{ + QSIMPLEQ_INIT(&io_q->submit_queue); + io_q->plugged =3D 0; + io_q->in_queue =3D 0; + io_q->in_flight =3D 0; + io_q->blocked =3D false; +} + +static int ioq_submit(LuringState *s) +{ + int ret =3D 0; + LuringAIOCB *luringcb, *luringcb_next; + + while (s->io_q.in_queue > 0) { + /* + * Try to fetch sqes from the ring for requests waiting in + * the overflow queue + */ + QSIMPLEQ_FOREACH_SAFE(luringcb, &s->io_q.submit_queue, next, + luringcb_next) { + struct io_uring_sqe *sqes =3D io_uring_get_sqe(&s->ring); + if (!sqes) { + break; + } + /* Prep sqe for submission */ + *sqes =3D luringcb->sqeq; + QSIMPLEQ_REMOVE_HEAD(&s->io_q.submit_queue, next); + } + ret =3D io_uring_submit(&s->ring); + /* Prevent infinite loop if submission is refused */ + if (ret <=3D 0) { + if (ret =3D=3D -EAGAIN) { + continue; + } + break; + } + s->io_q.in_flight +=3D ret; + s->io_q.in_queue -=3D ret; + } + s->io_q.blocked =3D (s->io_q.in_queue > 0); + + if (s->io_q.in_flight) { + /* + * We can try to complete something just right away if there are + * still requests in-flight. + */ + luring_process_completions(s); + } + return ret; +} + +void luring_io_plug(BlockDriverState *bs, LuringState *s) +{ + s->io_q.plugged++; +} + +void luring_io_unplug(BlockDriverState *bs, LuringState *s) +{ + assert(s->io_q.plugged); + if (--s->io_q.plugged =3D=3D 0 && + !s->io_q.blocked && s->io_q.in_queue > 0) { + ioq_submit(s); + } +} + +/** + * luring_do_submit: + * @fd: file descriptor for I/O + * @luringcb: AIO control block + * @s: AIO state + * @offset: offset for request + * @type: type of request + * + * Fetches sqes from ring, adds to pending queue and preps them + * + */ +static int luring_do_submit(int fd, LuringAIOCB *luringcb, LuringState *s, + uint64_t offset, int type) +{ + struct io_uring_sqe *sqes =3D &luringcb->sqeq; + + switch (type) { + case QEMU_AIO_WRITE: + io_uring_prep_writev(sqes, fd, luringcb->qiov->iov, + luringcb->qiov->niov, offset); + break; + case QEMU_AIO_READ: + io_uring_prep_readv(sqes, fd, luringcb->qiov->iov, + luringcb->qiov->niov, offset); + break; + case QEMU_AIO_FLUSH: + io_uring_prep_fsync(sqes, fd, IORING_FSYNC_DATASYNC); + break; + default: + fprintf(stderr, "%s: invalid AIO request type, aborting 0x%x.\n", + __func__, type); + abort(); + } + io_uring_sqe_set_data(sqes, luringcb); + + QSIMPLEQ_INSERT_TAIL(&s->io_q.submit_queue, luringcb, next); + s->io_q.in_queue++; + + if (!s->io_q.blocked && + (!s->io_q.plugged || + s->io_q.in_flight + s->io_q.in_queue >=3D MAX_EVENTS)) { + return ioq_submit(s); + } + return 0; +} + +int coroutine_fn luring_co_submit(BlockDriverState *bs, LuringState *s, in= t fd, + uint64_t offset, QEMUIOVector *qiov, int t= ype) +{ + int ret; + LuringAIOCB luringcb =3D { + .co =3D qemu_coroutine_self(), + .ret =3D -EINPROGRESS, + .qiov =3D qiov, + .is_read =3D (type =3D=3D QEMU_AIO_READ), + }; + + ret =3D luring_do_submit(fd, &luringcb, s, offset, type); + if (ret < 0) { + return ret; + } + + if (luringcb.ret =3D=3D -EINPROGRESS) { + qemu_coroutine_yield(); + } + return luringcb.ret; +} + +void luring_detach_aio_context(LuringState *s, AioContext *old_context) +{ + aio_set_fd_handler(old_context, s->ring.ring_fd, false, NULL, NULL, NU= LL, + s); + qemu_bh_delete(s->completion_bh); + s->aio_context =3D NULL; +} + +void luring_attach_aio_context(LuringState *s, AioContext *new_context) +{ + s->aio_context =3D new_context; + s->completion_bh =3D aio_bh_new(new_context, qemu_luring_completion_bh= , s); + aio_set_fd_handler(s->aio_context, s->ring.ring_fd, false, + qemu_luring_completion_cb, NULL, NULL, s); +} + +LuringState *luring_init(Error **errp) +{ + int rc; + LuringState *s; + s =3D g_new0(LuringState, 1); + struct io_uring *ring =3D &s->ring; + rc =3D io_uring_queue_init(MAX_EVENTS, ring, 0); + if (rc < 0) { + error_setg_errno(errp, errno, "failed to init linux io_uring ring"= ); + g_free(s); + return NULL; + } + + ioq_init(&s->io_q); + return s; + +} + +void luring_cleanup(LuringState *s) +{ + io_uring_queue_exit(&s->ring); + g_free(s); +} diff --git a/include/block/aio.h b/include/block/aio.h index 6b0d52f732..7ba9bd7874 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -49,6 +49,7 @@ typedef void IOHandler(void *opaque); struct Coroutine; struct ThreadPool; struct LinuxAioState; +struct LuringState; =20 struct AioContext { GSource source; @@ -117,11 +118,19 @@ struct AioContext { struct ThreadPool *thread_pool; =20 #ifdef CONFIG_LINUX_AIO - /* State for native Linux AIO. Uses aio_context_acquire/release for + /* + * State for native Linux AIO. Uses aio_context_acquire/release for * locking. */ struct LinuxAioState *linux_aio; #endif +#ifdef CONFIG_LINUX_IO_URING + /* + * State for Linux io_uring. Uses aio_context_acquire/release for + * locking. + */ + struct LuringState *linux_io_uring; +#endif =20 /* TimerLists for calling timers - one per clock type. Has its own * locking. @@ -386,6 +395,11 @@ struct LinuxAioState *aio_setup_linux_aio(AioContext *= ctx, Error **errp); /* Return the LinuxAioState bound to this AioContext */ struct LinuxAioState *aio_get_linux_aio(AioContext *ctx); =20 +/* Setup the LuringState bound to this AioContext */ +struct LuringState *aio_setup_linux_io_uring(AioContext *ctx, Error **errp= ); + +/* Return the LuringState bound to this AioContext */ +struct LuringState *aio_get_linux_io_uring(AioContext *ctx); /** * aio_timer_new_with_attrs: * @ctx: the aio context diff --git a/include/block/raw-aio.h b/include/block/raw-aio.h index 0cb7cc74a2..71d7d1395f 100644 --- a/include/block/raw-aio.h +++ b/include/block/raw-aio.h @@ -55,6 +55,18 @@ void laio_attach_aio_context(LinuxAioState *s, AioContex= t *new_context); void laio_io_plug(BlockDriverState *bs, LinuxAioState *s); void laio_io_unplug(BlockDriverState *bs, LinuxAioState *s); #endif +/* io_uring.c - Linux io_uring implementation */ +#ifdef CONFIG_LINUX_IO_URING +typedef struct LuringState LuringState; +LuringState *luring_init(Error **errp); +void luring_cleanup(LuringState *s); +int coroutine_fn luring_co_submit(BlockDriverState *bs, LuringState *s, in= t fd, + uint64_t offset, QEMUIOVector *qiov, int t= ype); +void luring_detach_aio_context(LuringState *s, AioContext *old_context); +void luring_attach_aio_context(LuringState *s, AioContext *new_context); +void luring_io_plug(BlockDriverState *bs, LuringState *s); +void luring_io_unplug(BlockDriverState *bs, LuringState *s); +#endif =20 #ifdef _WIN32 typedef struct QEMUWin32AIOState QEMUWin32AIOState; --=20 2.21.0 From nobody Tue Nov 11 15:57:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564413823; cv=none; d=zoho.com; s=zohoarc; b=W310WaE0akEYxtg0EW94pP/Js7NCw0RoTiezNCvjwpYbhAaYgXib2ovWKzxy/Ypb3K5AXw8WxblPDulWtappuE6aC8WHBQrmH0He1FBI+t4eUXcD6vsSh2Lge1YDP64NR4ltwlBNLur9TZsdhHx4srKawFVwqVNY66IRykM6nIQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564413823; h=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:ARC-Authentication-Results; bh=A+f1nTAYThN43NLD0uFt8nEj4oW9MitsnNvRn4dZPNs=; b=KQYXZA9S3ZzWumHWMBnAxiuYWuJ4qTWGOA0262z/1pWWVMkvWen6BU6uIKcHOc1x5/bcEd0q58nllXL+hgbkwqjsJOe5etFIKUlcF5OFeZPeLjd33r6dN4yLd7xTfIGZjlVFRvHYXzQpcElIs/y00M6D0xE9kI/BURsI6oHuOA0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1564413823555585.8434911505093; Mon, 29 Jul 2019 08:23:43 -0700 (PDT) Received: from localhost ([::1]:53740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7V0-0001wC-K6 for importer@patchew.org; Mon, 29 Jul 2019 11:23:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43668) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7Pb-00072L-OW for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:18:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hs7Pa-0007lu-Nk for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:18:07 -0400 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:43327) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hs7Pa-0007j2-A3; Mon, 29 Jul 2019 11:18:06 -0400 Received: by mail-pg1-x543.google.com with SMTP id r22so824214pgk.10; Mon, 29 Jul 2019 08:18:05 -0700 (PDT) Received: from localhost.localdomain ([136.233.9.97]) by smtp.gmail.com with ESMTPSA id h129sm58693941pfb.110.2019.07.29.08.17.57 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 08:18:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=A+f1nTAYThN43NLD0uFt8nEj4oW9MitsnNvRn4dZPNs=; b=K7PpORk/rkBITy6c5hwX86ZB0qiMr/7hBFH/+0Cw9ysqCuTDipAbdQEmwvq0bKiqGo D5WOKXVUZbSWPIJkmBLRCmHMmH6M9ILn3MaE9NBRY+hQf69s3Qig5xHvz6ZQXeqR9Axh HMCRYZAxMKxSbZzOmSreoOS1EmxScMS1TI+xomFEq3QgHNpHQPpsquzV46FRT/zI/TGT xnUAJQj+4/MfiN0eXixv2HniijFT4euiI78Mhjl8s/t4cA3PTPWaP+0UkeYLC3d/CXba A+KqdtzvNZeBW0VtrtuS6UDSDmtaX4w2ePR2qRbCc0sbe6p4rkx3iEWPbMRfoGakVymh dgTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=A+f1nTAYThN43NLD0uFt8nEj4oW9MitsnNvRn4dZPNs=; b=ppLnHkFbRLbMMfbvYIx5EWaMPJEmL6H0zMaXBWqO79AxRvdNMsbvmV2x5mwZJNAvEw DpUT/KS/IwKjUso4fz8+kWKug2L6NF2uCh++ggQWhIWVPWYGo7ThEtzOf+Ud2w+iuwKe 0J5GfdIDezTTVlZnZIAh80YN8okZGpiA9dLp0JKA5OGeCp+XdrIGpBTYSdrXwEZjRlm+ FgnfAAKod7CWdJzWmHjzWBVZjUzrBFnTWafH409o/FJznNxZHmRnpf1RqvyLdGLlHqEK hht1lAPXsW41BTCRaD2ylR1xPvEB6GLQNpX5COR9GGjA3OLUFNz3jCrgaNSo5F1N4Psd Utlw== X-Gm-Message-State: APjAAAXD/7jLZIHdcizIuHlopXRI41TxWYCH8Cl62pOkgsF2KTSg2gGV fdw7XBtJV+iXWrhe63Lixde1kEI2KW+gbA== X-Google-Smtp-Source: APXvYqzcd0ft2mrCl9S/c6Ybp7Wy/Bk3GK63r9Fe+dqaCEX4W6asNo4QRpesFgrdZd40veJwroQcBA== X-Received: by 2002:aa7:8752:: with SMTP id g18mr35866732pfo.201.1564413484624; Mon, 29 Jul 2019 08:18:04 -0700 (PDT) From: Aarushi Mehta To: qemu-devel@nongnu.org Date: Mon, 29 Jul 2019 20:46:41 +0530 Message-Id: <20190729151651.21306-6-mehta.aaru20@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190729151651.21306-1-mehta.aaru20@gmail.com> References: <20190729151651.21306-1-mehta.aaru20@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::543 Subject: [Qemu-devel] [PATCH v7 05/15] stubs: add stubs for io_uring interface 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: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, Sergio Lopez , Markus Armbruster , Maxim Levitsky , saket.sinha89@gmail.com, Max Reitz , Stefan Hajnoczi , Paolo Bonzini , Stefan Hajnoczi , Julia Suvorova , Aarushi Mehta 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" Signed-off-by: Aarushi Mehta Reviewed-by: Stefan Hajnoczi --- MAINTAINERS | 1 + stubs/Makefile.objs | 1 + stubs/io_uring.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 stubs/io_uring.c diff --git a/MAINTAINERS b/MAINTAINERS index be688fcd5e..bca5de7d6c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2536,6 +2536,7 @@ R: Stefan Hajnoczi L: qemu-block@nongnu.org S: Maintained F: block/io_uring.c +F: stubs/io_uring.c =20 qcow2 M: Kevin Wolf diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 9c7393b08c..5cf160a9c8 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -13,6 +13,7 @@ stub-obj-y +=3D iothread.o stub-obj-y +=3D iothread-lock.o stub-obj-y +=3D is-daemonized.o stub-obj-$(CONFIG_LINUX_AIO) +=3D linux-aio.o +stub-obj-$(CONFIG_LINUX_IO_URING) +=3D io_uring.o stub-obj-y +=3D machine-init-done.o stub-obj-y +=3D migr-blocker.o stub-obj-y +=3D change-state-handler.o diff --git a/stubs/io_uring.c b/stubs/io_uring.c new file mode 100644 index 0000000000..622d1e4648 --- /dev/null +++ b/stubs/io_uring.c @@ -0,0 +1,32 @@ +/* + * Linux io_uring support. + * + * Copyright (C) 2009 IBM, Corp. + * Copyright (C) 2009 Red Hat, Inc. + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ +#include "qemu/osdep.h" +#include "block/aio.h" +#include "block/raw-aio.h" + +void luring_detach_aio_context(LuringState *s, AioContext *old_context) +{ + abort(); +} + +void luring_attach_aio_context(LuringState *s, AioContext *new_context) +{ + abort(); +} + +LuringState *luring_init(Error **errp) +{ + abort(); +} + +void luring_cleanup(LuringState *s) +{ + abort(); +} --=20 2.21.0 From nobody Tue Nov 11 15:57:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564413917; cv=none; d=zoho.com; s=zohoarc; b=REkpkTzfAvPOFfMEd4ORMokulv326y06t1W44q/YPZQx+jr1fVjevaGjFl3mpU32wmimFiSRNAHTSUoGbWjsb+5TS3+HCDk/chHpTIYrTnIiIzToD/o7+uUQkNHk6J2w9vf/gKqhgoE082I6O+MP67smjchS8+ei6sD3uFC11nk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564413917; h=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:ARC-Authentication-Results; bh=eFjnzxuAegStXPBjOt40eXvFDqL2hXLnGuTLIfY9ow8=; b=PZEtvRbV7tmQfS3w+HOQoVI3BNh5TDBmjIenNSvjVyQB6lah2uU28f3Brj18Xp86t4EjVbfckyMvfZ0HyB9MVKPP9CJp/wtCUJlzWoV3jShv4nJTMPfKlCkW3YxDNrgb1aqS3CQJpkD+41LOuzb/B1DxoEPLUXcoLMHzLN2ZjQU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1564413917416953.4125723223679; Mon, 29 Jul 2019 08:25:17 -0700 (PDT) Received: from localhost ([::1]:53820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7WU-0004fh-Mx for importer@patchew.org; Mon, 29 Jul 2019 11:25:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43716) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7Ph-0007IH-Rr for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:18:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hs7Pg-0007uc-SO for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:18:13 -0400 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]:36134) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hs7Pg-0007tm-Ml; Mon, 29 Jul 2019 11:18:12 -0400 Received: by mail-pl1-x641.google.com with SMTP id k8so27651854plt.3; Mon, 29 Jul 2019 08:18:12 -0700 (PDT) Received: from localhost.localdomain ([136.233.9.97]) by smtp.gmail.com with ESMTPSA id h129sm58693941pfb.110.2019.07.29.08.18.04 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 08:18:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eFjnzxuAegStXPBjOt40eXvFDqL2hXLnGuTLIfY9ow8=; b=d6RMTsJJ4Li8LDNoKvGFSMtne3nJ0koJtocDNJnZ2J3vbIUfSw606EmNQqRnEpgGJD uqkxp3t3jHljdFhXQJniNrTgEQCB+QbYkmmL2sLqmIWeU0vRXLQEuKj2ftgqL3wCep1v g8O/kOr5Bszn1c/7CLRJK3xabl5tYnY4mxrD78cV46wRIgypjg34vrliphvxAcnWWWUZ HwpdZ9j32Um3jwWeYZByxJB9PY2Z7q3ZUolugwk2eqVLxIQKQW1QRS7QJM1pdB3reqyI K+C6oOqIKwrokEnMF9gFgfcSDre38dCGQmIWtSyAiH4MBXn9Okss1Hgeh6Fn1SvruvlQ LZzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eFjnzxuAegStXPBjOt40eXvFDqL2hXLnGuTLIfY9ow8=; b=Qg0aHEerdhJ8VAoaEfTZ6DhDunBqfwvVT4p4A7S77IMfFDlE77xfLlIRLdIhvgvfpe Cx1zRBxrlWJjF66wOgBLVpqyJSGV/wQIwQFV2tL3+TSDxOi6GtBFaXFtdCB0ROsGG5qX au8SnzXR6R2z+Jj5YAWfLixahAd3nAZL+ojAYCmxyrIDsAv0NcUSjOPxPiY7LDkuvBVU zI7/dVNYt8YGGnLG36TpbroXRPbvsw4WeQAUm2vFb16aABESG+uT42cXfAMbYwuH1ziu lDSRvyePICNanVajq5a+2A31bI30kGJoPjdms1rBk7Q+UdtgQHsB+u490IXTg55X5Iky OYBg== X-Gm-Message-State: APjAAAXY7PS7OYC0EU/uKjniAc2yQUcIP5pZLcUG8QlDRNb+4CSi74cJ wAqKh1QwAkWB2d4Ef0rcfulfj6Cdxbiu2Q== X-Google-Smtp-Source: APXvYqyKXJh7+q9Ef37oHVYiL20DRfITfHp4vA41XF4qUEhpwBqoWmUdRxweZPRzao1vOg/CF7pXBA== X-Received: by 2002:a17:902:e4:: with SMTP id a91mr14164357pla.150.1564413491384; Mon, 29 Jul 2019 08:18:11 -0700 (PDT) From: Aarushi Mehta To: qemu-devel@nongnu.org Date: Mon, 29 Jul 2019 20:46:42 +0530 Message-Id: <20190729151651.21306-7-mehta.aaru20@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190729151651.21306-1-mehta.aaru20@gmail.com> References: <20190729151651.21306-1-mehta.aaru20@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::641 Subject: [Qemu-devel] [PATCH v7 06/15] util/async: add aio interfaces for io_uring 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: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, Sergio Lopez , Markus Armbruster , Maxim Levitsky , saket.sinha89@gmail.com, Max Reitz , Stefan Hajnoczi , Paolo Bonzini , Stefan Hajnoczi , Julia Suvorova , Aarushi Mehta 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" Signed-off-by: Aarushi Mehta Reviewed-by: Stefan Hajnoczi --- util/async.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/util/async.c b/util/async.c index 8d2105729c..2e0a5e20ac 100644 --- a/util/async.c +++ b/util/async.c @@ -276,6 +276,14 @@ aio_ctx_finalize(GSource *source) } #endif =20 +#ifdef CONFIG_LINUX_IO_URING + if (ctx->linux_io_uring) { + luring_detach_aio_context(ctx->linux_io_uring, ctx); + luring_cleanup(ctx->linux_io_uring); + ctx->linux_io_uring =3D NULL; + } +#endif + assert(QSLIST_EMPTY(&ctx->scheduled_coroutines)); qemu_bh_delete(ctx->co_schedule_bh); =20 @@ -340,6 +348,29 @@ LinuxAioState *aio_get_linux_aio(AioContext *ctx) } #endif =20 +#ifdef CONFIG_LINUX_IO_URING +LuringState *aio_setup_linux_io_uring(AioContext *ctx, Error **errp) +{ + if (ctx->linux_io_uring) { + return ctx->linux_io_uring; + } + + ctx->linux_io_uring =3D luring_init(errp); + if (!ctx->linux_io_uring) { + return NULL; + } + + luring_attach_aio_context(ctx->linux_io_uring, ctx); + return ctx->linux_io_uring; +} + +LuringState *aio_get_linux_io_uring(AioContext *ctx) +{ + assert(ctx->linux_io_uring); + return ctx->linux_io_uring; +} +#endif + void aio_notify(AioContext *ctx) { /* Write e.g. bh->scheduled before reading ctx->notify_me. Pairs @@ -431,6 +462,11 @@ AioContext *aio_context_new(Error **errp) #ifdef CONFIG_LINUX_AIO ctx->linux_aio =3D NULL; #endif + +#ifdef CONFIG_LINUX_IO_URING + ctx->linux_io_uring =3D NULL; +#endif + ctx->thread_pool =3D NULL; qemu_rec_mutex_init(&ctx->lock); timerlistgroup_init(&ctx->tlg, aio_timerlist_notify, ctx); --=20 2.21.0 From nobody Tue Nov 11 15:57:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564414178; cv=none; d=zoho.com; s=zohoarc; b=Y+kAaTVX5nHzbw2BGqXv3Q4CeojwgkLiCxOWej7/ncqk80ESLdrX3BULyy3cbG15rlLTTpQDXfqyQ16YHTaIdUWxLApxhNWEbwXQT2Tm6kuv1XY0gi9AzJSE2x863TGg6ZStfOQnKuttZjGgI0OsHmJIE/j+GhFO0Mq5Kjj7z58= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564414178; h=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:ARC-Authentication-Results; bh=LR9iVRChMwWQAhc5h02KM+c31gdyfKaD2veUCMmmXek=; b=F3a+wg0p2k0rfUGKb9MP7/A1HChRaCR4UmXETlbpmliDfqk2qM4OvyElSXVNYDDAQggbMIoNclKVeYug0rMNAZeXj1PgL5GAVXEkTHCdmMye9GB9k3N3ylzdhZ98vSuX3n/dbvqbULfXjx+gHRVVB5+vqzYSlzu/c3kPLKjqA/M= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1564414178060312.33853545338627; Mon, 29 Jul 2019 08:29:38 -0700 (PDT) Received: from localhost ([::1]:53970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7aj-0004mQ-4j for importer@patchew.org; Mon, 29 Jul 2019 11:29:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43808) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7Pq-0007aw-Fj for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:18:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hs7Pp-0008CP-BF for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:18:22 -0400 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:40019) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hs7Pp-00087l-5Z; Mon, 29 Jul 2019 11:18:21 -0400 Received: by mail-pf1-x444.google.com with SMTP id p184so28192982pfp.7; Mon, 29 Jul 2019 08:18:21 -0700 (PDT) Received: from localhost.localdomain ([136.233.9.97]) by smtp.gmail.com with ESMTPSA id h129sm58693941pfb.110.2019.07.29.08.18.11 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 08:18:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LR9iVRChMwWQAhc5h02KM+c31gdyfKaD2veUCMmmXek=; b=Sgr4c1gaaymXX9q50sFv4ldrhDJdicYmnBDuitQlWwDxPKGeQXC7go2X8lOnyaY9We 8sc68s3aplsAN+f6K5B5uZWCk4elVDYV/B703KFq7Xh8x9bOM0hWtyjSBjM5vzzvBjB6 v5Cwn9Q4d1bjw0YrLHQ57pu+klxj6yjC+LAzK0ZNRcZ3lYU5zlVj8w/Tp+qaDU7AwZ/l 5iKk3niFMKzvIYIyCWaxhBYQfxzgeL10vaZyrYyBsDqiV2jFiv9rMJ8kAZ3sWUxbg0Au BItDzZY53OTiga11ZC72O+OazQyktYtK1feGmqwJHUakJvmMx3hBRTiv6tFGcWlFQw6p 5qtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LR9iVRChMwWQAhc5h02KM+c31gdyfKaD2veUCMmmXek=; b=HgYczwJSejJfj6QOEyr/pVaAB95VJIDN79eyJuqzfIc7ZeFx/8XSDmE8doni0lBLQM 6t00fVTEmVijhtuykd6OOHChAFaA1QeU3GojHsfidZnY2qS9sWrvWnvpyvIqrXpJhe88 5SFicWTx/LIKjJQs9pZh9piKU2HZd3Zo18tk3fMmlaunW47Utej9r1mikGSrBEjXfhxV O+8HwUVuAzbuqrlia0zsSbBOGx/8P91i1SYQDdL94T9RiQgCaYRoaJ1FHHeQ8DV/bW49 XRBJd+zFWEczJalnpUdjvjv8rZbe6adqgyVe8apc27Hq4Yt4TzuRRhP1vf/Y46YYK0Wm l5lw== X-Gm-Message-State: APjAAAUl52ORJ7NpNv4g1EB3ChpjKtPtrlyBZH9WwF4NuZIduHrf2DO/ +luY7aAhpzKjhYW2I/moA2qlW3iVTWiIKg== X-Google-Smtp-Source: APXvYqw8cZH38oX1QNztMZ9AX7tTFRbv/Mh3dNgH7okgmRCZk9gl0YLlCbggnTZoQUkps/4k0BpGaA== X-Received: by 2002:aa7:97bb:: with SMTP id d27mr36899936pfq.93.1564413499891; Mon, 29 Jul 2019 08:18:19 -0700 (PDT) From: Aarushi Mehta To: qemu-devel@nongnu.org Date: Mon, 29 Jul 2019 20:46:43 +0530 Message-Id: <20190729151651.21306-8-mehta.aaru20@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190729151651.21306-1-mehta.aaru20@gmail.com> References: <20190729151651.21306-1-mehta.aaru20@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::444 Subject: [Qemu-devel] [PATCH v7 07/15] blockdev: adds bdrv_parse_aio to use io_uring 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: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, Sergio Lopez , Markus Armbruster , Maxim Levitsky , saket.sinha89@gmail.com, Max Reitz , Stefan Hajnoczi , Paolo Bonzini , Stefan Hajnoczi , Julia Suvorova , Aarushi Mehta 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" Signed-off-by: Aarushi Mehta Reviewed-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 cbd8da5f3b..401831e28d 100644 --- a/block.c +++ b/block.c @@ -844,6 +844,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 4d141e9a1f..a41623ae9a 100644 --- a/blockdev.c +++ b/blockdev.c @@ -383,13 +383,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; } } } @@ -4574,7 +4570,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 e29baa172c..ec6b9ea4c8 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -297,6 +297,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.21.0 From nobody Tue Nov 11 15:57:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564413758; cv=none; d=zoho.com; s=zohoarc; b=MWJVBDeD0ZdnmSCNWE9ACsxPc0tmSg5DSVSpyuav6s7rMc+cACHdQNkyDei9WLF8ZDJcRJJ8MjeBN7UdbGtkDoD0feqDO5KXN6OvF84iFrkrDSBZpuHQeLt2/6tfwXbi3PYBs5MDHuRBLYEmO+oamb2BeRR2qbGlr6kcCUVsw8U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564413758; h=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:ARC-Authentication-Results; bh=rFNYp/sUy+7Vn316ErSiQ+ZjgPpQQr0YSAzg9F+EV7Q=; b=DSeTpy5hmcCI0xmaZ017sSZiLhVxahCVqWcfF54tg1ByQ3gpscdF8EPGqO95NMJVS77MXM4Va8PxsMoQwij+xKxZ1vXhK8zes8mQW+53g7GF9QK7lG1mxiqE3nwhuR2LdfQYqBGJod4vn7TawZe19aqOqaJKTy3U5BHuRtaGf00= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1564413758267624.2701407769102; Mon, 29 Jul 2019 08:22:38 -0700 (PDT) Received: from localhost ([::1]:53690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7Tx-0007sR-8H for importer@patchew.org; Mon, 29 Jul 2019 11:22:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43865) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7Q3-0007bf-81 for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:18:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hs7Q1-00005J-8p for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:18:35 -0400 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]:33206) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hs7Px-0008Of-Eo; Mon, 29 Jul 2019 11:18:33 -0400 Received: by mail-pf1-x443.google.com with SMTP id g2so28206258pfq.0; Mon, 29 Jul 2019 08:18:28 -0700 (PDT) Received: from localhost.localdomain ([136.233.9.97]) by smtp.gmail.com with ESMTPSA id h129sm58693941pfb.110.2019.07.29.08.18.20 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 08:18:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rFNYp/sUy+7Vn316ErSiQ+ZjgPpQQr0YSAzg9F+EV7Q=; b=EpmbyHib7ILOGM4QYfbOz38vA3UwE10VAbAI9CNE8kUghA0FFApStoXpKxwf6FIyUz Hfd2ic8OnbPuwVSE5i1e00CQNihymxMegiZ/gnON6oHxpIPMxFJFT4Q3KtCljNomnbNn SHeIalWsRmBQVLjDrPWc1Z33xe8VawOK4f9xG6VzLEPscZK8eXJRnt9wCTD2+SLXNIwb hQ0cjs8lr/if+eE6UqU4YDTt5nT/trACOQc97uQpn6CjfynNY/qPa2L2S9Onyqh32SdD A3dyHxclIw3LvohGNyn5g437s0oPIdquGcqqV/vcaueb9Yq4PnxzT4cq4R0yjU7mzbTS a90w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rFNYp/sUy+7Vn316ErSiQ+ZjgPpQQr0YSAzg9F+EV7Q=; b=oJACrzrKp6WA+9YKVrvHbyG2nbav2h7dKSavTkZv63uaIZIobwR1Zwj2AZlbzzfpgp 9NNn0FO4A3r11BMHtxodw6z0MbXD3Fwww/Q/KmzHeftGcxHRt6mrGA8thwoNAL1PNxwv kKcfJWE26Elb//Ak0vow6gpgl7WLhh7ZB04mGpkgF8euB6GoTnhYcwGoyWB025IJqaKF t1Vl9u+plzZDU8fiERRcLgDC0ese7jwHmX6hQunq98LnbqdHh1O5L61/1hx/aj4SJYN6 2P73NRGSl+INKqux33lY+QQ0tuQAqcpWTAQfwa4yhsLMljoZgRue/2gKUNbdj+whu3so kkdA== X-Gm-Message-State: APjAAAU8yvzioSQCrZ6oz/fwaXjZ59RgktvKlkaXUI1u+DTiIKO4/th5 y4m5oeSbBNzgdFF6JtsuetWfkUgszisk+g== X-Google-Smtp-Source: APXvYqwnCNKnz43sK6X6TUlhTAfhT+J+H/tZrGRQg+fMl4zUm4mL+dGfBAuWMKwZWqelhAiJ7UDhMQ== X-Received: by 2002:a63:f452:: with SMTP id p18mr79104916pgk.373.1564413507121; Mon, 29 Jul 2019 08:18:27 -0700 (PDT) From: Aarushi Mehta To: qemu-devel@nongnu.org Date: Mon, 29 Jul 2019 20:46:44 +0530 Message-Id: <20190729151651.21306-9-mehta.aaru20@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190729151651.21306-1-mehta.aaru20@gmail.com> References: <20190729151651.21306-1-mehta.aaru20@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::443 Subject: [Qemu-devel] [PATCH v7 08/15] block/file-posix.c: extend to use io_uring 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: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, Sergio Lopez , Markus Armbruster , Maxim Levitsky , saket.sinha89@gmail.com, Max Reitz , Stefan Hajnoczi , Paolo Bonzini , Stefan Hajnoczi , Julia Suvorova , Aarushi Mehta , Maxim Levitsky 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" Signed-off-by: Aarushi Mehta Reviewed-by: Maxim Levitsky Reviewed-by: Stefan Hajnoczi --- block/file-posix.c | 99 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 79 insertions(+), 20 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index 4479cc7ab4..4aa42f826f 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; @@ -425,7 +426,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", @@ -484,9 +485,15 @@ 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); @@ -495,7 +502,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"), @@ -559,7 +570,7 @@ static int raw_open_common(BlockDriverState *bs, QDict = *options, s->shared_perm =3D BLK_PERM_ALL; =20 #ifdef CONFIG_LINUX_AIO - /* Currently Linux does AIO only for files opened with O_DIRECT */ + /* Currently Linux does AIO only for files opened with O_DIRECT */ if (s->use_linux_aio) { if (!(s->open_flags & O_DIRECT)) { error_setg(errp, "aio=3Dnative was specified, but it requires " @@ -581,6 +592,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) { @@ -1874,21 +1901,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) { @@ -1924,24 +1955,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) @@ -1961,14 +2004,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; if (!aio_setup_linux_aio(new_context, &local_err)) { @@ -1978,6 +2027,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.21.0 From nobody Tue Nov 11 15:57:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564414251; cv=none; d=zoho.com; s=zohoarc; b=GeRx2A/Dx4FfNznpGYlgUkjnMPUl9QayKFxl5nvCY1prwBlDIk0rXr1uGym4Kl5qO5hrfMK5Q4XnqoHaNKZxyb0LzU3vpKVsVjfsMtB4994R0d+PIIyiT2VqQa9E35PIn5GoemgE7V0DVq2C6aU6sDToApeHV9ALt16/j0JX25o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564414251; h=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:ARC-Authentication-Results; bh=CsviC0H5kxruu2nLsmjsEXhYUXVsWAJ6x54pOSbsHRI=; b=N7PzQWDYKpb2a1C53T3afbJUOrA1r4AxdBkfiC1zcr74U3Tb9z7HnAdpO4fRp81JiqeTtX9rQYrMTVgFTu+bMp2jhZYUOSaLe5tIi9ckRQxcydnyxshquD8muKMCImIqaLRGIedualfNoxNj3USJW/1qxOiLRwlCvELOwUORlsc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1564414251409110.9606198725653; Mon, 29 Jul 2019 08:30:51 -0700 (PDT) Received: from localhost ([::1]:54014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7bu-0007Fo-Bp for importer@patchew.org; Mon, 29 Jul 2019 11:30:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43904) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7Q5-0007dN-1Y for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:18:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hs7Q3-0000Fu-DQ for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:18:36 -0400 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]:45809) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hs7Q3-0000BZ-6d; Mon, 29 Jul 2019 11:18:35 -0400 Received: by mail-pf1-x441.google.com with SMTP id r1so28194353pfq.12; Mon, 29 Jul 2019 08:18:34 -0700 (PDT) Received: from localhost.localdomain ([136.233.9.97]) by smtp.gmail.com with ESMTPSA id h129sm58693941pfb.110.2019.07.29.08.18.27 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 08:18:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CsviC0H5kxruu2nLsmjsEXhYUXVsWAJ6x54pOSbsHRI=; b=UA1sQSbD0BgpnzosE2aBx6h50xVsRxYAyBmrVJAqvm4/r5nBCUp2mnMoNbOwF65Uxj PcOE8KTYHJLgfU7wsn6fKEovnGkJEPz3mOaiHZ5DbTLP+GtX3gMqKu5ombKdrfmPcpbu Bw3dzf0toAW6dFB+dGWTBND7RkLbl9w2Gq8cgRtOqGjhOdeSdNeRuDfBdhS3CmVuWzmd 3lF2kCykgyKmlorn7qoG5BifniuSjTKet8Q0nJSCUz2R/6CypW1NKIRYGcyr4G3p9H/K 4VFTwnDn/r4CWOgBIXmiVP+YQdbWV4R0EEQSFb/11NrLnAoIlI8YYJDTkusv7fFiyvYi 5pXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CsviC0H5kxruu2nLsmjsEXhYUXVsWAJ6x54pOSbsHRI=; b=Ml/htjH8J9GrZWv/s0UDKV5563BY24L+Qu0cI1QnS1gkNpaXd3mBsJlZ6sZDrxBR6y bFvBBeXE8pD1ypS3of6b4Qcr70CoAwz65Hq/wqp9wGrHc0/st+QCbRJX+O0Wycp7GH0+ 8AHJjz+FoKa8SLgPEEDQCU0wIjTg3H/wWG25p0+O7AU7AmQzpZPt9s7gArCRMId8bza2 BdZ2dB88UpkMvNZUcxVOtXpxoig7Ss2ZA8xoTCvoO5CKXCim3mn9L0KyejqF0JJgYNmi fozBaPze8vWV3kAbhL619vP/+NZAKAUI3cHatnrf4TqpLvY8RJuSKfe9xwJdfxjZoHdy ev/g== X-Gm-Message-State: APjAAAVx/+Q75tYYzP9yTwZWmZ/1te3CzhdJREeV32QB3VvSC3YXL0BA JchJrsE1LJlPJsHMyOWbFTJlMeEop67cUg== X-Google-Smtp-Source: APXvYqwhfc8cf11gHszg58e12d9z9XNipulSiZOpcPHjdGpkRXhow6dgx4fA06qABMo3PKEGvDP2/w== X-Received: by 2002:a63:6f41:: with SMTP id k62mr58949394pgc.32.1564413513477; Mon, 29 Jul 2019 08:18:33 -0700 (PDT) From: Aarushi Mehta To: qemu-devel@nongnu.org Date: Mon, 29 Jul 2019 20:46:45 +0530 Message-Id: <20190729151651.21306-10-mehta.aaru20@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190729151651.21306-1-mehta.aaru20@gmail.com> References: <20190729151651.21306-1-mehta.aaru20@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::441 Subject: [Qemu-devel] [PATCH v7 09/15] block: add trace events for io_uring 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: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, Sergio Lopez , Markus Armbruster , Maxim Levitsky , saket.sinha89@gmail.com, Max Reitz , Stefan Hajnoczi , Paolo Bonzini , Stefan Hajnoczi , Julia Suvorova , Aarushi Mehta 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" Signed-off-by: Aarushi Mehta Reviewed-by: Stefan Hajnoczi --- block/io_uring.c | 22 +++++++++++++++++++--- block/trace-events | 12 ++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/block/io_uring.c b/block/io_uring.c index d33e554862..c7b2b0a9e2 100644 --- a/block/io_uring.c +++ b/block/io_uring.c @@ -17,6 +17,7 @@ #include "block/raw-aio.h" #include "qemu/coroutine.h" #include "qapi/error.h" +#include "trace.h" =20 #define MAX_EVENTS 128 =20 @@ -93,6 +94,8 @@ static void luring_resubmit_short_read(LuringState *s, Lu= ringAIOCB *luringcb, QEMUIOVector *resubmit_qiov; size_t remaining; =20 + trace_luring_resubmit_short_read(s, luringcb, nread); + /* Update read position */ luringcb->total_read =3D nread; remaining =3D luringcb->qiov->size - luringcb->total_read; @@ -163,6 +166,7 @@ static void luring_process_completions(LuringState *s) =20 /* Change counters one-by-one because we can be nested. */ s->io_q.in_flight--; + trace_luring_process_completion(s, luringcb, ret); =20 /* total_read is non-zero only for resubmitted read requests */ total_bytes =3D ret + luringcb->total_read; @@ -263,6 +267,7 @@ static int ioq_submit(LuringState *s) QSIMPLEQ_REMOVE_HEAD(&s->io_q.submit_queue, next); } ret =3D io_uring_submit(&s->ring); + trace_luring_io_uring_submit(s, ret); /* Prevent infinite loop if submission is refused */ if (ret <=3D 0) { if (ret =3D=3D -EAGAIN) { @@ -287,12 +292,15 @@ static int ioq_submit(LuringState *s) =20 void luring_io_plug(BlockDriverState *bs, LuringState *s) { + trace_luring_io_plug(s); s->io_q.plugged++; } =20 void luring_io_unplug(BlockDriverState *bs, LuringState *s) { assert(s->io_q.plugged); + trace_luring_io_unplug(s, s->io_q.blocked, s->io_q.plugged, + s->io_q.in_queue, s->io_q.in_flight); if (--s->io_q.plugged =3D=3D 0 && !s->io_q.blocked && s->io_q.in_queue > 0) { ioq_submit(s); @@ -313,6 +321,7 @@ void luring_io_unplug(BlockDriverState *bs, LuringState= *s) static int luring_do_submit(int fd, LuringAIOCB *luringcb, LuringState *s, uint64_t offset, int type) { + int ret; struct io_uring_sqe *sqes =3D &luringcb->sqeq; =20 switch (type) { @@ -336,11 +345,14 @@ static int luring_do_submit(int fd, LuringAIOCB *luri= ngcb, LuringState *s, =20 QSIMPLEQ_INSERT_TAIL(&s->io_q.submit_queue, luringcb, next); s->io_q.in_queue++; - + trace_luring_do_submit(s, s->io_q.blocked, s->io_q.plugged, + s->io_q.in_queue, s->io_q.in_flight); if (!s->io_q.blocked && (!s->io_q.plugged || s->io_q.in_flight + s->io_q.in_queue >=3D MAX_EVENTS)) { - return ioq_submit(s); + ret =3D ioq_submit(s); + trace_luring_do_submit_done(s, ret); + return ret; } return 0; } @@ -355,8 +367,10 @@ int coroutine_fn luring_co_submit(BlockDriverState *bs= , LuringState *s, int fd, .qiov =3D qiov, .is_read =3D (type =3D=3D QEMU_AIO_READ), }; - + trace_luring_co_submit(bs, s, &luringcb, fd, offset, qiov ? qiov->size= : 0, + type); ret =3D luring_do_submit(fd, &luringcb, s, offset, type); + if (ret < 0) { return ret; } @@ -388,6 +402,7 @@ LuringState *luring_init(Error **errp) int rc; LuringState *s; s =3D g_new0(LuringState, 1); + trace_luring_init_state(s, sizeof(*s)); struct io_uring *ring =3D &s->ring; rc =3D io_uring_queue_init(MAX_EVENTS, ring, 0); if (rc < 0) { @@ -405,4 +420,5 @@ void luring_cleanup(LuringState *s) { io_uring_queue_exit(&s->ring); g_free(s); + trace_luring_cleanup_state(s); } diff --git a/block/trace-events b/block/trace-events index d724df0117..66aaf8352b 100644 --- a/block/trace-events +++ b/block/trace-events @@ -60,6 +60,18 @@ qmp_block_stream(void *bs) "bs %p" file_paio_submit(void *acb, void *opaque, int64_t offset, int count, int t= ype) "acb %p opaque %p offset %"PRId64" count %d type %d" file_copy_file_range(void *bs, int src, int64_t src_off, int dst, int64_t = dst_off, int64_t bytes, int flags, int64_t ret) "bs %p src_fd %d offset %"P= RIu64" dst_fd %d offset %"PRIu64" bytes %"PRIu64" flags %d ret %"PRId64 =20 +#io_uring.c +luring_init_state(void *s, size_t size) "s %p size %zu" +luring_cleanup_state(void *s) "%p freed" +luring_io_plug(void *s) "LuringState %p plug" +luring_io_unplug(void *s, int blocked, int plugged, int queued, int inflig= ht) "LuringState %p blocked %d plugged %d queued %d inflight %d" +luring_do_submit(void *s, int blocked, int plugged, int queued, int inflig= ht) "LuringState %p blocked %d plugged %d queued %d inflight %d" +luring_do_submit_done(void *s, int ret) "LuringState %p submitted to kerne= l %d" +luring_co_submit(void *bs, void *s, void *luringcb, int fd, uint64_t offse= t, size_t nbytes, int type) "bs %p s %p luringcb %p fd %d offset %" PRId64 = " nbytes %zd type %d" +luring_process_completion(void *s, void *aiocb, int ret) "LuringState %p l= uringcb %p ret %d" +luring_io_uring_submit(void *s, int ret) "LuringState %p ret %d" +luring_resubmit_short_read(void *s, void *luringcb, int nread) "LuringStat= e %p luringcb %p nread %d" + # qcow2.c qcow2_writev_start_req(void *co, int64_t offset, int bytes) "co %p offset = 0x%" PRIx64 " bytes %d" qcow2_writev_done_req(void *co, int ret) "co %p ret %d" --=20 2.21.0 From nobody Tue Nov 11 15:57:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564414022; cv=none; d=zoho.com; s=zohoarc; b=h0O2Q58t450gfNFA7D0uumRE9c2G9+OZynmZGusr4tdPVNvdXTZNwVUKKeHrZKl08QR1qZahqHmvQ1wOiIden2mBoNLKPwKyjkDW1KQQwAJxJ4L7/0Pg+JN5qeT6zTSK8TCOwiHUeAZLnL0lCQ6UmCf8pj9NXfrUbacxblMs4aM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564414022; h=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:ARC-Authentication-Results; bh=rZYA5xSOck9aKPGmwHUNllk81b/q8QLNugjTlKfx170=; b=gLUVZCMnGbzcucniXHyjoa2GmpWXeUuk222YGeAgmT4RjEBd3VTvbp6uGkM6ZNvyFn1xEo0HPQ//r6yQt7hgqOmChvem5paRhNBw4KwH+uBu4QiRJ27Z0NXoJh6N4hBXyWoen30JN7ZLV0RG1N0zIDgdZjBb5QIgMHSMax7QejY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1564414022962856.6834846527195; Mon, 29 Jul 2019 08:27:02 -0700 (PDT) Received: from localhost ([::1]:53866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7YA-0008JH-SD for importer@patchew.org; Mon, 29 Jul 2019 11:26:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43973) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7QD-0007kc-7B for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:18:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hs7QC-0000j8-83 for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:18:45 -0400 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:35000) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hs7QA-0000dn-6u; Mon, 29 Jul 2019 11:18:44 -0400 Received: by mail-pl1-x642.google.com with SMTP id w24so27637989plp.2; Mon, 29 Jul 2019 08:18:41 -0700 (PDT) Received: from localhost.localdomain ([136.233.9.97]) by smtp.gmail.com with ESMTPSA id h129sm58693941pfb.110.2019.07.29.08.18.33 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 08:18:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rZYA5xSOck9aKPGmwHUNllk81b/q8QLNugjTlKfx170=; b=WSOJpMmvb6q6f2rrL0A8KE9pSO2qkr7f/bHA4JiDGoE0oNOptA0fr7yePSyXTWf9w9 4kpNQt21Yx7/Oe0jSHG1NOlgyWBoFbXqUDRDB02WsQ05xik910aV1BHRo11kZT5fmToU Tx63tcPlAi89yeqJypL8m2svUmqp4tWImsTjbPjzJYSwcrviHVqwrZemlygFZM84LcaN oeR9gME55SJTm3tZALnLtHhEm4CvRJ6Fyl44j5B1UH7QoLXLrv1++xCFNWWX0HmVoyCK Ll5+M+sgBFP0+ityv/MYSkxjdlK2njmq2xoJ2aKrQC7bzl96w+5A3fXeCdgzyTytOwiA kTfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rZYA5xSOck9aKPGmwHUNllk81b/q8QLNugjTlKfx170=; b=f1+QOLsPWXw9UPQPMn/RbrXvX2JdyBHSqDPO4c7DB+K4AJKckDu2U0tR4s4WcunfwO Q9m09jgq/vAKAxFOlVviQwCCztFfa0ZzZzH+awyCPBcc2fkJOOZLV1zx9JO/emVlsLuk mwOTmstgyHcNexbSJZGGFZVwWp37jBDy9PWayW+gHNKgLvEFlgQ5otUZBxezl0oQ3cnX a8J8LPa6iapfJYAadb+wrEnoMvOh6mvSdJrBWW+jEdi1c4blv8+B8fhWpOdNGodUaSyE 9UwoGlKrvcqp5/Ak9ayaHVehDmya8ZGLoJ6MZUJUEuHzgBaljsyeVl/J/Xs8RJ12fsvh jKIg== X-Gm-Message-State: APjAAAUbtB1VMd1ARlsrufaWTiVcUiWClGdiyf+0fEyp159j122PDcVg fmmaortMiMrpz823CGVjV317t5qI1VOb9g== X-Google-Smtp-Source: APXvYqxD93nYleuN1AJqUQjJLPQCm/SxiPHIvotq1cDcZAq5bCdaexkbf0ktDwLy/PI3vpvVZGwczQ== X-Received: by 2002:a17:902:1129:: with SMTP id d38mr112055417pla.220.1564413520456; Mon, 29 Jul 2019 08:18:40 -0700 (PDT) From: Aarushi Mehta To: qemu-devel@nongnu.org Date: Mon, 29 Jul 2019 20:46:46 +0530 Message-Id: <20190729151651.21306-11-mehta.aaru20@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190729151651.21306-1-mehta.aaru20@gmail.com> References: <20190729151651.21306-1-mehta.aaru20@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::642 Subject: [Qemu-devel] [PATCH v7 10/15] block/io_uring: adds userspace completion polling 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: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, Sergio Lopez , Markus Armbruster , Maxim Levitsky , saket.sinha89@gmail.com, Max Reitz , Stefan Hajnoczi , Paolo Bonzini , Stefan Hajnoczi , Julia Suvorova , Aarushi Mehta 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" Signed-off-by: Aarushi Mehta Reviewed-by: Stefan Hajnoczi --- block/io_uring.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/block/io_uring.c b/block/io_uring.c index c7b2b0a9e2..691130b948 100644 --- a/block/io_uring.c +++ b/block/io_uring.c @@ -237,6 +237,21 @@ static void qemu_luring_completion_cb(void *opaque) luring_process_completions_and_submit(s); } =20 +static bool qemu_luring_poll_cb(void *opaque) +{ + LuringState *s =3D opaque; + struct io_uring_cqe *cqes; + + if (io_uring_peek_cqe(&s->ring, &cqes) =3D=3D 0) { + if (cqes) { + luring_process_completions_and_submit(s); + return true; + } + } + + return false; +} + static void ioq_init(LuringQueue *io_q) { QSIMPLEQ_INIT(&io_q->submit_queue); @@ -394,7 +409,7 @@ void luring_attach_aio_context(LuringState *s, AioConte= xt *new_context) s->aio_context =3D new_context; s->completion_bh =3D aio_bh_new(new_context, qemu_luring_completion_bh= , s); aio_set_fd_handler(s->aio_context, s->ring.ring_fd, false, - qemu_luring_completion_cb, NULL, NULL, s); + qemu_luring_completion_cb, NULL, qemu_luring_poll_c= b, s); } =20 LuringState *luring_init(Error **errp) --=20 2.21.0 From nobody Tue Nov 11 15:57:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564414097; cv=none; d=zoho.com; s=zohoarc; b=G4lAcXP93dfACjXGY4dKJoKDuLeZm5g5ihwoXch0xQE+P2NXObg6OVbxUpTsu56GuxPPajCzwy6bBQWDmAa14QxuCWVyNJKLJKHlG6UQXz1bBoUJBeuqM46Q6cSjO/8OIrr+miJkdtQ1cDIRYJ8K/rd8POxQrE/xUztDesp984s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564414097; h=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:ARC-Authentication-Results; bh=BVYr/4pg99TlxLJVHvYszPgNvVkW6Z+EpbJ9hRlTzFI=; b=I9FqgQGhuUaSAB0Vg5/8ldbdel6bWB+46CwFTDMMLYyZjUMVosXdPkFAgJT5fS+6DUk28CVryTJ+Yl8Tzvrc3gXtsTL+4eu6pc9D16aobj09M9rMMJpdYQ1C4qFdoRd6UoKOYy88v5TcOdZyocmOK6GYgSv6NuCDF8aeeb2Nh9s= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1564414097868697.7026963094827; Mon, 29 Jul 2019 08:28:17 -0700 (PDT) Received: from localhost ([::1]:53919 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7ZP-0002PO-62 for importer@patchew.org; Mon, 29 Jul 2019 11:28:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44006) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7QH-0007yL-JK for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:18:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hs7QG-0000vr-GJ for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:18:49 -0400 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:36908) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hs7QG-0000uj-AF; Mon, 29 Jul 2019 11:18:48 -0400 Received: by mail-pf1-x442.google.com with SMTP id 19so28198437pfa.4; Mon, 29 Jul 2019 08:18:48 -0700 (PDT) Received: from localhost.localdomain ([136.233.9.97]) by smtp.gmail.com with ESMTPSA id h129sm58693941pfb.110.2019.07.29.08.18.40 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 08:18:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BVYr/4pg99TlxLJVHvYszPgNvVkW6Z+EpbJ9hRlTzFI=; b=bDjKgQ00T+8PMCE5hDNRKI9eCk8wLWrxaGUOXC2DELJ1BAsGDo174Djz2pa/eXa4M8 VcZylvNEUx7a67cBGofgRlVMWXNDtKcuaSmkEknhEbCNG5leAf1uaN6Qg05MUCTz/w42 2/kxwjtnqLvxSfRpDkaKeYIRaGr2myjFJwk+pZCyoTOgVqwY1K3BVdSxEcGHZl25t0bd xYGdu5xOrnuvdt7/Lf2BSj5c0WfDS4HwohRXG58fz50Kq51gzSFTrkJ7kzc+MIvNqY3n RDHlVgnFY2ol+c0fS/T8+7TJ3hgJA9JXz3DCmVKGtz5aIjXwlQ8CefhCgvEW7WucaurP qZGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BVYr/4pg99TlxLJVHvYszPgNvVkW6Z+EpbJ9hRlTzFI=; b=fC91AxhorPYe+pmgZr0PVBjWs/zUzYy029EtW1IV4s4UVfFMyVLgj28n3xpJRy/CGi dZP8DRORzB5urGOMoQKF26zkb55tBVUCCYkxVPkIFxT3HjOXmr7p6/NHZKusHlGLxrwG mLFSfbwXdooSOEIJU2Mx3kj0PZJr+C3U8WyMMB//Giq6MSnTPg2815AWIXBzZyskDRzz FIRZbYKouvf4Ms0w3dK4dhU2ZeomQrk8yPsT0VeypAqBs040gZcm6lrtjRf0/P38f/92 3cMNn6pHEfxZFhXLvfCXl993vg5Z/afcgE4noDhz3z6vJ54ZMGSWnexwoIVhjKdOYZ8m cpTw== X-Gm-Message-State: APjAAAWcdhFv/DGh35s2ppDD/InL1aTstsZMNVMtKIgN3Od5DhPCq9OP VZ9bvu0IwsGBe+7S/1F+VogsdIL37Luu8Q== X-Google-Smtp-Source: APXvYqwlDBdmo52sqKsmBRdBCq8JZVXRa0gTzUUJfscl1iLHpvEd1yxDSSkjRP5jz1/M81XaKEdqOA== X-Received: by 2002:a63:eb51:: with SMTP id b17mr101771750pgk.384.1564413526870; Mon, 29 Jul 2019 08:18:46 -0700 (PDT) From: Aarushi Mehta To: qemu-devel@nongnu.org Date: Mon, 29 Jul 2019 20:46:47 +0530 Message-Id: <20190729151651.21306-12-mehta.aaru20@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190729151651.21306-1-mehta.aaru20@gmail.com> References: <20190729151651.21306-1-mehta.aaru20@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::442 Subject: [Qemu-devel] [PATCH v7 11/15] qemu-io: adds option to use aio engine 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: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, Sergio Lopez , Markus Armbruster , Maxim Levitsky , saket.sinha89@gmail.com, Max Reitz , Stefan Hajnoczi , Paolo Bonzini , Stefan Hajnoczi , Julia Suvorova , Aarushi Mehta 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" Signed-off-by: Aarushi Mehta --- qemu-io.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/qemu-io.c b/qemu-io.c index f64eca6940..6568f0c369 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -130,7 +130,8 @@ static void open_help(void) " -C, -- use copy-on-read\n" " -n, -- disable host cache, short for -t none\n" " -U, -- force shared permissions\n" -" -k, -- use kernel AIO implementation (on Linux only)\n" +" -k, -- use kernel AIO implementation (Linux only, prefer use of -i)\n" +" -i, -- use AIO mode (threads, native or io_uring)" " -t, -- use the given cache mode for the image\n" " -d, -- use the given discard mode for the image\n" " -o, -- options to be given to the block driver" @@ -172,7 +173,7 @@ static int open_f(BlockBackend *blk, int argc, char **a= rgv) QDict *opts; bool force_share =3D false; =20 - while ((c =3D getopt(argc, argv, "snCro:kt:d:U")) !=3D -1) { + while ((c =3D getopt(argc, argv, "snCro:kit:d:U")) !=3D -1) { switch (c) { case 's': flags |=3D BDRV_O_SNAPSHOT; @@ -204,6 +205,13 @@ static int open_f(BlockBackend *blk, int argc, char **= argv) return -EINVAL; } break; + case 'i': + if (bdrv_parse_aio(optarg, &flags) < 0) { + error_report("Invalid aio option: %s", optarg); + qemu_opts_reset(&empty_opts); + return -EINVAL; + } + break; case 'o': if (imageOpts) { printf("--image-opts and 'open -o' are mutually exclusive\= n"); @@ -291,7 +299,9 @@ static void usage(const char *name) " -n, --nocache disable host cache, short for -t none\n" " -C, --copy-on-read enable copy-on-read\n" " -m, --misalign misalign allocations for O_DIRECT\n" -" -k, --native-aio use kernel AIO implementation (on Linux only)\n" +" -k, --native-aio use kernel AIO implementation\n" +" (Linux only, prefer use of -i)\n" +" -i, --aio=3DMODE use AIO mode (threads, native or io_uring)\n" " -t, --cache=3DMODE use the given cache mode for the image\n" " -d, --discard=3DMODE use the given discard mode for the image\n" " -T, --trace [[enable=3D]][,events=3D][,file=3D]\n" @@ -489,7 +499,7 @@ static QemuOptsList file_opts =3D { int main(int argc, char **argv) { int readonly =3D 0; - const char *sopt =3D "hVc:d:f:rsnCmkt:T:U"; + const char *sopt =3D "hVc:d:f:rsnCmki:t:T:U"; const struct option lopt[] =3D { { "help", no_argument, NULL, 'h' }, { "version", no_argument, NULL, 'V' }, @@ -501,6 +511,7 @@ int main(int argc, char **argv) { "copy-on-read", no_argument, NULL, 'C' }, { "misalign", no_argument, NULL, 'm' }, { "native-aio", no_argument, NULL, 'k' }, + { "aio", required_argument, NULL, 'i' }, { "discard", required_argument, NULL, 'd' }, { "cache", required_argument, NULL, 't' }, { "trace", required_argument, NULL, 'T' }, @@ -567,6 +578,11 @@ int main(int argc, char **argv) break; case 'k': flags |=3D BDRV_O_NATIVE_AIO; + case 'i': + if (bdrv_parse_aio(optarg, &flags) < 0) { + error_report("Invalid aio option: %s", optarg); + exit(1); + } break; case 't': if (bdrv_parse_cache_mode(optarg, &flags, &writethrough) < 0) { --=20 2.21.0 From nobody Tue Nov 11 15:57:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564414349; cv=none; d=zoho.com; s=zohoarc; b=Lne07uJ+VaUnk/IDgso2/9YwV+Ajow7Zva+BpzZNdPrIA5y9dat7KlZHpnCeFLGpjP4wClR8UFyvWghK3sxB4kvPe6Z2keQRP9a6u4TDMXZ0HJ2IJMkDzbmArD3Syy5/dU/8IroRMawvQXHfXvQbUDgsLy/XXklU8ULA1xqgJmE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564414349; h=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:ARC-Authentication-Results; bh=WSpSTIHXOrvOaCUkGHFuQSPMR43SBs+6E3PxPGPC7o8=; b=fEQwjL6xu8wZSBLPPHxZ4USGE+fmwuftJAy/CCyOg4td3/jeAA0xl4wXx138xiEkNso6xpyuiougAAQ5ncRVZ9fCnh26a2tQgam3SwbTwG21YGBHxMPPp8fXOFvxIYwSYW1sgn2lSp/dKzDCw4UCvHmJYBqYj7r3/ducIinKuhE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1564414349119156.70518158735; Mon, 29 Jul 2019 08:32:29 -0700 (PDT) Received: from localhost ([::1]:54072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7dU-0001ME-5v for importer@patchew.org; Mon, 29 Jul 2019 11:32:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44053) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7QP-0008Eu-EV for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:18:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hs7QO-0001PE-9w for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:18:57 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:46720) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hs7QO-0001O9-2Q; Mon, 29 Jul 2019 11:18:56 -0400 Received: by mail-pg1-x541.google.com with SMTP id k189so9382771pgk.13; Mon, 29 Jul 2019 08:18:56 -0700 (PDT) Received: from localhost.localdomain ([136.233.9.97]) by smtp.gmail.com with ESMTPSA id h129sm58693941pfb.110.2019.07.29.08.18.47 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 08:18:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WSpSTIHXOrvOaCUkGHFuQSPMR43SBs+6E3PxPGPC7o8=; b=Em/cuWMmFKQc6ZdVMU/a859hLnYCxrqXRu9c/c5uEVt9nQy5Dq5uzXlfC1YXLXhNil m/y+Hvdn0iZ/HgEVYH3jSOfVpPXGG6pTFVKdUUwo4SqBJJDk2++Gj0p2ZPeD5u9hFiAp 4nJkTvTlgusOQqSj/YH1yseHo8g3DvjNYMTm/bfwW0MHUGq96vjzNfxX83B5FcYWPho0 FEeD8Glf3MhUE9E0sFOtdDd3Lcai025kKzkNU+PE7tXWeBcQlfhh6bFBpvhcXfkWdiSa +HBy08W3YuTB9+2M3nd01RwYO79yifgeHAK0ckIzW75bOcA6CVstTPJ4+RlACpSkn+/t ukwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WSpSTIHXOrvOaCUkGHFuQSPMR43SBs+6E3PxPGPC7o8=; b=DZN3koz8Vk55qnZoXj/1A/gJVWjGr55coXmLD25QqZlE4mt9/ZLsjzB3ft0qRumc4c ww35+hB9FyML7kgOVfyRTlbzjgo4HsUZB8wUQPkYi7x0pYA7rhnjPhw30CInIiRaKgcy PRIm+7d38GnpP83uC5vP+7e2RvDRQRd/YT0Z/J6jarUCVAovKhYloMInQwb1mU549bfI zTUU93zpgaY340c7pxLoYAJ4d436AcBYIwd74G1xcRcknnFiSF6Ll8LDm3Gv5+a8eCXf tMYa+cOc3HT1GhSxRAQmd9nr5IJ1fsCUN5gcDXOY4N4/ALtPg/nQDZTxWYICper6gbp4 rnsw== X-Gm-Message-State: APjAAAXFW2RF7ei5OcAtqcc+LJBkHqWEdxOKIxHLO/Z2nFAdXuc+x/oj X9inJIFqlf0h9U1NtAEguJE2yhVj4wh0cg== X-Google-Smtp-Source: APXvYqx7EaXu3DwiEMu5ofLpR/FxsqgM3Etvw/oGp7nOtyz03NXfz97sumOI3HmqSwCpVMn8zwQ9mw== X-Received: by 2002:a62:1ccd:: with SMTP id c196mr37507676pfc.102.1564413534801; Mon, 29 Jul 2019 08:18:54 -0700 (PDT) From: Aarushi Mehta To: qemu-devel@nongnu.org Date: Mon, 29 Jul 2019 20:46:48 +0530 Message-Id: <20190729151651.21306-13-mehta.aaru20@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190729151651.21306-1-mehta.aaru20@gmail.com> References: <20190729151651.21306-1-mehta.aaru20@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::541 Subject: [Qemu-devel] [PATCH v7 12/15] qemu-img: adds option to use aio engine for benchmarking 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: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, Sergio Lopez , Markus Armbruster , Maxim Levitsky , saket.sinha89@gmail.com, Max Reitz , Stefan Hajnoczi , Paolo Bonzini , Stefan Hajnoczi , Julia Suvorova , Aarushi Mehta 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" Signed-off-by: Aarushi Mehta --- qemu-img.c | 10 +++++++++- qemu-img.texi | 5 ++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 79983772de..3fc8dac0b1 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -4192,7 +4192,8 @@ static int img_bench(int argc, char **argv) {"force-share", no_argument, 0, 'U'}, {0, 0, 0, 0} }; - c =3D getopt_long(argc, argv, ":hc:d:f:no:qs:S:t:wU", long_options= , NULL); + c =3D getopt_long(argc, argv, ":hc:d:f:ni:o:qs:S:t:wU", long_optio= ns, + NULL); if (c =3D=3D -1) { break; } @@ -4234,6 +4235,13 @@ static int img_bench(int argc, char **argv) break; case 'n': flags |=3D BDRV_O_NATIVE_AIO; + case 'i': + ret =3D bdrv_parse_aio(optarg, &flags); + if (ret < 0) { + error_report("Invalid aio option: %s", optarg); + ret =3D -1; + goto out; + } break; case 'o': { diff --git a/qemu-img.texi b/qemu-img.texi index c8e9bba515..0a2eccea85 100644 --- a/qemu-img.texi +++ b/qemu-img.texi @@ -206,7 +206,7 @@ Command description: Amends the image format specific @var{options} for the image file @var{filename}. Not all file formats support this operation. =20 -@item bench [-c @var{count}] [-d @var{depth}] [-f @var{fmt}] [--flush-inte= rval=3D@var{flush_interval}] [-n] [--no-drain] [-o @var{offset}] [--pattern= =3D@var{pattern}] [-q] [-s @var{buffer_size}] [-S @var{step_size}] [-t @var= {cache}] [-w] [-U] @var{filename} +@item bench [-c @var{count}] [-d @var{depth}] [-f @var{fmt}] [--flush-inte= rval=3D@var{flush_interval}] [-n] [-i @var{aio}][--no-drain] [-o @var{offse= t}] [--pattern=3D@var{pattern}] [-q] [-s @var{buffer_size}] [-S @var{step_s= ize}] [-t @var{cache}] [-w] [-U] @var{filename} =20 Run a simple sequential I/O benchmark on the specified image. If @code{-w}= is specified, a write test is performed, otherwise a read test is performed. @@ -227,6 +227,9 @@ If @code{-n} is specified, the native AIO backend is us= ed if possible. On Linux, this option only works if @code{-t none} or @code{-t directsync} is specified as well. =20 +If @code{-i} is specified, aio option can be used to specify different AIO +backends: @var{threads}, @var{native} or @var{io_uring}. + For write tests, by default a buffer filled with zeros is written. This ca= n be overridden with a pattern byte specified by @var{pattern}. =20 --=20 2.21.0 From nobody Tue Nov 11 15:57:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564413931; cv=none; d=zoho.com; s=zohoarc; b=Daz2ZGRO2gGtaLRy9NC0oy61vEPlWfv+58Zczc6395kraTtww40stfEP/2rQT5SwjKcDI6MkGd4IlQ8XiLLdrB2N3/OqUQjH5RTbsuZVY339KT5VCqFNs4qxLExBUxNiqENb4THO8VqLqKFhkJbyj6EvPg+iDkQTVH/CIDZ6DTQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564413931; h=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:ARC-Authentication-Results; bh=8Jsn3Ev/tFZXw6IbvpTxlQm6I+B/bXy4T/ob5FeHHf8=; b=OgtVk+TvgS8Q2i+tqRHDn3s3N89bTXfqpo0wfnBZwQqGuMuH0hwXCij6KpmEbbGJOZQxNkAhhlbNlV5FKA8l5DgBzBlVJPgDkcKLdHm5yXx3inx93dQIMrr+HAgtl7saGD6H6cCJ0/+m6E3467A5WUcqGr/35DCVH7ZUsD0AWAI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1564413931092289.39900885988993; Mon, 29 Jul 2019 08:25:31 -0700 (PDT) Received: from localhost ([::1]:53842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7Wk-00059X-2f for importer@patchew.org; Mon, 29 Jul 2019 11:25:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44112) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7QY-00009e-8Q for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:19:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hs7QX-0001sZ-8Z for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:19:06 -0400 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:44276) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hs7QX-0001rg-2P; Mon, 29 Jul 2019 11:19:05 -0400 Received: by mail-pf1-x444.google.com with SMTP id t16so28171466pfe.11; Mon, 29 Jul 2019 08:19:04 -0700 (PDT) Received: from localhost.localdomain ([136.233.9.97]) by smtp.gmail.com with ESMTPSA id h129sm58693941pfb.110.2019.07.29.08.18.55 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 08:19:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8Jsn3Ev/tFZXw6IbvpTxlQm6I+B/bXy4T/ob5FeHHf8=; b=egrjgr0iDOvJRKZRixvkypwwDcc53Q7eYsPq6wbYfsYxVqfPUxvtKl8aIojdsgUR8N qvfPk+omRIqb9roKtvjgdAQn3myZy2PxrdrZF91tsfnY5TxSUgL3JUqqVBBvxxlSFphx iZEOTLNmyveLOgNWab93mhdn084p+1Rx2/Xenkl6/ZaGN6Zn56ZfegLH62zhKsjxUGl8 RWM8yOoxt3p9qaj4bVsROS/669/PfQFGGxss2jma41QYHdlvQzI4gu+4E91doWBkJ/Rl tq9bGNv4kBi7uLxKyTNgp28og6UdDna+9sFpDgOHZFYRbocregGTirj/ebsmF0Ik/O9L bQ2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8Jsn3Ev/tFZXw6IbvpTxlQm6I+B/bXy4T/ob5FeHHf8=; b=iAP6f2WDpywpptDUCabAth+Y10fhj5bea5GtZveeB1qIlHMYa1FNXVIiUuDapoWKW8 rCz/MdbSJSZTtR3mEACu3YUTmvyXaKVbY3EtBZsYHlnNJtwiwmrInZ5BO8f07BfTngwB imt14OwG6jGmDIV8uwYDwdkftzI4/jD2avWKuDGYlJ1XkiuOE40AWKpRJvuekcHsbL8o j+tn1iVgUg8N+ub4qLD5CmCNvK4WHVjxfnB6jWFqsMzR3BI5mlM7DAhU5aN67ZMeTAop zhvchDdiLpsKEMXbBIQIq6gh0AwhoDd/2wzzZXr4wPwg1XZDMUJr8C2hQygRUcnDwD37 zFaw== X-Gm-Message-State: APjAAAU03RAiqzxPWho/T1AWoOhLh/nJ7w7apaytG1DkCbO2I9Nrpgfh 3vPWuaaJT2QYOPc6ZAGzlzDg8vXOA3bfmA== X-Google-Smtp-Source: APXvYqzw1zxSJIG8qHfV3GudlgKWwfpeXuKYVZME47vZFv2LMyHfZb/C73jrB/dFIVMfJVBD5J6buw== X-Received: by 2002:a17:90a:bd0b:: with SMTP id y11mr107350588pjr.141.1564413543789; Mon, 29 Jul 2019 08:19:03 -0700 (PDT) From: Aarushi Mehta To: qemu-devel@nongnu.org Date: Mon, 29 Jul 2019 20:46:49 +0530 Message-Id: <20190729151651.21306-14-mehta.aaru20@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190729151651.21306-1-mehta.aaru20@gmail.com> References: <20190729151651.21306-1-mehta.aaru20@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::444 Subject: [Qemu-devel] [PATCH v7 13/15] qemu-nbd: adds option for aio engines 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: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, Sergio Lopez , Markus Armbruster , Maxim Levitsky , saket.sinha89@gmail.com, Max Reitz , Stefan Hajnoczi , Paolo Bonzini , Stefan Hajnoczi , Julia Suvorova , Aarushi Mehta 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" Signed-off-by: Aarushi Mehta Acked-by: Eric Blake Reviewed-by: Stefan Hajnoczi --- qemu-nbd.c | 12 ++++-------- qemu-nbd.texi | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/qemu-nbd.c b/qemu-nbd.c index a8cb39e510..7bb479f3c0 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -135,7 +135,7 @@ static void usage(const char *name) " '[ID_OR_NAME]'\n" " -n, --nocache disable host cache\n" " --cache=3DMODE set cache mode (none, writeback, ...)\n" -" --aio=3DMODE set AIO mode (native or threads)\n" +" --aio=3DMODE set AIO mode (native, io_uring or threads)\= n" " --discard=3DMODE set discard mode (ignore, unmap)\n" " --detect-zeroes=3DMODE set detect-zeroes mode (off, on, unmap)\n" " --image-opts treat FILE as a full set of image options\n" @@ -718,13 +718,9 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } seen_aio =3D true; - if (!strcmp(optarg, "native")) { - flags |=3D BDRV_O_NATIVE_AIO; - } else if (!strcmp(optarg, "threads")) { - /* this is the default */ - } else { - error_report("invalid aio mode `%s'", optarg); - exit(EXIT_FAILURE); + if (bdrv_parse_aio(optarg, &flags) < 0) { + error_report("Invalid aio mode '%s'", optarg); + exit(EXIT_FAILURE); } break; case QEMU_NBD_OPT_DISCARD: diff --git a/qemu-nbd.texi b/qemu-nbd.texi index 7f55657722..3ee3e4bdee 100644 --- a/qemu-nbd.texi +++ b/qemu-nbd.texi @@ -77,8 +77,8 @@ as an read-only device, @var{snapshot_param} format is The cache mode to be used with the file. See the documentation of the emulator's @code{-drive cache=3D...} option for allowed values. @item --aio=3D@var{aio} -Set the asynchronous I/O mode between @samp{threads} (the default) -and @samp{native} (Linux only). +Set the asynchronous I/O mode between @samp{threads} (the default), +@samp{native} (Linux only) and @samp{io_uring} (Linux 5.1+). @item --discard=3D@var{discard} Control whether @dfn{discard} (also known as @dfn{trim} or @dfn{unmap}) requests are ignored or passed to the filesystem. @var{discard} is one of --=20 2.21.0 From nobody Tue Nov 11 15:57:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564414194; cv=none; d=zoho.com; s=zohoarc; b=QhtZ7ql7ad/24Kif1fZUCKE/dn9pJNtQS+2E54QzQadn+HMjn0bJvAdL0+QYnbGxZ1JTTgOu23xHzq9BJKG/bkS51lV5dq/rrech1Kali0z0iuB4PCSq3+ZHq/VLiSaCp6N3UNd1CvoBbtZ6MhkVrmCPGvd62665bKDnXSj8lVc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564414194; h=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:ARC-Authentication-Results; bh=gOorbCfkOfD5hZ9Ne/IGI2m869VvMpyg8Fi+6sPnwi8=; b=J1hg0TZVUkHlijGUPrb98xsNh/IldtUDRUQQJ4Jw+X/cQsO9Ty2XbrMz0L74noUQTQHCQQMofaaGYjODVDZP0gG8MCdFbnRh3p7lW1kO+CxjRzr2u5Pzr6PYe5oDpva85Uvq6MxmSkjhSbrozQfljfZtjIuspFU1ib9UK52EW7w= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1564414194393590.6117140918072; Mon, 29 Jul 2019 08:29:54 -0700 (PDT) Received: from localhost ([::1]:53976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7ax-0005VE-N3 for importer@patchew.org; Mon, 29 Jul 2019 11:29:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44159) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7Qf-0000Sd-BK for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:19:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hs7Qe-000298-2C for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:19:13 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:38384) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hs7Qd-00026N-RX; Mon, 29 Jul 2019 11:19:11 -0400 Received: by mail-pg1-x541.google.com with SMTP id f5so19605898pgu.5; Mon, 29 Jul 2019 08:19:11 -0700 (PDT) Received: from localhost.localdomain ([136.233.9.97]) by smtp.gmail.com with ESMTPSA id h129sm58693941pfb.110.2019.07.29.08.19.04 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 08:19:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gOorbCfkOfD5hZ9Ne/IGI2m869VvMpyg8Fi+6sPnwi8=; b=F1G6OjQEueVHGDuOxyiPHc/6rCXIpTHvBUxDKg/GCcSs7LIom8AHRKoVzpeGTt0kl1 AHwgGNguLmZQbE/2H+3CvRrKuWgippajWFoUFLlIKFstyGEp649gMHswlVcEvyglMk0Y /+Bf3gd2t4SI8uNc/bxPrP/E9c3UOX3u5PklkDRcPsm24HnJzVsXqblo4OJmLKI2hnuq RudvuXeFWtylYu4MuACDcIlSO0g/Nn5Ez9tAPT/Bo2pOcTE7gZfKNzr83sWXAtPhfc28 drWwByGMWHse3DXertNDAmDXXdco0VKkqgXSvTABuResxGzV9mot+7fXOkWdly4PVpYS vKJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gOorbCfkOfD5hZ9Ne/IGI2m869VvMpyg8Fi+6sPnwi8=; b=Angjjw8uxKZb3t6E1n1WZuL4uWU8X6EEXkki+kHcxX8+kDBMkxrIthAW6J/uzmSZOL /M+bcwxmL+gfNqqppcwOnzNQ1tknMMA1LyQAV3sP1zRwDT1GFvBxY5eirNTPbQY5g1FA XY1bRXU1AImfj7chtfKmVTHZhdps1hDgByf3VHdn7F3m5LoftGUs9YF6U4bL8R565rNK jfY+WOLFMnCi4u3KOSzcgIn2vgEV69dPVaC7dd4qZvEwLFjZ7wMbIYD9PDhzYvr6ScpU GrFwo/G+RqP05xf7lKteXCOKufShSiMy4upiTBlO/uJVHKutUrxvnHunHC0BxNnimrpc ZLbQ== X-Gm-Message-State: APjAAAUEmk6s5lusdlJvRm/NcQTAjU01b7v9y1MW81B+qbrgV3iVsq6a iwdhzCGmooC+BUy1I5ehcI8Dtz5rlo4iGQ== X-Google-Smtp-Source: APXvYqx7ATTByWezOb6rtvkEfSN65BlA2JSe7DJoZbU+CNhr2MziYjNcj2wbP/ZRlbiUTdg1kapMYw== X-Received: by 2002:a63:c50f:: with SMTP id f15mr5133443pgd.372.1564413550517; Mon, 29 Jul 2019 08:19:10 -0700 (PDT) From: Aarushi Mehta To: qemu-devel@nongnu.org Date: Mon, 29 Jul 2019 20:46:50 +0530 Message-Id: <20190729151651.21306-15-mehta.aaru20@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190729151651.21306-1-mehta.aaru20@gmail.com> References: <20190729151651.21306-1-mehta.aaru20@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::541 Subject: [Qemu-devel] [PATCH v7 14/15] tests/qemu-iotests: enable testing with aio options 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: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, Sergio Lopez , Markus Armbruster , Maxim Levitsky , saket.sinha89@gmail.com, Max Reitz , Stefan Hajnoczi , Paolo Bonzini , Stefan Hajnoczi , Julia Suvorova , Aarushi Mehta 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" Signed-off-by: Aarushi Mehta Reviewed-by: Stefan Hajnoczi --- tests/qemu-iotests/check | 15 ++++++++++++++- tests/qemu-iotests/common.rc | 14 ++++++++++++++ tests/qemu-iotests/iotests.py | 9 ++++++++- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index c24874ff4a..1e398923fd 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -132,6 +132,7 @@ sortme=3Dfalse expunge=3Dtrue have_test_arg=3Dfalse cachemode=3Dfalse +aiomode=3Dfalse =20 tmp=3D"${TEST_DIR}"/$$ rm -f $tmp.list $tmp.tmp $tmp.sed @@ -141,6 +142,7 @@ export IMGFMT_GENERIC=3Dtrue export IMGPROTO=3Dfile export IMGOPTS=3D"" export CACHEMODE=3D"writeback" +export AIOMODE=3D"threads" export QEMU_IO_OPTIONS=3D"" export QEMU_IO_OPTIONS_NO_FMT=3D"" export CACHEMODE_IS_DEFAULT=3Dtrue @@ -225,6 +227,11 @@ s/ .*//p CACHEMODE_IS_DEFAULT=3Dfalse cachemode=3Dfalse continue + elif $aiomode + then + AIOMODE=3D"$r" + aiomode=3Dfalse + continue fi =20 xpand=3Dtrue @@ -269,6 +276,7 @@ other options -n show me, do not run tests -o options -o options to pass to qemu-img create/convert -c mode cache mode + -i mode AIO mode -makecheck pretty print output for make check =20 testlist options @@ -433,10 +441,13 @@ testlist options cachemode=3Dtrue xpand=3Dfalse ;; + -i) + aiomode=3Dtrue + xpand=3Dfalse + ;; -T) # deprecated timestamp option xpand=3Dfalse ;; - -v) verbose=3Dtrue xpand=3Dfalse @@ -515,6 +526,8 @@ done =20 # Set qemu-io cache mode with $CACHEMODE we have QEMU_IO_OPTIONS=3D"$QEMU_IO_OPTIONS --cache $CACHEMODE" +# Set qemu-io aio mode with $AIOMODE we have +QEMU_IO_OPTIONS=3D"$QEMU_IO_OPTIONS --aio $AIOMODE" =20 QEMU_IO_OPTIONS_NO_FMT=3D"$QEMU_IO_OPTIONS" if [ "$IMGOPTSSYNTAX" !=3D "true" ]; then diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 5502c3da2f..03f4a1cd7f 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -490,6 +490,20 @@ _default_cache_mode() return fi } +_supported_aio_modes() +{ + for mode; do + if [ "$mode" =3D "$AIOMODE" ]; then + return + fi + done + _notrun "not suitable for aio mode: $AIOMODE" +} +_default_aio_mode() +{ + AIOMODE=3D"$1" + QEMU_IO=3D"$QEMU_IO --aio $1" +} =20 _unsupported_imgopts() { diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index ce74177ab1..76f1ab0945 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -58,6 +58,7 @@ imgproto =3D os.environ.get('IMGPROTO', 'file') test_dir =3D os.environ.get('TEST_DIR') output_dir =3D os.environ.get('OUTPUT_DIR', '.') cachemode =3D os.environ.get('CACHEMODE') +aiomode =3D os.environ.get('AIOMODE') qemu_default_machine =3D os.environ.get('QEMU_DEFAULT_MACHINE') =20 socket_scm_helper =3D os.environ.get('SOCKET_SCM_HELPER', 'socket_scm_help= er') @@ -457,6 +458,7 @@ class VM(qtest.QEMUQtestMachine): options.append('file=3D%s' % path) options.append('format=3D%s' % format) options.append('cache=3D%s' % cachemode) + options.append('aio=3D%s' % aiomode) =20 if opts: options.append(opts) @@ -799,6 +801,10 @@ def verify_cache_mode(supported_cache_modes=3D[]): if supported_cache_modes and (cachemode not in supported_cache_modes): notrun('not suitable for this cache mode: %s' % cachemode) =20 +def verify_aio_mode(supported_aio_modes=3D[]): + if supported_aio_modes and (aiomode not in supported_aio_modes): + notrun('not suitable for this aio mode: %s' % aiomode) + def supports_quorum(): return 'quorum' in qemu_img_pipe('--help') =20 @@ -843,7 +849,7 @@ def skip_if_unsupported(required_formats=3D[], read_onl= y=3DFalse): return skip_test_decorator =20 def main(supported_fmts=3D[], supported_oses=3D['linux'], supported_cache_= modes=3D[], - unsupported_fmts=3D[]): + supported_aio_modes=3D[], unsupported_fmts=3D[]): '''Run tests''' =20 global debug @@ -861,6 +867,7 @@ def main(supported_fmts=3D[], supported_oses=3D['linux'= ], supported_cache_modes=3D[], verify_image_format(supported_fmts, unsupported_fmts) verify_platform(supported_oses) verify_cache_mode(supported_cache_modes) + verify_aio_mode(supported_aio_modes) =20 if debug: output =3D sys.stdout --=20 2.21.0 From nobody Tue Nov 11 15:57:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564414426; cv=none; d=zoho.com; s=zohoarc; b=OOAsV2PkBsSAqNfa4G01i7dTDL81U5dgSULvtrN1O6wyjN7vSLxJSQrJT9+f7mCH3R3kADmHeZ5Y5uUSa+PdSTyBQogMEwRtS5V3uHW8VybRWVp3aDCBybInttD/NKukMCRTGN5yNzh7XDLSJvbLR+Q0YUbXo8gkYMxf5YvgvMY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564414426; h=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:ARC-Authentication-Results; bh=fhT6p03C5v3J9yDVaVfplDSCrT3h2ddpuxbvCBZkjsk=; b=R/LG7dT817dV5RhAIY+RLFmxsvTpLlvqN3sqUGNr2IflB/wp5H3coVQXPIFLi8Kt8/gbdn2MQ2kRaYlGSSsItqKhnh62fROXBIjXiUjxDcNRpFLh4eoWqWymzj6HkxPZKTS5861DGYbWyTAHTeczpnD0cNSsviWFpiN+Zyzx2Wo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1564414426944346.35191889902865; Mon, 29 Jul 2019 08:33:46 -0700 (PDT) Received: from localhost ([::1]:54096 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7ej-00049N-OA for importer@patchew.org; Mon, 29 Jul 2019 11:33:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44223) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs7Qn-0000mq-7V for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:19:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hs7Ql-0002Zq-Cz for qemu-devel@nongnu.org; Mon, 29 Jul 2019 11:19:21 -0400 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:34306) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hs7Ql-0002X9-54; Mon, 29 Jul 2019 11:19:19 -0400 Received: by mail-pf1-x444.google.com with SMTP id b13so28204636pfo.1; Mon, 29 Jul 2019 08:19:18 -0700 (PDT) Received: from localhost.localdomain ([136.233.9.97]) by smtp.gmail.com with ESMTPSA id h129sm58693941pfb.110.2019.07.29.08.19.10 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 08:19:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fhT6p03C5v3J9yDVaVfplDSCrT3h2ddpuxbvCBZkjsk=; b=utq7f8mamy4ZSq2uBLbat1UM0eyxbZ5ft05JIMnz7csDyzPMx/9qCXMd9WjIQKZ6wC YtWbfbBhjpf2/Oc4mKqD5PJZeDzJlxvcR8BeSxc9uZ2zojQa8V/YYreJeIXHbh0mHvw2 DxnzPtcfft2uMYkP+DGb1yo+QaN3IbETMw+/JOGtklvp8EyrXxhJfD5kKVg765Hx8LYZ FGb7d8uzNI5eyQnBSk7xRxqVkR4q/VPKT4sBwK9MMKunwbEtGa6g+e+08nfpRfSHWOnF bJXvgw1EChtfTXKHCv1JovOsBGmsQpiroaBnncJB7r3NQ9U9ZNH2XcEjYT7e9wwmL48z jlaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fhT6p03C5v3J9yDVaVfplDSCrT3h2ddpuxbvCBZkjsk=; b=c8Oz3H4G7a6hn6yQNxDg2OMObapzuByEVcVkxuLkrC2gnbf18YifAt/HtM5QRsmgF8 cCzjqbYHTR7lUwShW09yJe73bmIHbfuQZXlq2WyG5cm68QGaxpQHNfgHuiIZgL+JJRDW zYc4GO6QTX7pE9XdUIiZqRQjzK4WYVSEhv+TMm6jR77IOVwtBatl0Tq+UbtIkaP5B+lB 0of4emXC/s7Sc7YKg7/kPFdEaOUdJdPwZiabOefYIlxMGazuIPdJC+KH9snc7YLTr5iO h668Amf6A5rmciAECwCppUfKQQe9+DnRMrNdsJSOWmRc5zIyWQuXenv7xrzLjfJ1DNX9 ufrQ== X-Gm-Message-State: APjAAAUGR/npn5IFjaTF6187qKJ8n3UqzksopRtzx3NuX/fxCTLxpmQw Bbdeu5fdleMJnL4DawM3z7MAU7aXTKgrFg== X-Google-Smtp-Source: APXvYqwdvhrTuIM6cHwUrb/hz4nARwe8pn+mXqqQ0kPxiQO50c89JlJ8sdaeTjxjAC3mmnV9XLj/ZQ== X-Received: by 2002:a62:1597:: with SMTP id 145mr35903183pfv.180.1564413557659; Mon, 29 Jul 2019 08:19:17 -0700 (PDT) From: Aarushi Mehta To: qemu-devel@nongnu.org Date: Mon, 29 Jul 2019 20:46:51 +0530 Message-Id: <20190729151651.21306-16-mehta.aaru20@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190729151651.21306-1-mehta.aaru20@gmail.com> References: <20190729151651.21306-1-mehta.aaru20@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::444 Subject: [Qemu-devel] [PATCH v7 15/15] tests/qemu-iotests: use AIOMODE with various tests 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: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, Sergio Lopez , Markus Armbruster , Maxim Levitsky , saket.sinha89@gmail.com, Max Reitz , Stefan Hajnoczi , Paolo Bonzini , Stefan Hajnoczi , Julia Suvorova , Aarushi Mehta 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" Signed-off-by: Aarushi Mehta --- tests/qemu-iotests/028 | 3 ++- tests/qemu-iotests/058 | 2 +- tests/qemu-iotests/089 | 4 ++-- tests/qemu-iotests/091 | 7 ++++--- tests/qemu-iotests/109 | 3 ++- tests/qemu-iotests/147 | 5 +++-- tests/qemu-iotests/181 | 10 +++++----- tests/qemu-iotests/183 | 7 ++++--- tests/qemu-iotests/185 | 17 ++++++++++++----- tests/qemu-iotests/200 | 3 ++- tests/qemu-iotests/201 | 10 +++++----- 11 files changed, 42 insertions(+), 29 deletions(-) diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028 index 01f495912f..59e7b670ed 100755 --- a/tests/qemu-iotests/028 +++ b/tests/qemu-iotests/028 @@ -108,7 +108,8 @@ echo block-backup echo =20 qemu_comm_method=3D"monitor" -_launch_qemu -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},id=3Ddisk +_launch_qemu -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},aio=3D${AIOM= ODE},\ +id=3Ddisk h=3D$QEMU_HANDLE QEMU_COMM_TIMEOUT=3D1 =20 diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058 index 8c3212a72f..38d1ed90c0 100755 --- a/tests/qemu-iotests/058 +++ b/tests/qemu-iotests/058 @@ -64,7 +64,7 @@ nbd_snapshot_img=3D"nbd:unix:$nbd_unix_socket" converted_image=3D$TEST_IMG.converted =20 # Use -f raw instead of -f $IMGFMT for the NBD connection -QEMU_IO_NBD=3D"$QEMU_IO -f raw --cache=3D$CACHEMODE" +QEMU_IO_NBD=3D"$QEMU_IO -f raw --cache=3D$CACHEMODE --aio=3D$AIOMODE" =20 echo echo "=3D=3D preparing image =3D=3D" diff --git a/tests/qemu-iotests/089 b/tests/qemu-iotests/089 index ad029f1f09..059ad75e28 100755 --- a/tests/qemu-iotests/089 +++ b/tests/qemu-iotests/089 @@ -64,7 +64,7 @@ $QEMU_IO -c 'write -P 42 0 512' -c 'write -P 23 512 512' \ =20 $QEMU_IMG convert -f raw -O $IMGFMT "$TEST_IMG.base" "$TEST_IMG" =20 -$QEMU_IO_PROG --cache $CACHEMODE \ +$QEMU_IO_PROG --cache $CACHEMODE --aio $AIOMODE \ -c 'read -P 42 0 512' -c 'read -P 23 512 512' \ -c 'read -P 66 1024 512' "json:{ \"driver\": \"$IMGFMT\", @@ -111,7 +111,7 @@ $QEMU_IO -c 'write -P 42 0x38000 512' "$TEST_IMG" | _fi= lter_qemu_io =20 # The "image.filename" part tests whether "a": { "b": "c" } and "a.b": "c"= do # the same (which they should). -$QEMU_IO_PROG --cache $CACHEMODE \ +$QEMU_IO_PROG --cache $CACHEMODE --aio $AIOMODE \ -c 'read -P 42 0x38000 512' "json:{ \"driver\": \"$IMGFMT\", \"file\": { diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091 index d62ef18a02..78741d3fe7 100755 --- a/tests/qemu-iotests/091 +++ b/tests/qemu-iotests/091 @@ -60,14 +60,15 @@ echo =3D=3D=3D Starting QEMU VM1 =3D=3D=3D echo =20 qemu_comm_method=3D"monitor" -_launch_qemu -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},id=3Ddisk +_launch_qemu -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},aio=3D${AIOM= ODE},\ + id=3Ddisk h1=3D$QEMU_HANDLE =20 echo echo =3D=3D=3D Starting QEMU VM2 =3D=3D=3D echo -_launch_qemu -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},id=3Ddisk \ - -incoming "exec: cat '${MIG_FIFO}'" +_launch_qemu -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},aio=3D${AIOM= ODE},\ + id=3Ddisk -incoming "exec: cat '${MIG_FIFO}'" h2=3D$QEMU_HANDLE =20 echo diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109 index 9897ceb6cd..451709689a 100755 --- a/tests/qemu-iotests/109 +++ b/tests/qemu-iotests/109 @@ -52,7 +52,8 @@ run_qemu() local qmp_format=3D"$3" local qmp_event=3D"$4" =20 - _launch_qemu -drive file=3D"${source_img}",format=3Draw,cache=3D${CACH= EMODE},id=3Dsrc + _launch_qemu -drive file=3D"${source_img}",format=3Draw,cache=3D${CACH= EMODE},\ + aio=3D${AIOMODE},id=3Dsrc _send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'qmp_capabilities' }" "retur= n" =20 _send_qemu_cmd $QEMU_HANDLE \ diff --git a/tests/qemu-iotests/147 b/tests/qemu-iotests/147 index 2d84fddb01..632973b23c 100755 --- a/tests/qemu-iotests/147 +++ b/tests/qemu-iotests/147 @@ -24,7 +24,7 @@ import socket import stat import time import iotests -from iotests import cachemode, imgfmt, qemu_img, qemu_nbd, qemu_nbd_early_= pipe +from iotests import cachemode, aiomode, imgfmt, qemu_img, qemu_nbd, qemu_n= bd_early_pipe =20 NBD_PORT_START =3D 32768 NBD_PORT_END =3D NBD_PORT_START + 1024 @@ -134,7 +134,8 @@ class BuiltinNBD(NBDBlockdevAddBase): self.server.add_drive_raw('if=3Dnone,id=3Dnbd-export,' + 'file=3D%s,' % test_img + 'format=3D%s,' % imgfmt + - 'cache=3D%s' % cachemode) + 'cache=3D%s' % cachemode + + 'aio=3D%s' % aiomode) self.server.launch() =20 def tearDown(self): diff --git a/tests/qemu-iotests/181 b/tests/qemu-iotests/181 index e317e63422..547c1b47b0 100755 --- a/tests/qemu-iotests/181 +++ b/tests/qemu-iotests/181 @@ -58,21 +58,21 @@ qemu_comm_method=3D"monitor" =20 if [ "$IMGOPTSSYNTAX" =3D "true" ]; then _launch_qemu \ - -drive "${TEST_IMG}",cache=3D${CACHEMODE},id=3Ddisk + -drive "${TEST_IMG}",cache=3D${CACHEMODE},aio=3D$AIOMODE,id=3Ddisk else _launch_qemu \ - -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},driver=3D$IMGFMT,= id=3Ddisk + -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},aio=3D$AIOMODE,dr= iver=3D$IMGFMT,id=3Ddisk fi src=3D$QEMU_HANDLE =20 if [ "$IMGOPTSSYNTAX" =3D "true" ]; then _launch_qemu \ - -drive "${TEST_IMG}",cache=3D${CACHEMODE},id=3Ddisk \ + -drive "${TEST_IMG}",cache=3D${CACHEMODE},aio=3D$AIOMODE,id=3Ddisk= \ -incoming "unix:${MIG_SOCKET}" else _launch_qemu \ - -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},driver=3D$IMGFMT,= id=3Ddisk \ - -incoming "unix:${MIG_SOCKET}" + -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},aio=3D$AIOMODE,dr= iver=3D$IMGFMT,\ + id=3Ddisk -incoming "unix:${MIG_SOCKET}" fi dest=3D$QEMU_HANDLE =20 diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183 index fbe5a99beb..b16db9466d 100755 --- a/tests/qemu-iotests/183 +++ b/tests/qemu-iotests/183 @@ -56,13 +56,14 @@ echo qemu_comm_method=3D"qmp" =20 _launch_qemu \ - -drive file=3D"${TEST_IMG}",cache=3D$CACHEMODE,driver=3D$IMGFMT,id=3Dd= isk + -drive file=3D"${TEST_IMG}",cache=3D$CACHEMODE,aio=3D$AIOMODE,\ + driver=3D$IMGFMT,id=3Ddisk src=3D$QEMU_HANDLE _send_qemu_cmd $src "{ 'execute': 'qmp_capabilities' }" 'return' =20 _launch_qemu \ - -drive file=3D"${TEST_IMG}.dest",cache=3D$CACHEMODE,driver=3D$IMGFMT,i= d=3Ddisk \ - -incoming "unix:${MIG_SOCKET}" + -drive file=3D"${TEST_IMG}.dest",cache=3D$CACHEMODE,aio=3D$AIOMODE,\ + driver=3D$IMGFMT,id=3Ddisk -incoming "unix:${MIG_SOCKET}" dest=3D$QEMU_HANDLE _send_qemu_cmd $dest "{ 'execute': 'qmp_capabilities' }" 'return' =20 diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185 index 454ff600cc..1c74a0ef5a 100755 --- a/tests/qemu-iotests/185 +++ b/tests/qemu-iotests/185 @@ -54,7 +54,8 @@ echo qemu_comm_method=3D"qmp" =20 _launch_qemu \ - -drive file=3D"${TEST_IMG}.base",cache=3D$CACHEMODE,driver=3D$IMGFMT,i= d=3Ddisk + -drive file=3D"${TEST_IMG}.base",cache=3D$CACHEMODE,aio=3D$AIOMODE,\ + driver=3D$IMGFMT,id=3Ddisk h=3D$QEMU_HANDLE _send_qemu_cmd $h "{ 'execute': 'qmp_capabilities' }" 'return' =20 @@ -125,7 +126,8 @@ echo =3D=3D=3D Start active commit job and exit qemu = =3D=3D=3D echo =20 _launch_qemu \ - -drive file=3D"${TEST_IMG}",cache=3D$CACHEMODE,driver=3D$IMGFMT,id=3Dd= isk + -drive file=3D"${TEST_IMG}",cache=3D$CACHEMODE,aio=3D$AIOMODE,driver= =3D$IMGFMT,\ + id=3Ddisk h=3D$QEMU_HANDLE _send_qemu_cmd $h "{ 'execute': 'qmp_capabilities' }" 'return' =20 @@ -147,7 +149,8 @@ echo =3D=3D=3D Start mirror job and exit qemu =3D=3D=3D echo =20 _launch_qemu \ - -drive file=3D"${TEST_IMG}",cache=3D$CACHEMODE,driver=3D$IMGFMT,id=3Dd= isk + -drive file=3D"${TEST_IMG}",cache=3D$CACHEMODE,aio=3D$AIOMODE,driver= =3D$IMGFMT,\ + id=3Ddisk h=3D$QEMU_HANDLE _send_qemu_cmd $h "{ 'execute': 'qmp_capabilities' }" 'return' =20 @@ -172,7 +175,9 @@ echo =3D=3D=3D Start backup job and exit qemu =3D=3D=3D echo =20 _launch_qemu \ - -drive file=3D"${TEST_IMG}",cache=3D$CACHEMODE,driver=3D$IMGFMT,id=3Dd= isk + _launch_qemu \ + -drive file=3D"${TEST_IMG}",cache=3D$CACHEMODE,aio=3D$AIOMODE,driver= =3D$IMGFMT,\ + id=3Ddisk h=3D$QEMU_HANDLE _send_qemu_cmd $h "{ 'execute': 'qmp_capabilities' }" 'return' =20 @@ -196,7 +201,9 @@ echo =3D=3D=3D Start streaming job and exit qemu =3D=3D= =3D echo =20 _launch_qemu \ - -drive file=3D"${TEST_IMG}",cache=3D$CACHEMODE,driver=3D$IMGFMT,id=3Dd= isk + _launch_qemu \ + -drive file=3D"${TEST_IMG}",cache=3D$CACHEMODE,aio=3D$AIOMODE,driver= =3D$IMGFMT,\ + id=3Ddisk h=3D$QEMU_HANDLE _send_qemu_cmd $h "{ 'execute': 'qmp_capabilities' }" 'return' =20 diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200 index 72d431f251..b554dd947b 100755 --- a/tests/qemu-iotests/200 +++ b/tests/qemu-iotests/200 @@ -66,7 +66,8 @@ echo =3D=3D=3D Starting QEMU VM =3D=3D=3D echo qemu_comm_method=3D"qmp" _launch_qemu -object iothread,id=3Diothread0 $virtio_scsi \ - -drive file=3D"${TEST_IMG}",media=3Ddisk,if=3Dnone,cache=3D$C= ACHEMODE,id=3Ddrive_sysdisk,format=3D$IMGFMT \ + -drive file=3D"${TEST_IMG}",media=3Ddisk,if=3Dnone,cache=3D$C= ACHEMODE,\ + aio=3D$AIOMODE,id=3Ddrive_sysdisk,format=3D$IMGFMT \ -device scsi-hd,drive=3Ddrive_sysdisk,bus=3Dscsi0.0,id=3Dsysd= isk,bootindex=3D0 h1=3D$QEMU_HANDLE =20 diff --git a/tests/qemu-iotests/201 b/tests/qemu-iotests/201 index 7abf740fe4..48837c4f30 100755 --- a/tests/qemu-iotests/201 +++ b/tests/qemu-iotests/201 @@ -58,21 +58,21 @@ qemu_comm_method=3D"monitor" =20 if [ "$IMGOPTSSYNTAX" =3D "true" ]; then _launch_qemu \ - -drive "${TEST_IMG}",cache=3D${CACHEMODE},id=3Ddisk + -drive "${TEST_IMG}",cache=3D${CACHEMODE},aio=3D$AIOMODE,id=3Ddisk else _launch_qemu \ - -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},driver=3D$IMGFMT,= id=3Ddisk + -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},aio=3D$AIOMODE,dr= iver=3D$IMGFMT,id=3Ddisk fi src=3D$QEMU_HANDLE =20 if [ "$IMGOPTSSYNTAX" =3D "true" ]; then _launch_qemu \ - -drive "${TEST_IMG}",cache=3D${CACHEMODE},id=3Ddisk \ + -drive "${TEST_IMG}",cache=3D${CACHEMODE},aio=3D$AIOMODE,id=3Ddisk= \ -incoming "unix:${MIG_SOCKET}" else _launch_qemu \ - -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},driver=3D$IMGFMT,= id=3Ddisk \ - -incoming "unix:${MIG_SOCKET}" + -drive file=3D"${TEST_IMG}",cache=3D${CACHEMODE},aio=3D$AIOMODE,dr= iver=3D$IMGFMT,\ + id=3Ddisk -incoming "unix:${MIG_SOCKET}" fi dest=3D$QEMU_HANDLE =20 --=20 2.21.0