From nobody Sat Feb 7 05:57:27 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 1495830591886247.27070758422394; Fri, 26 May 2017 13:29:51 -0700 (PDT) Received: from localhost ([::1]:38309 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dELrq-0003vt-Fb for importer@patchew.org; Fri, 26 May 2017 16:29:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58362) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dELkp-0004L9-9u for qemu-devel@nongnu.org; Fri, 26 May 2017 16:22:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dELkm-0005Bn-4t for qemu-devel@nongnu.org; Fri, 26 May 2017 16:22:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46688) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dELkj-0005Aj-NF; Fri, 26 May 2017 16:22: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 B1A1E80045; Fri, 26 May 2017 20:22: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 DBB1F1748C; Fri, 26 May 2017 20:22:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B1A1E80045 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kwolf@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com B1A1E80045 From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 26 May 2017 22:21:43 +0200 Message-Id: <1495830130-30611-3-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.27]); Fri, 26 May 2017 20:22: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 02/29] qed: Make qed_read_table() synchronous 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" Note that this code is generally not running in coroutine context, so this is an actual blocking synchronous operation. We'll fix this in a moment. Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake Reviewed-by: Stefan Hajnoczi --- block/qed-table.c | 56 ++++++++++++++++++---------------------------------= ---- 1 file changed, 18 insertions(+), 38 deletions(-) diff --git a/block/qed-table.c b/block/qed-table.c index b12c298..f330538 100644 --- a/block/qed-table.c +++ b/block/qed-table.c @@ -18,59 +18,39 @@ #include "qed.h" #include "qemu/bswap.h" =20 -typedef struct { - GenericCB gencb; - BDRVQEDState *s; - QEDTable *table; - - struct iovec iov; +static void qed_read_table(BDRVQEDState *s, uint64_t offset, QEDTable *tab= le, + BlockCompletionFunc *cb, void *opaque) +{ QEMUIOVector qiov; -} QEDReadTableCB; + int noffsets; + int i, ret; =20 -static void qed_read_table_cb(void *opaque, int ret) -{ - QEDReadTableCB *read_table_cb =3D opaque; - QEDTable *table =3D read_table_cb->table; - BDRVQEDState *s =3D read_table_cb->s; - int noffsets =3D read_table_cb->qiov.size / sizeof(uint64_t); - int i; + struct iovec iov =3D { + .iov_base =3D table->offsets, + .iov_len =3D s->header.cluster_size * s->header.table_size, + }; + qemu_iovec_init_external(&qiov, &iov, 1); =20 - /* Handle I/O error */ - if (ret) { + trace_qed_read_table(s, offset, table); + + ret =3D bdrv_preadv(s->bs->file, offset, &qiov); + if (ret < 0) { goto out; } =20 /* Byteswap offsets */ qed_acquire(s); + noffsets =3D qiov.size / sizeof(uint64_t); for (i =3D 0; i < noffsets; i++) { table->offsets[i] =3D le64_to_cpu(table->offsets[i]); } qed_release(s); =20 + ret =3D 0; out: /* Completion */ - trace_qed_read_table_cb(s, read_table_cb->table, ret); - gencb_complete(&read_table_cb->gencb, ret); -} - -static void qed_read_table(BDRVQEDState *s, uint64_t offset, QEDTable *tab= le, - BlockCompletionFunc *cb, void *opaque) -{ - QEDReadTableCB *read_table_cb =3D gencb_alloc(sizeof(*read_table_cb), - cb, opaque); - QEMUIOVector *qiov =3D &read_table_cb->qiov; - - trace_qed_read_table(s, offset, table); - - read_table_cb->s =3D s; - read_table_cb->table =3D table; - read_table_cb->iov.iov_base =3D table->offsets, - read_table_cb->iov.iov_len =3D s->header.cluster_size * s->header.tabl= e_size, - - qemu_iovec_init_external(qiov, &read_table_cb->iov, 1); - bdrv_aio_readv(s->bs->file, offset / BDRV_SECTOR_SIZE, qiov, - qiov->size / BDRV_SECTOR_SIZE, - qed_read_table_cb, read_table_cb); + trace_qed_read_table_cb(s, table, ret); + cb(opaque, ret); } =20 typedef struct { --=20 1.8.3.1