From nobody Fri Mar 29 09:49:29 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675265363; cv=none; d=zohomail.com; s=zohoarc; b=CQgn+bK5Hgz6BfepIRwRCrCo/LeFivFaHHFXJRYJehLhnXNW2v39gPayhbIzVduUSrBDIagqZiiPhrXrSGlBn5f5KfXRv8z0xKwhPS2Yu3Ish4VYoh+OfISWTFGsUJoPBe/5JcCS9Aq8gbRjEDdb8aWV9nZBGO01iExbaAskVAg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675265363; 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; bh=Kd51aFPAvuW0Q9XRXRzTh4Hz980obJ5XCDHSYQ1gNvE=; b=juYh9cRZmMzqiV2jsZhbWjalsIz9B3WzUKnGg3FvwgKGEJVp/pGlPjrZ2KAc+mlV5owgVBAMOBtOKJFKE/PThqCYxXaKBBxqzPwPij/dKe/8r34lRG4XfjrZz0rrjDTIUFg5LwsaJNsmUL+1GEBFEiIXYLBEcfMLpULp6cq1WA8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675265363221461.7755142242246; Wed, 1 Feb 2023 07:29:23 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNF1n-0001WV-QB; Wed, 01 Feb 2023 10:28:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNF1m-0001Vm-Ux for qemu-devel@nongnu.org; Wed, 01 Feb 2023 10:28:02 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNF1l-00070m-Ce for qemu-devel@nongnu.org; Wed, 01 Feb 2023 10:28:02 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-497--d3f9_-zPvOuDugdrO5t-Q-1; Wed, 01 Feb 2023 10:27:57 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8DC7F857A93; Wed, 1 Feb 2023 15:27:56 +0000 (UTC) Received: from localhost (unknown [10.39.195.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0D190404BEC0; Wed, 1 Feb 2023 15:27:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675265280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Kd51aFPAvuW0Q9XRXRzTh4Hz980obJ5XCDHSYQ1gNvE=; b=WJk60kxqrvSLWCWL6nL36S+IM8VXyJeKOgLRFewPovVjJNY/Kau67q+KzzmU4ktvjdS0xY 1DxfpJM7rkK12iYAITeMVNOoivVaRXtXwxSbcWP34X04USYdeEldrDl4ktWfBP/9/SZm/8 lyGzG6bxxs7csgQK9pr7UB4BjS3md9c= X-MC-Unique: -d3f9_-zPvOuDugdrO5t-Q-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , qemu-block@nongnu.org, Hanna Reitz , Fam Zheng , Fiona Ebner , qemu-stable@nongnu.org, Eric Blake Subject: [PATCH v3 1/4] block: fix detect-zeroes= with BDRV_REQ_REGISTERED_BUF Date: Wed, 1 Feb 2023 10:27:48 -0500 Message-Id: <20230201152751.270508-2-stefanha@redhat.com> In-Reply-To: <20230201152751.270508-1-stefanha@redhat.com> References: <20230201152751.270508-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675265365243100002 Content-Type: text/plain; charset="utf-8" When a write request is converted into a write zeroes request by the detect-zeroes=3D feature, it is no longer associated with an I/O buffer. The BDRV_REQ_REGISTERED_BUF flag doesn't make sense without an I/O buffer and must be cleared because bdrv_co_do_pwrite_zeroes() fails with -EINVAL when it's set. Fiona Ebner bisected and diagnosed this QEMU 7.2 regression where writes containing zeroes to a blockdev with discard=3Dunmap,detect-zeroes=3Dunmap fail. Buglink: https://gitlab.com/qemu-project/qemu/-/issues/1404 Fixes: e8b6535533be ("block: add BDRV_REQ_REGISTERED_BUF request flag") Tested-by: Fiona Ebner Cc: qemu-stable@nongnu.org Reviewed-by: Eric Blake Signed-off-by: Stefan Hajnoczi Reviewed-by: Hanna Czenczek --- block/io.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/block/io.c b/block/io.c index a09a19f7a7..24a2bc42d3 100644 --- a/block/io.c +++ b/block/io.c @@ -1926,6 +1926,9 @@ static int coroutine_fn bdrv_aligned_pwritev(BdrvChil= d *child, if (bs->detect_zeroes =3D=3D BLOCKDEV_DETECT_ZEROES_OPTIONS_UNMAP)= { flags |=3D BDRV_REQ_MAY_UNMAP; } + + /* Can't use optimization hint with bufferless zero write */ + flags &=3D ~BDRV_REQ_REGISTERED_BUF; } =20 if (ret < 0) { --=20 2.39.1 From nobody Fri Mar 29 09:49:30 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675265336; cv=none; d=zohomail.com; s=zohoarc; b=btkxreEIJoIdEahfBWkTST5Azek0rbZ7w3OSIbU8v5RiXmGvcGqwo4ob0zBG5g+oUrczRtXD5KM4nf3CH6+N4D6H0b6vl/W9OsYgKbaeogRiCq8MQYzAub5TrH79GneTlROjBpFT2t7fUQI8P8i5crTPF3f7yIxdQ1aeMtOUkh8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675265336; 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; bh=jspWCkLgEFUCGt5BhuCne7rHezJEGJlqhz9McuYKrI8=; b=jgZON4hSCC4HBfZXL86CYqlh2oOaeCi6BKBDWKa27l/LsLaeraIdF7XxxzR+Co3r70ASkkMOMkeMqdaj4MGbpq/nvldeozU4FOHhjgDfKBqRatpv/GwbXYOVbZJd/PDOpzvh9Iklb5abxTUEuSFuWqURBdTfrJAjC1e79iwmi4Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675265336235361.9242575202712; Wed, 1 Feb 2023 07:28:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNF1p-0001XQ-L4; Wed, 01 Feb 2023 10:28:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNF1o-0001Wu-Lo for qemu-devel@nongnu.org; Wed, 01 Feb 2023 10:28:04 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNF1n-000716-4Y for qemu-devel@nongnu.org; Wed, 01 Feb 2023 10:28:04 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-331-hZRtH3xqPJiWpzyfne1yUw-1; Wed, 01 Feb 2023 10:27:59 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E62A218A6465; Wed, 1 Feb 2023 15:27:58 +0000 (UTC) Received: from localhost (unknown [10.39.195.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 653B2404CD80; Wed, 1 Feb 2023 15:27:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675265282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jspWCkLgEFUCGt5BhuCne7rHezJEGJlqhz9McuYKrI8=; b=D4SIxbt2RePcOZ67xn3QW3WN3d8j2aOk0sJWRsEAxpwdING3SvwkvA4FDOcewoLebCBCzS 7Et8gZa2dvSrlxvnm68aSnc3osAjU5X2lMUpr7lOQvJEkGKUsi6lAHdOwjD1pWe/N36wtF vWSyzpxhLH4yYRNkKAS4tTQv3IsWfzE= X-MC-Unique: hZRtH3xqPJiWpzyfne1yUw-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , qemu-block@nongnu.org, Hanna Reitz , Fam Zheng , Fiona Ebner , Eric Blake Subject: [PATCH v3 2/4] qemu-io: use BdrvRequestFlags instead of int Date: Wed, 1 Feb 2023 10:27:49 -0500 Message-Id: <20230201152751.270508-3-stefanha@redhat.com> In-Reply-To: <20230201152751.270508-1-stefanha@redhat.com> References: <20230201152751.270508-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675265337353100003 Content-Type: text/plain; charset="utf-8" The block layer APIs use BdrvRequestFlags while qemu-io code uses int. Although the code compiles and runs fine, BdrvRequestFlags is clearer because it differentiates between other types of flags like bdrv_open() flags. This is purely refactoring. Reviewed-by: Eric Blake Signed-off-by: Stefan Hajnoczi Reviewed-by: Hanna Czenczek --- qemu-io-cmds.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index 952dc940f1..c0125d14c0 100644 --- a/qemu-io-cmds.c +++ b/qemu-io-cmds.c @@ -556,7 +556,7 @@ static int do_pread(BlockBackend *blk, char *buf, int64= _t offset, } =20 static int do_pwrite(BlockBackend *blk, char *buf, int64_t offset, - int64_t bytes, int flags, int64_t *total) + int64_t bytes, BdrvRequestFlags flags, int64_t *total) { int ret; =20 @@ -577,7 +577,7 @@ typedef struct { int64_t offset; int64_t bytes; int64_t *total; - int flags; + BdrvRequestFlags flags; int ret; bool done; } CoWriteZeroes; @@ -598,7 +598,8 @@ static void coroutine_fn co_pwrite_zeroes_entry(void *o= paque) } =20 static int do_co_pwrite_zeroes(BlockBackend *blk, int64_t offset, - int64_t bytes, int flags, int64_t *total) + int64_t bytes, BdrvRequestFlags flags, + int64_t *total) { Coroutine *co; CoWriteZeroes data =3D { @@ -688,7 +689,7 @@ static int do_aio_readv(BlockBackend *blk, QEMUIOVector= *qiov, } =20 static int do_aio_writev(BlockBackend *blk, QEMUIOVector *qiov, - int64_t offset, int flags, int *total) + int64_t offset, BdrvRequestFlags flags, int *tota= l) { int async_ret =3D NOT_DONE; =20 @@ -1065,7 +1066,7 @@ static int write_f(BlockBackend *blk, int argc, char = **argv) struct timespec t1, t2; bool Cflag =3D false, qflag =3D false, bflag =3D false; bool Pflag =3D false, zflag =3D false, cflag =3D false, sflag =3D fals= e; - int flags =3D 0; + BdrvRequestFlags flags =3D 0; int c, cnt, ret; char *buf =3D NULL; int64_t offset; @@ -1266,7 +1267,7 @@ static int writev_f(BlockBackend *blk, int argc, char= **argv) { struct timespec t1, t2; bool Cflag =3D false, qflag =3D false; - int flags =3D 0; + BdrvRequestFlags flags =3D 0; int c, cnt, ret; char *buf; int64_t offset; @@ -1581,7 +1582,7 @@ static int aio_write_f(BlockBackend *blk, int argc, c= har **argv) int nr_iov, c; int pattern =3D 0xcd; struct aio_ctx *ctx =3D g_new0(struct aio_ctx, 1); - int flags =3D 0; + BdrvRequestFlags flags =3D 0; =20 ctx->blk =3D blk; while ((c =3D getopt(argc, argv, "CfiqP:uz")) !=3D -1) { --=20 2.39.1 From nobody Fri Mar 29 09:49:30 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675265328; cv=none; d=zohomail.com; s=zohoarc; b=UJMxseAN2IO3yCsUH7UZV1UKd0JYCisP2zxED/dw8H8VnBe1UEsAE4ICXhSjcLTtxVXiTbQQA32aGeZGvxgYAkmMWQ7MVNpWIKONog3Za5u0gdHvrk/ySVsLrVeJKTu08Bvqz+omSpggcMtMVcQrH11/nddeAptjA3Z69X8axtA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675265328; 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; bh=l2hIXF/mYogunec/yrmU1P7RyLBw703SG1y1M7FpzMM=; b=XyWv7wka+ez1i8a/GVVVfyUsky7GLoBH6mA5fOaopE4msfQ2cU0VUyg08lI/KF1FaN0HSj3r5PBgKxoiDzdGX064hlJxeSpuarWChUliZLCTbB909c/cJpPzDfeFLzqcPLFTZ5SkK3Qoq66Y8UZkw9KXEDYdCOt7mgxiMGO+7q4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675265328040690.64749154843; Wed, 1 Feb 2023 07:28:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNF1x-0001Yh-V8; Wed, 01 Feb 2023 10:28:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNF1r-0001Xz-RM for qemu-devel@nongnu.org; Wed, 01 Feb 2023 10:28:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNF1p-00071c-Ba for qemu-devel@nongnu.org; Wed, 01 Feb 2023 10:28:07 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-652-_8xmmDIaMjar3CnYYfHXyg-1; Wed, 01 Feb 2023 10:28:02 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C6E29385F37A; Wed, 1 Feb 2023 15:28:01 +0000 (UTC) Received: from localhost (unknown [10.39.195.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id EE504112132C; Wed, 1 Feb 2023 15:28:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675265284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l2hIXF/mYogunec/yrmU1P7RyLBw703SG1y1M7FpzMM=; b=GfeXox/cViOVutyQGWyrND5zbqMZbHeqcW8d3Mat8Arnjq5JKJTs976oAyHbHRjW11DheF 0Who9f6/wRxZlaQMgw/sH15CH0lICYXpydsqx1BfbxOdar6r7mNC79f4p+fD8Ev3lnNSZV oWumXEUifBanfWsjQDbn9JMrz///4JI= X-MC-Unique: _8xmmDIaMjar3CnYYfHXyg-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , qemu-block@nongnu.org, Hanna Reitz , Fam Zheng , Fiona Ebner , Eric Blake Subject: [PATCH v3 3/4] qemu-io: add -r option to register I/O buffer Date: Wed, 1 Feb 2023 10:27:50 -0500 Message-Id: <20230201152751.270508-4-stefanha@redhat.com> In-Reply-To: <20230201152751.270508-1-stefanha@redhat.com> References: <20230201152751.270508-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675265329109100001 Content-Type: text/plain; charset="utf-8" The blk_register_buf() API is an optimization hint that allows some block drivers to avoid I/O buffer housekeeping or bounce buffers. Add an -r option to register the I/O buffer so that qemu-io can be used to test the blk_register_buf() API. The next commit will add a test that uses the new option. Reviewed-by: Eric Blake Signed-off-by: Stefan Hajnoczi --- qemu-io-cmds.c | 167 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 114 insertions(+), 53 deletions(-) diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index c0125d14c0..4b8dbef36d 100644 --- a/qemu-io-cmds.c +++ b/qemu-io-cmds.c @@ -338,7 +338,8 @@ static int parse_pattern(const char *arg) */ =20 #define MISALIGN_OFFSET 16 -static void *qemu_io_alloc(BlockBackend *blk, size_t len, int pattern) +static void *qemu_io_alloc(BlockBackend *blk, size_t len, int pattern, + bool register_buf) { void *buf; =20 @@ -347,17 +348,24 @@ static void *qemu_io_alloc(BlockBackend *blk, size_t = len, int pattern) } buf =3D blk_blockalign(blk, len); memset(buf, pattern, len); + if (register_buf) { + blk_register_buf(blk, buf, len, &error_abort); + } if (qemuio_misalign) { buf +=3D MISALIGN_OFFSET; } return buf; } =20 -static void qemu_io_free(void *p) +static void qemu_io_free(BlockBackend *blk, void *p, size_t len, + bool unregister_buf) { if (qemuio_misalign) { p -=3D MISALIGN_OFFSET; } + if (unregister_buf) { + blk_unregister_buf(blk, p, len); + } qemu_vfree(p); } =20 @@ -371,12 +379,13 @@ static void qemu_io_free(void *p) * @blk - the block backend where the buffer content is going to be writte= n to * @len - the buffer length * @file_name - the file to read the content from + * @register_buf - call blk_register_buf() * * Returns: the buffer pointer on success * NULL on error */ static void *qemu_io_alloc_from_file(BlockBackend *blk, size_t len, - const char *file_name) + const char *file_name, bool register_= buf) { char *buf, *buf_origin; FILE *f =3D fopen(file_name, "r"); @@ -414,6 +423,10 @@ static void *qemu_io_alloc_from_file(BlockBackend *blk= , size_t len, fclose(f); f =3D NULL; =20 + if (register_buf) { + blk_register_buf(blk, buf_origin, len, &error_abort); + } + if (len > pattern_len) { len -=3D pattern_len; buf +=3D pattern_len; @@ -431,7 +444,11 @@ static void *qemu_io_alloc_from_file(BlockBackend *blk= , size_t len, return buf_origin; =20 error: - qemu_io_free(buf_origin); + /* + * This code path is only taken before blk_register_buf() is called, so + * hardcode the qemu_io_free() unregister_buf argument to false. + */ + qemu_io_free(blk, buf_origin, len, false); if (f) { fclose(f); } @@ -490,7 +507,7 @@ static void print_report(const char *op, struct timespe= c *t, int64_t offset, */ static void * create_iovec(BlockBackend *blk, QEMUIOVector *qiov, char **argv, int nr_io= v, - int pattern) + int pattern, bool register_buf) { size_t *sizes =3D g_new0(size_t, nr_iov); size_t count =3D 0; @@ -526,7 +543,7 @@ create_iovec(BlockBackend *blk, QEMUIOVector *qiov, cha= r **argv, int nr_iov, =20 qemu_iovec_init(qiov, nr_iov); =20 - buf =3D p =3D qemu_io_alloc(blk, count, pattern); + buf =3D p =3D qemu_io_alloc(blk, count, pattern, register_buf); =20 for (i =3D 0; i < nr_iov; i++) { qemu_iovec_add(qiov, p, sizes[i]); @@ -539,7 +556,7 @@ fail: } =20 static int do_pread(BlockBackend *blk, char *buf, int64_t offset, - int64_t bytes, int64_t *total) + int64_t bytes, BdrvRequestFlags flags, int64_t *total) { int ret; =20 @@ -547,7 +564,7 @@ static int do_pread(BlockBackend *blk, char *buf, int64= _t offset, return -ERANGE; } =20 - ret =3D blk_pread(blk, offset, bytes, (uint8_t *)buf, 0); + ret =3D blk_pread(blk, offset, bytes, (uint8_t *)buf, flags); if (ret < 0) { return ret; } @@ -675,11 +692,11 @@ static void aio_rw_done(void *opaque, int ret) } =20 static int do_aio_readv(BlockBackend *blk, QEMUIOVector *qiov, - int64_t offset, int *total) + int64_t offset, BdrvRequestFlags flags, int *total) { int async_ret =3D NOT_DONE; =20 - blk_aio_preadv(blk, offset, qiov, 0, aio_rw_done, &async_ret); + blk_aio_preadv(blk, offset, qiov, flags, aio_rw_done, &async_ret); while (async_ret =3D=3D NOT_DONE) { main_loop_wait(false); } @@ -719,6 +736,7 @@ static void read_help(void) " -p, -- ignored for backwards compatibility\n" " -P, -- use a pattern to verify read data\n" " -q, -- quiet mode, do not show I/O statistics\n" +" -r, -- register I/O buffer\n" " -s, -- start offset for pattern verification (only with -P)\n" " -v, -- dump buffer to standard output\n" "\n"); @@ -732,7 +750,7 @@ static const cmdinfo_t read_cmd =3D { .cfunc =3D read_f, .argmin =3D 2, .argmax =3D -1, - .args =3D "[-abCqv] [-P pattern [-s off] [-l len]] off len", + .args =3D "[-abCqrv] [-P pattern [-s off] [-l len]] off len", .oneline =3D "reads a number of bytes at a specified offset", .help =3D read_help, }; @@ -750,6 +768,7 @@ static int read_f(BlockBackend *blk, int argc, char **a= rgv) int64_t total =3D 0; int pattern =3D 0; int64_t pattern_offset =3D 0, pattern_count =3D 0; + BdrvRequestFlags flags =3D 0; =20 while ((c =3D getopt(argc, argv, "bCl:pP:qs:v")) !=3D -1) { switch (c) { @@ -780,6 +799,9 @@ static int read_f(BlockBackend *blk, int argc, char **a= rgv) case 'q': qflag =3D true; break; + case 'r': + flags |=3D BDRV_REQ_REGISTERED_BUF; + break; case 's': sflag =3D true; pattern_offset =3D cvtnum(optarg); @@ -844,15 +866,20 @@ static int read_f(BlockBackend *blk, int argc, char *= *argv) count); return -EINVAL; } + if (flags & BDRV_REQ_REGISTERED_BUF) { + printf("I/O buffer registration is not supported when reading " + "from vmstate\n"); + return -EINVAL; + } } =20 - buf =3D qemu_io_alloc(blk, count, 0xab); + buf =3D qemu_io_alloc(blk, count, 0xab, flags & BDRV_REQ_REGISTERED_BU= F); =20 clock_gettime(CLOCK_MONOTONIC, &t1); if (bflag) { ret =3D do_load_vmstate(blk, buf, offset, count, &total); } else { - ret =3D do_pread(blk, buf, offset, count, &total); + ret =3D do_pread(blk, buf, offset, count, flags, &total); } clock_gettime(CLOCK_MONOTONIC, &t2); =20 @@ -889,7 +916,7 @@ static int read_f(BlockBackend *blk, int argc, char **a= rgv) print_report("read", &t2, offset, count, total, cnt, Cflag); =20 out: - qemu_io_free(buf); + qemu_io_free(blk, buf, count, flags & BDRV_REQ_REGISTERED_BUF); return ret; } =20 @@ -907,8 +934,9 @@ static void readv_help(void) " Uses multiple iovec buffers if more than one byte range is specified.\n" " -C, -- report statistics in a machine parsable format\n" " -P, -- use a pattern to verify read data\n" -" -v, -- dump buffer to standard output\n" " -q, -- quiet mode, do not show I/O statistics\n" +" -r, -- register I/O buffer\n" +" -v, -- dump buffer to standard output\n" "\n"); } =20 @@ -919,7 +947,7 @@ static const cmdinfo_t readv_cmd =3D { .cfunc =3D readv_f, .argmin =3D 2, .argmax =3D -1, - .args =3D "[-Cqv] [-P pattern] off len [len..]", + .args =3D "[-Cqrv] [-P pattern] off len [len..]", .oneline =3D "reads a number of bytes at a specified offset", .help =3D readv_help, }; @@ -937,8 +965,9 @@ static int readv_f(BlockBackend *blk, int argc, char **= argv) QEMUIOVector qiov; int pattern =3D 0; bool Pflag =3D false; + BdrvRequestFlags flags =3D 0; =20 - while ((c =3D getopt(argc, argv, "CP:qv")) !=3D -1) { + while ((c =3D getopt(argc, argv, "CP:qrv")) !=3D -1) { switch (c) { case 'C': Cflag =3D true; @@ -953,6 +982,9 @@ static int readv_f(BlockBackend *blk, int argc, char **= argv) case 'q': qflag =3D true; break; + case 'r': + flags |=3D BDRV_REQ_REGISTERED_BUF; + break; case 'v': vflag =3D true; break; @@ -976,13 +1008,14 @@ static int readv_f(BlockBackend *blk, int argc, char= **argv) optind++; =20 nr_iov =3D argc - optind; - buf =3D create_iovec(blk, &qiov, &argv[optind], nr_iov, 0xab); + buf =3D create_iovec(blk, &qiov, &argv[optind], nr_iov, 0xab, + flags & BDRV_REQ_REGISTERED_BUF); if (buf =3D=3D NULL) { return -EINVAL; } =20 clock_gettime(CLOCK_MONOTONIC, &t1); - ret =3D do_aio_readv(blk, &qiov, offset, &total); + ret =3D do_aio_readv(blk, &qiov, offset, flags, &total); clock_gettime(CLOCK_MONOTONIC, &t2); =20 if (ret < 0) { @@ -1017,8 +1050,8 @@ static int readv_f(BlockBackend *blk, int argc, char = **argv) print_report("read", &t2, offset, qiov.size, total, cnt, Cflag); =20 out: + qemu_io_free(blk, buf, qiov.size, flags & BDRV_REQ_REGISTERED_BUF); qemu_iovec_destroy(&qiov); - qemu_io_free(buf); return ret; } =20 @@ -1035,13 +1068,14 @@ static void write_help(void) " filled with a set pattern (0xcdcdcdcd).\n" " -b, -- write to the VM state rather than the virtual disk\n" " -c, -- write compressed data with blk_write_compressed\n" +" -C, -- report statistics in a machine parsable format\n" " -f, -- use Force Unit Access semantics\n" " -n, -- with -z, don't allow slow fallback\n" " -p, -- ignored for backwards compatibility\n" " -P, -- use different pattern to fill file\n" +" -q, -- quiet mode, do not show I/O statistics\n" +" -r, -- register I/O buffer\n" " -s, -- use a pattern file to fill the write buffer\n" -" -C, -- report statistics in a machine parsable format\n" -" -q, -- quiet mode, do not show I/O statistics\n" " -u, -- with -z, allow unmapping\n" " -z, -- write zeroes using blk_co_pwrite_zeroes\n" "\n"); @@ -1056,7 +1090,7 @@ static const cmdinfo_t write_cmd =3D { .perm =3D BLK_PERM_WRITE, .argmin =3D 2, .argmax =3D -1, - .args =3D "[-bcCfnquz] [-P pattern | -s source_file] off len", + .args =3D "[-bcCfnqruz] [-P pattern | -s source_file] off len", .oneline =3D "writes a number of bytes at a specified offset", .help =3D write_help, }; @@ -1076,7 +1110,7 @@ static int write_f(BlockBackend *blk, int argc, char = **argv) int pattern =3D 0xcd; const char *file_name =3D NULL; =20 - while ((c =3D getopt(argc, argv, "bcCfnpP:qs:uz")) !=3D -1) { + while ((c =3D getopt(argc, argv, "bcCfnpP:qrs:uz")) !=3D -1) { switch (c) { case 'b': bflag =3D true; @@ -1106,6 +1140,9 @@ static int write_f(BlockBackend *blk, int argc, char = **argv) case 'q': qflag =3D true; break; + case 'r': + flags |=3D BDRV_REQ_REGISTERED_BUF; + break; case 's': sflag =3D true; file_name =3D optarg; @@ -1185,14 +1222,21 @@ static int write_f(BlockBackend *blk, int argc, cha= r **argv) } } =20 - if (!zflag) { + if (zflag) { + if (flags & BDRV_REQ_REGISTERED_BUF) { + printf("cannot combine zero write with register I/O buffer\n"); + return -EINVAL; + } + } else { if (sflag) { - buf =3D qemu_io_alloc_from_file(blk, count, file_name); + buf =3D qemu_io_alloc_from_file(blk, count, file_name, + flags & BDRV_REQ_REGISTERED_BUF); if (!buf) { return -EINVAL; } } else { - buf =3D qemu_io_alloc(blk, count, pattern); + buf =3D qemu_io_alloc(blk, count, pattern, + flags & BDRV_REQ_REGISTERED_BUF); } } =20 @@ -1226,7 +1270,7 @@ static int write_f(BlockBackend *blk, int argc, char = **argv) =20 out: if (!zflag) { - qemu_io_free(buf); + qemu_io_free(blk, buf, count, flags & BDRV_REQ_REGISTERED_BUF); } return ret; } @@ -1243,10 +1287,11 @@ writev_help(void) "\n" " Writes into a segment of the currently open file, using a buffer\n" " filled with a set pattern (0xcdcdcdcd).\n" -" -P, -- use different pattern to fill file\n" " -C, -- report statistics in a machine parsable format\n" " -f, -- use Force Unit Access semantics\n" +" -P, -- use different pattern to fill file\n" " -q, -- quiet mode, do not show I/O statistics\n" +" -r, -- register I/O buffer\n" "\n"); } =20 @@ -1258,7 +1303,7 @@ static const cmdinfo_t writev_cmd =3D { .perm =3D BLK_PERM_WRITE, .argmin =3D 2, .argmax =3D -1, - .args =3D "[-Cfq] [-P pattern] off len [len..]", + .args =3D "[-Cfqr] [-P pattern] off len [len..]", .oneline =3D "writes a number of bytes at a specified offset", .help =3D writev_help, }; @@ -1277,7 +1322,7 @@ static int writev_f(BlockBackend *blk, int argc, char= **argv) int pattern =3D 0xcd; QEMUIOVector qiov; =20 - while ((c =3D getopt(argc, argv, "CfqP:")) !=3D -1) { + while ((c =3D getopt(argc, argv, "CfP:qr")) !=3D -1) { switch (c) { case 'C': Cflag =3D true; @@ -1288,6 +1333,9 @@ static int writev_f(BlockBackend *blk, int argc, char= **argv) case 'q': qflag =3D true; break; + case 'r': + flags |=3D BDRV_REQ_REGISTERED_BUF; + break; case 'P': pattern =3D parse_pattern(optarg); if (pattern < 0) { @@ -1313,7 +1361,8 @@ static int writev_f(BlockBackend *blk, int argc, char= **argv) optind++; =20 nr_iov =3D argc - optind; - buf =3D create_iovec(blk, &qiov, &argv[optind], nr_iov, pattern); + buf =3D create_iovec(blk, &qiov, &argv[optind], nr_iov, pattern, + flags & BDRV_REQ_REGISTERED_BUF); if (buf =3D=3D NULL) { return -EINVAL; } @@ -1338,8 +1387,8 @@ static int writev_f(BlockBackend *blk, int argc, char= **argv) t2 =3D tsub(t2, t1); print_report("wrote", &t2, offset, qiov.size, total, cnt, Cflag); out: + qemu_io_free(blk, buf, qiov.size, flags & BDRV_REQ_REGISTERED_BUF); qemu_iovec_destroy(&qiov); - qemu_io_free(buf); return ret; } =20 @@ -1355,6 +1404,7 @@ struct aio_ctx { bool zflag; BlockAcctCookie acct; int pattern; + BdrvRequestFlags flags; struct timespec t1; }; =20 @@ -1384,8 +1434,9 @@ static void aio_write_done(void *opaque, int ret) ctx->qiov.size, 1, ctx->Cflag); out: if (!ctx->zflag) { - qemu_io_free(ctx->buf); qemu_iovec_destroy(&ctx->qiov); + qemu_io_free(ctx->blk, ctx->buf, ctx->qiov.size, + ctx->flags & BDRV_REQ_REGISTERED_BUF); } g_free(ctx); } @@ -1429,7 +1480,8 @@ static void aio_read_done(void *opaque, int ret) print_report("read", &t2, ctx->offset, ctx->qiov.size, ctx->qiov.size, 1, ctx->Cflag); out: - qemu_io_free(ctx->buf); + qemu_io_free(ctx->blk, ctx->buf, ctx->qiov.size, + ctx->flags & BDRV_REQ_REGISTERED_BUF); qemu_iovec_destroy(&ctx->qiov); g_free(ctx); } @@ -1451,10 +1503,11 @@ static void aio_read_help(void) " considered successful once the request is submitted, independently\n" " of potential I/O errors or pattern mismatches.\n" " -C, -- report statistics in a machine parsable format\n" -" -P, -- use a pattern to verify read data\n" " -i, -- treat request as invalid, for exercising stats\n" -" -v, -- dump buffer to standard output\n" +" -P, -- use a pattern to verify read data\n" " -q, -- quiet mode, do not show I/O statistics\n" +" -r, -- register I/O buffer\n" +" -v, -- dump buffer to standard output\n" "\n"); } =20 @@ -1465,7 +1518,7 @@ static const cmdinfo_t aio_read_cmd =3D { .cfunc =3D aio_read_f, .argmin =3D 2, .argmax =3D -1, - .args =3D "[-Ciqv] [-P pattern] off len [len..]", + .args =3D "[-Ciqrv] [-P pattern] off len [len..]", .oneline =3D "asynchronously reads a number of bytes", .help =3D aio_read_help, }; @@ -1476,7 +1529,7 @@ static int aio_read_f(BlockBackend *blk, int argc, ch= ar **argv) struct aio_ctx *ctx =3D g_new0(struct aio_ctx, 1); =20 ctx->blk =3D blk; - while ((c =3D getopt(argc, argv, "CP:iqv")) !=3D -1) { + while ((c =3D getopt(argc, argv, "CiP:qrv")) !=3D -1) { switch (c) { case 'C': ctx->Cflag =3D true; @@ -1497,6 +1550,9 @@ static int aio_read_f(BlockBackend *blk, int argc, ch= ar **argv) case 'q': ctx->qflag =3D true; break; + case 'r': + ctx->flags |=3D BDRV_REQ_REGISTERED_BUF; + break; case 'v': ctx->vflag =3D true; break; @@ -1523,7 +1579,8 @@ static int aio_read_f(BlockBackend *blk, int argc, ch= ar **argv) optind++; =20 nr_iov =3D argc - optind; - ctx->buf =3D create_iovec(blk, &ctx->qiov, &argv[optind], nr_iov, 0xab= ); + ctx->buf =3D create_iovec(blk, &ctx->qiov, &argv[optind], nr_iov, 0xab, + ctx->flags & BDRV_REQ_REGISTERED_BUF); if (ctx->buf =3D=3D NULL) { block_acct_invalid(blk_get_stats(blk), BLOCK_ACCT_READ); g_free(ctx); @@ -1533,7 +1590,8 @@ static int aio_read_f(BlockBackend *blk, int argc, ch= ar **argv) clock_gettime(CLOCK_MONOTONIC, &ctx->t1); block_acct_start(blk_get_stats(blk), &ctx->acct, ctx->qiov.size, BLOCK_ACCT_READ); - blk_aio_preadv(blk, ctx->offset, &ctx->qiov, 0, aio_read_done, ctx); + blk_aio_preadv(blk, ctx->offset, &ctx->qiov, ctx->flags, aio_read_done, + ctx); return 0; } =20 @@ -1554,11 +1612,12 @@ static void aio_write_help(void) " Note that due to its asynchronous nature, this command will be\n" " considered successful once the request is submitted, independently\n" " of potential I/O errors or pattern mismatches.\n" -" -P, -- use different pattern to fill file\n" " -C, -- report statistics in a machine parsable format\n" " -f, -- use Force Unit Access semantics\n" " -i, -- treat request as invalid, for exercising stats\n" +" -P, -- use different pattern to fill file\n" " -q, -- quiet mode, do not show I/O statistics\n" +" -r, -- register I/O buffer\n" " -u, -- with -z, allow unmapping\n" " -z, -- write zeroes using blk_aio_pwrite_zeroes\n" "\n"); @@ -1572,7 +1631,7 @@ static const cmdinfo_t aio_write_cmd =3D { .perm =3D BLK_PERM_WRITE, .argmin =3D 2, .argmax =3D -1, - .args =3D "[-Cfiquz] [-P pattern] off len [len..]", + .args =3D "[-Cfiqruz] [-P pattern] off len [len..]", .oneline =3D "asynchronously writes a number of bytes", .help =3D aio_write_help, }; @@ -1582,22 +1641,24 @@ static int aio_write_f(BlockBackend *blk, int argc,= char **argv) int nr_iov, c; int pattern =3D 0xcd; struct aio_ctx *ctx =3D g_new0(struct aio_ctx, 1); - BdrvRequestFlags flags =3D 0; =20 ctx->blk =3D blk; - while ((c =3D getopt(argc, argv, "CfiqP:uz")) !=3D -1) { + while ((c =3D getopt(argc, argv, "CfiP:qruz")) !=3D -1) { switch (c) { case 'C': ctx->Cflag =3D true; break; case 'f': - flags |=3D BDRV_REQ_FUA; + ctx->flags |=3D BDRV_REQ_FUA; break; case 'q': ctx->qflag =3D true; break; + case 'r': + ctx->flags |=3D BDRV_REQ_REGISTERED_BUF; + break; case 'u': - flags |=3D BDRV_REQ_MAY_UNMAP; + ctx->flags |=3D BDRV_REQ_MAY_UNMAP; break; case 'P': pattern =3D parse_pattern(optarg); @@ -1633,7 +1694,7 @@ static int aio_write_f(BlockBackend *blk, int argc, c= har **argv) return -EINVAL; } =20 - if ((flags & BDRV_REQ_MAY_UNMAP) && !ctx->zflag) { + if ((ctx->flags & BDRV_REQ_MAY_UNMAP) && !ctx->zflag) { printf("-u requires -z to be specified\n"); g_free(ctx); return -EINVAL; @@ -1663,12 +1724,12 @@ static int aio_write_f(BlockBackend *blk, int argc,= char **argv) } =20 ctx->qiov.size =3D count; - blk_aio_pwrite_zeroes(blk, ctx->offset, count, flags, aio_write_do= ne, - ctx); + blk_aio_pwrite_zeroes(blk, ctx->offset, count, ctx->flags, + aio_write_done, ctx); } else { nr_iov =3D argc - optind; ctx->buf =3D create_iovec(blk, &ctx->qiov, &argv[optind], nr_iov, - pattern); + pattern, ctx->flags & BDRV_REQ_REGISTERED_= BUF); if (ctx->buf =3D=3D NULL) { block_acct_invalid(blk_get_stats(blk), BLOCK_ACCT_WRITE); g_free(ctx); @@ -1679,8 +1740,8 @@ static int aio_write_f(BlockBackend *blk, int argc, c= har **argv) block_acct_start(blk_get_stats(blk), &ctx->acct, ctx->qiov.size, BLOCK_ACCT_WRITE); =20 - blk_aio_pwritev(blk, ctx->offset, &ctx->qiov, flags, aio_write_don= e, - ctx); + blk_aio_pwritev(blk, ctx->offset, &ctx->qiov, ctx->flags, + aio_write_done, ctx); } =20 return 0; --=20 2.39.1 From nobody Fri Mar 29 09:49:30 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675265337; cv=none; d=zohomail.com; s=zohoarc; b=DH4b9oOx18gITk+QPthTNsZ5mFGLGVdxUYB/wzSqJI/V151aYsSnOymyofbFGpUEbTal0722mO0JfCnQTKoObTP/jeY8pSfNUKmkoTR4pmyELTbOTElNYJ+1P2dqo3pXroUc+4DxuHjuEHFt9++oHY+oYNoQn45hVr9SObWyJ7Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675265337; 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; bh=Sv++3jATeEZz1tMCfB/IDShhsbMlnSdYiYP3imi7qHo=; b=TaRvyPel0ttUdHJbPYYkcUK2BEpE9NcJVSa30DleO5vI3Al/N4YlS8AY4BETr4e6RNSV4PzHtuK3tmJRd0yXvzVUwrJ7bO2cDaFWnWFiiUt396QTnJ36rZBMBEy++N4vighZ6guPOqBEkKSOqKTwt29+SN7p7oj6tL2sAeBdkk0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675265337061842.0835825164419; Wed, 1 Feb 2023 07:28:57 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNF20-0001Ze-EV; Wed, 01 Feb 2023 10:28:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNF1t-0001YR-5D for qemu-devel@nongnu.org; Wed, 01 Feb 2023 10:28:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNF1q-00071l-CD for qemu-devel@nongnu.org; Wed, 01 Feb 2023 10:28:08 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-106-RE0YmKHvP4qZ-vBPQrPIdA-1; Wed, 01 Feb 2023 10:28:04 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EBD81385F381; Wed, 1 Feb 2023 15:28:03 +0000 (UTC) Received: from localhost (unknown [10.39.195.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6614F404BEC1; Wed, 1 Feb 2023 15:28:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675265285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Sv++3jATeEZz1tMCfB/IDShhsbMlnSdYiYP3imi7qHo=; b=YhcqUtJN8svg8noTCU3iPZN0RLrFstxaldmID2y5VTvf/NyWUQAKTGedgtvWJiTQ9Cmzy0 LpOgxLR11nauQospIU8p0UTOX0W1EuL65GfHLfECNb6NfC0ITuJTbemk2hIinxELhXUh9V hEgN9QO3VAqoEUWfCBuOqprzCRInaLk= X-MC-Unique: RE0YmKHvP4qZ-vBPQrPIdA-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , qemu-block@nongnu.org, Hanna Reitz , Fam Zheng , Fiona Ebner , Eric Blake Subject: [PATCH v3 4/4] iotests/detect-zeroes-registered-buf: add new test Date: Wed, 1 Feb 2023 10:27:51 -0500 Message-Id: <20230201152751.270508-5-stefanha@redhat.com> In-Reply-To: <20230201152751.270508-1-stefanha@redhat.com> References: <20230201152751.270508-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675265339323100005 Content-Type: text/plain; charset="utf-8" This regression test demonstrates that detect-zeroes works with registered buffers. Bug details: https://gitlab.com/qemu-project/qemu/-/issues/1404 Reviewed-by: Eric Blake Signed-off-by: Stefan Hajnoczi Reviewed-by: Hanna Czenczek --- .../tests/detect-zeroes-registered-buf | 58 +++++++++++++++++++ .../tests/detect-zeroes-registered-buf.out | 7 +++ 2 files changed, 65 insertions(+) create mode 100755 tests/qemu-iotests/tests/detect-zeroes-registered-buf create mode 100644 tests/qemu-iotests/tests/detect-zeroes-registered-buf.o= ut diff --git a/tests/qemu-iotests/tests/detect-zeroes-registered-buf b/tests/= qemu-iotests/tests/detect-zeroes-registered-buf new file mode 100755 index 0000000000..edb5f2cee5 --- /dev/null +++ b/tests/qemu-iotests/tests/detect-zeroes-registered-buf @@ -0,0 +1,58 @@ +#!/usr/bin/env bash +# group: rw auto quick +# +# Check that detect-zeroes=3Dunmap works on writes with registered I/O buf= fers. +# This is a regression test for +# https://gitlab.com/qemu-project/qemu/-/issues/1404 where I/O requests fa= iled +# unexpectedly. +# +# Copyright Red Hat +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +# creator +owner=3Dstefanha@redhat.com + +seq=3D`basename $0` +echo "QA output created by $seq" + +status=3D1 # failure is the default! + +_cleanup() +{ + _cleanup_test_img +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +cd .. +. ./common.rc +. ./common.filter + +_supported_fmt qcow2 +_supported_proto generic + +size=3D128M +_make_test_img $size +IMGSPEC=3D"driver=3D$IMGFMT,file.filename=3D$TEST_IMG,discard=3Dunmap,dete= ct-zeroes=3Dunmap" + +echo +echo "=3D=3D writing zero buffer to image =3D=3D" +QEMU_IO_OPTIONS=3D"$QEMU_IO_OPTIONS_NO_FMT" $QEMU_IO -c "write -r -P 0 0 4= k" --image-opts "$IMGSPEC" | _filter_qemu_io + +# success, all done +echo "*** done" +rm -f $seq.full +status=3D0 diff --git a/tests/qemu-iotests/tests/detect-zeroes-registered-buf.out b/te= sts/qemu-iotests/tests/detect-zeroes-registered-buf.out new file mode 100644 index 0000000000..42c56fcc8d --- /dev/null +++ b/tests/qemu-iotests/tests/detect-zeroes-registered-buf.out @@ -0,0 +1,7 @@ +QA output created by detect-zeroes-registered-buf +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 + +=3D=3D writing zero buffer to image =3D=3D +wrote 4096/4096 bytes at offset 0 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +*** done --=20 2.39.1