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 1495831663882839.5659240954561; Fri, 26 May 2017 13:47:43 -0700 (PDT) Received: from localhost ([::1]:38417 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEM97-0006RW-I3 for importer@patchew.org; Fri, 26 May 2017 16:47:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58998) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dELln-0005ov-21 for qemu-devel@nongnu.org; Fri, 26 May 2017 16:23:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dELll-0005VA-SE for qemu-devel@nongnu.org; Fri, 26 May 2017 16:23:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45198) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dELlh-0005Sq-1B; Fri, 26 May 2017 16:23:29 -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 0A481C056789; Fri, 26 May 2017 20:23:28 +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 DE7451713B; Fri, 26 May 2017 20:23:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0A481C056789 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kwolf@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 0A481C056789 From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 26 May 2017 22:22:03 +0200 Message-Id: <1495830130-30611-23-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.32]); Fri, 26 May 2017 20:23:28 +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 22/29] qed: Add return value to qed_aio_read/write_data() 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 | 72 ++++++++++++++++++++++++++-------------------------------= ---- block/qed.h | 21 ------------------ 2 files changed, 31 insertions(+), 62 deletions(-) diff --git a/block/qed.c b/block/qed.c index 7880df8..3a26fdf 100644 --- a/block/qed.c +++ b/block/qed.c @@ -1205,15 +1205,14 @@ static int qed_aio_write_inplace(QEDAIOCB *acb, uin= t64_t offset, size_t len) * Write data cluster * * @opaque: Write request - * @ret: QED_CLUSTER_FOUND, QED_CLUSTER_L2, QED_CLUSTER_L1, - * or -errno + * @ret: QED_CLUSTER_FOUND, QED_CLUSTER_L2 or QED_CLUSTER_L1 * @offset: Cluster offset in bytes * @len: Length in bytes * * Callback from qed_find_cluster(). */ -static void qed_aio_write_data(void *opaque, int ret, - uint64_t offset, size_t len) +static int qed_aio_write_data(void *opaque, int ret, + uint64_t offset, size_t len) { QEDAIOCB *acb =3D opaque; =20 @@ -1223,42 +1222,29 @@ static void qed_aio_write_data(void *opaque, int re= t, =20 switch (ret) { case QED_CLUSTER_FOUND: - ret =3D qed_aio_write_inplace(acb, offset, len); - break; + return qed_aio_write_inplace(acb, offset, len); =20 case QED_CLUSTER_L2: case QED_CLUSTER_L1: case QED_CLUSTER_ZERO: - ret =3D qed_aio_write_alloc(acb, len); - break; + return qed_aio_write_alloc(acb, len); =20 default: - assert(ret < 0); - break; - } - - if (ret < 0) { - if (ret !=3D -EINPROGRESS) { - qed_aio_complete(acb, ret); - } - return; + g_assert_not_reached(); } - qed_aio_next_io(acb, 0); } =20 /** * Read data cluster * * @opaque: Read request - * @ret: QED_CLUSTER_FOUND, QED_CLUSTER_L2, QED_CLUSTER_L1, - * or -errno + * @ret: QED_CLUSTER_FOUND, QED_CLUSTER_L2 or QED_CLUSTER_L1 * @offset: Cluster offset in bytes * @len: Length in bytes * * Callback from qed_find_cluster(). */ -static void qed_aio_read_data(void *opaque, int ret, - uint64_t offset, size_t len) +static int qed_aio_read_data(void *opaque, int ret, uint64_t offset, size_= t len) { QEDAIOCB *acb =3D opaque; BDRVQEDState *s =3D acb_to_s(acb); @@ -1269,34 +1255,23 @@ static void qed_aio_read_data(void *opaque, int ret, =20 trace_qed_aio_read_data(s, acb, ret, offset, len); =20 - if (ret < 0) { - goto err; - } - qemu_iovec_concat(&acb->cur_qiov, acb->qiov, acb->qiov_offset, len); =20 /* Handle zero cluster and backing file reads */ if (ret =3D=3D QED_CLUSTER_ZERO) { qemu_iovec_memset(&acb->cur_qiov, 0, 0, acb->cur_qiov.size); - qed_aio_start_io(acb); - return; + return 0; } else if (ret !=3D QED_CLUSTER_FOUND) { - ret =3D qed_read_backing_file(s, acb->cur_pos, &acb->cur_qiov, - &acb->backing_qiov); - qed_aio_next_io(acb, ret); - return; + return qed_read_backing_file(s, acb->cur_pos, &acb->cur_qiov, + &acb->backing_qiov); } =20 BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO); ret =3D bdrv_preadv(bs->file, offset, &acb->cur_qiov); if (ret < 0) { - goto err; + return ret; } - qed_aio_next_io(acb, 0); - return; - -err: - qed_aio_complete(acb, ret); + return 0; } =20 /** @@ -1305,8 +1280,6 @@ err: static void qed_aio_next_io(QEDAIOCB *acb, int ret) { BDRVQEDState *s =3D acb_to_s(acb); - QEDFindClusterFunc *io_fn =3D (acb->flags & QED_AIOCB_WRITE) ? - qed_aio_write_data : qed_aio_read_data; uint64_t offset; size_t len; =20 @@ -1337,7 +1310,24 @@ static void qed_aio_next_io(QEDAIOCB *acb, int ret) /* Find next cluster and start I/O */ len =3D acb->end_pos - acb->cur_pos; ret =3D qed_find_cluster(s, &acb->request, acb->cur_pos, &len, &offset= ); - io_fn(acb, ret, offset, len); + if (ret < 0) { + qed_aio_complete(acb, ret); + return; + } + + if (acb->flags & QED_AIOCB_WRITE) { + ret =3D qed_aio_write_data(acb, ret, offset, len); + } else { + ret =3D qed_aio_read_data(acb, ret, offset, len); + } + + if (ret < 0) { + if (ret !=3D -EINPROGRESS) { + qed_aio_complete(acb, ret); + } + return; + } + qed_aio_next_io(acb, 0); } =20 static BlockAIOCB *qed_aio_setup(BlockDriverState *bs, diff --git a/block/qed.h b/block/qed.h index 51443fa..8644fed 100644 --- a/block/qed.h +++ b/block/qed.h @@ -177,27 +177,6 @@ enum { QED_CLUSTER_L1, /* cluster missing in L1 */ }; =20 -/** - * qed_find_cluster() completion callback - * - * @opaque: User data for completion callback - * @ret: QED_CLUSTER_FOUND Success - * QED_CLUSTER_L2 Data cluster unallocated in L2 - * QED_CLUSTER_L1 L2 unallocated in L1 - * -errno POSIX error occurred - * @offset: Data cluster offset - * @len: Contiguous bytes starting from cluster offset - * - * This function is invoked when qed_find_cluster() completes. - * - * On success ret is QED_CLUSTER_FOUND and offset/len are a contiguous ran= ge - * in the image file. - * - * On failure ret is QED_CLUSTER_L2 or QED_CLUSTER_L1 for missing L2 or L1 - * table offset, respectively. len is number of contiguous unallocated by= tes. - */ -typedef void QEDFindClusterFunc(void *opaque, int ret, uint64_t offset, si= ze_t len); - void qed_acquire(BDRVQEDState *s); void qed_release(BDRVQEDState *s); =20 --=20 1.8.3.1