From nobody Sat Feb 7 05:57:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1495831459989414.94559898804073; Fri, 26 May 2017 13:44:19 -0700 (PDT) Received: from localhost ([::1]:38392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEM5o-0003wK-Dw for importer@patchew.org; Fri, 26 May 2017 16:44:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dELld-0005e8-Kd for qemu-devel@nongnu.org; Fri, 26 May 2017 16:23:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dELlc-0005Qf-Ks for qemu-devel@nongnu.org; Fri, 26 May 2017 16:23:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32924) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dELlX-0005Oa-VR; Fri, 26 May 2017 16:23:20 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ED2E397831; Fri, 26 May 2017 20:23:18 +0000 (UTC) Received: from noname.redhat.com (ovpn-116-43.ams2.redhat.com [10.36.116.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4004D1713B; Fri, 26 May 2017 20:23:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com ED2E397831 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kwolf@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com ED2E397831 From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 26 May 2017 22:22:00 +0200 Message-Id: <1495830130-30611-20-git-send-email-kwolf@redhat.com> In-Reply-To: <1495830130-30611-1-git-send-email-kwolf@redhat.com> References: <1495830130-30611-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 26 May 2017 20:23:19 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 19/29] qed: Add return value to qed_aio_write_main() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Don't recurse into qed_aio_next_io() and qed_aio_complete() here, but just return an error code and let the caller handle it. Signed-off-by: Kevin Wolf Reviewed-by: Stefan Hajnoczi --- block/qed.c | 55 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/block/qed.c b/block/qed.c index 259abb2..e6d1b0d 100644 --- a/block/qed.c +++ b/block/qed.c @@ -1022,29 +1022,22 @@ static int qed_aio_write_l2_update(QEDAIOCB *acb, u= int64_t offset) /** * Write data to the image file */ -static void qed_aio_write_main(void *opaque, int ret) +static int qed_aio_write_main(QEDAIOCB *acb) { - QEDAIOCB *acb =3D opaque; BDRVQEDState *s =3D acb_to_s(acb); uint64_t offset =3D acb->cur_cluster + qed_offset_into_cluster(s, acb->cur_pos); + int ret; =20 - trace_qed_aio_write_main(s, acb, ret, offset, acb->cur_qiov.size); - - if (ret) { - qed_aio_complete(acb, ret); - return; - } + trace_qed_aio_write_main(s, acb, 0, offset, acb->cur_qiov.size); =20 BLKDBG_EVENT(s->bs->file, BLKDBG_WRITE_AIO); ret =3D bdrv_pwritev(s->bs->file, offset, &acb->cur_qiov); - if (ret >=3D 0) { - ret =3D 0; + if (ret < 0) { + return ret; } =20 - if (acb->find_cluster_ret =3D=3D QED_CLUSTER_FOUND) { - qed_aio_next_io(acb, ret); - } else { + if (acb->find_cluster_ret !=3D QED_CLUSTER_FOUND) { if (s->bs->backing) { /* * Flush new data clusters before updating the L2 table @@ -1057,20 +1050,16 @@ static void qed_aio_write_main(void *opaque, int re= t) * cluster and before updating the L2 table. */ ret =3D bdrv_flush(s->bs->file->bs); - } - if (ret) { - goto err; + if (ret < 0) { + return ret; + } } ret =3D qed_aio_write_l2_update(acb, acb->cur_cluster); - if (ret) { - goto err; + if (ret < 0) { + return ret; } - qed_aio_next_io(acb, 0); } - return; - -err: - qed_aio_complete(acb, ret); + return 0; } =20 /** @@ -1102,8 +1091,17 @@ static void qed_aio_write_cow(void *opaque, int ret) =20 trace_qed_aio_write_postfill(s, acb, start, len, offset); ret =3D qed_copy_from_backing_file(s, start, len, offset); + if (ret) { + qed_aio_complete(acb, ret); + return; + } =20 - qed_aio_write_main(acb, ret); + ret =3D qed_aio_write_main(acb); + if (ret < 0) { + qed_aio_complete(acb, ret); + return; + } + qed_aio_next_io(acb, 0); } =20 /** @@ -1201,6 +1199,8 @@ static void qed_aio_write_alloc(QEDAIOCB *acb, size_t= len) */ static void qed_aio_write_inplace(QEDAIOCB *acb, uint64_t offset, size_t l= en) { + int ret; + /* Allocate buffer for zero writes */ if (acb->flags & QED_AIOCB_ZERO) { struct iovec *iov =3D acb->qiov->iov; @@ -1220,7 +1220,12 @@ static void qed_aio_write_inplace(QEDAIOCB *acb, uin= t64_t offset, size_t len) qemu_iovec_concat(&acb->cur_qiov, acb->qiov, acb->qiov_offset, len); =20 /* Do the actual write */ - qed_aio_write_main(acb, 0); + ret =3D qed_aio_write_main(acb); + if (ret < 0) { + qed_aio_complete(acb, ret); + return; + } + qed_aio_next_io(acb, 0); } =20 /** --=20 1.8.3.1