From nobody Mon Feb 9 22:37:58 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 1490066632897986.8322457404691; Mon, 20 Mar 2017 20:23:52 -0700 (PDT) Received: from localhost ([::1]:36418 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqAOl-00066m-4W for importer@patchew.org; Mon, 20 Mar 2017 23:23:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40715) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqAKR-0003Bh-SR for qemu-devel@nongnu.org; Mon, 20 Mar 2017 23:19:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cqAKO-0001Kb-P1 for qemu-devel@nongnu.org; Mon, 20 Mar 2017 23:19:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55628) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cqAKM-0001JX-Mx; Mon, 20 Mar 2017 23:19:18 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B715AC05093D; Tue, 21 Mar 2017 03:19:18 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-61.pek2.redhat.com [10.72.8.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id 050CE78DD3; Tue, 21 Mar 2017 03:19:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B715AC05093D Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com B715AC05093D From: Fam Zheng To: qemu-devel@nongnu.org Date: Tue, 21 Mar 2017 11:16:30 +0800 Message-Id: <20170321031635.22123-12-famz@redhat.com> In-Reply-To: <20170321031635.22123-1-famz@redhat.com> References: <20170321031635.22123-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 21 Mar 2017 03:19:18 +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 RFC 11/16] virtio-blk: Request BLK_PERM_AIO_CONTEXT_CHANGE for dataplane 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: Kevin Wolf , Paolo Bonzini , qemu-block@nongnu.org, Stefan Hajnoczi , Max Reitz 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" blk_set_aio_context is audited by perm API, so follow the protocol and request for permission first. Previously the return code in error path is hardcoded as -EPERM, but returning 'r' is more meaningful here both for the new error and existing errors. Signed-off-by: Fam Zheng --- hw/block/dataplane/virtio-blk.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-bl= k.c index 5556f0e..8f2ff2df 100644 --- a/hw/block/dataplane/virtio-blk.c +++ b/hw/block/dataplane/virtio-blk.c @@ -168,6 +168,7 @@ int virtio_blk_data_plane_start(VirtIODevice *vdev) unsigned i; unsigned nvqs =3D s->conf->num_queues; int r; + Error *local_err =3D NULL; =20 if (vblk->dataplane_started || s->starting) { return 0; @@ -175,12 +176,18 @@ int virtio_blk_data_plane_start(VirtIODevice *vdev) =20 s->starting =3D true; =20 + r =3D blk_request_perm(s->conf->conf.blk, BLK_PERM_AIO_CONTEXT_CHANGE, + &local_err); + if (r) { + error_report_err(local_err); + goto fail; + } /* Set up guest notifier (irq) */ r =3D k->set_guest_notifiers(qbus->parent, nvqs, true); if (r !=3D 0) { fprintf(stderr, "virtio-blk failed to set guest notifier (%d), " "ensure -enable-kvm is set\n", r); - goto fail_guest_notifiers; + goto fail; } =20 /* Set up virtqueue notify */ @@ -191,7 +198,7 @@ int virtio_blk_data_plane_start(VirtIODevice *vdev) while (i--) { virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), i, false); } - goto fail_guest_notifiers; + goto fail; } } =20 @@ -219,11 +226,11 @@ int virtio_blk_data_plane_start(VirtIODevice *vdev) aio_context_release(s->ctx); return 0; =20 - fail_guest_notifiers: +fail: vblk->dataplane_disabled =3D true; s->starting =3D false; vblk->dataplane_started =3D true; - return -ENOSYS; + return r; } =20 /* Context: QEMU global mutex held */ --=20 2.9.3