From nobody Wed Nov 5 17:58:36 2025 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 1496421696946655.7571109109978; Fri, 2 Jun 2017 09:41:36 -0700 (PDT) Received: from localhost ([::1]:50742 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGpdn-0005gM-JD for importer@patchew.org; Fri, 02 Jun 2017 12:41:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGpX8-0007uz-Gw for qemu-devel@nongnu.org; Fri, 02 Jun 2017 12:34:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dGpX7-0006OK-Ma for qemu-devel@nongnu.org; Fri, 02 Jun 2017 12:34:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33178) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dGpX7-0006NQ-Eh for qemu-devel@nongnu.org; Fri, 02 Jun 2017 12:34:41 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 71EE280C24; Fri, 2 Jun 2017 16:34:40 +0000 (UTC) Received: from redhat.com (ovpn-125-45.rdu2.redhat.com [10.10.125.45]) by smtp.corp.redhat.com (Postfix) with SMTP id 621487E21D; Fri, 2 Jun 2017 16:34:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 71EE280C24 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=mst@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 71EE280C24 Date: Fri, 2 Jun 2017 19:34:38 +0300 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1496421247-857-5-git-send-email-mst@redhat.com> References: <1496421247-857-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1496421247-857-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 02 Jun 2017 16:34:40 +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] [PULL 4/8] vhost: propagate errors in vhost_device_iotlb_miss() 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: Peter Maydell , Maxime Coquelin 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 Content-Type: text/plain; charset="utf-8" From: Maxime Coquelin Some backends might want to know when things went wrong. Signed-off-by: Maxime Coquelin Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/virtio/vhost.h | 2 +- hw/virtio/vhost.c | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h index a450321..467dc77 100644 --- a/include/hw/virtio/vhost.h +++ b/include/hw/virtio/vhost.h @@ -105,5 +105,5 @@ bool vhost_has_free_slot(void); int vhost_net_set_backend(struct vhost_dev *hdev, struct vhost_vring_file *file); =20 -void vhost_device_iotlb_miss(struct vhost_dev *dev, uint64_t iova, int wri= te); +int vhost_device_iotlb_miss(struct vhost_dev *dev, uint64_t iova, int writ= e); #endif diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 03a46a7..8fab12d 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -971,18 +971,20 @@ static int vhost_memory_region_lookup(struct vhost_de= v *hdev, return -EFAULT; } =20 -void vhost_device_iotlb_miss(struct vhost_dev *dev, uint64_t iova, int wri= te) +int vhost_device_iotlb_miss(struct vhost_dev *dev, uint64_t iova, int writ= e) { IOMMUTLBEntry iotlb; uint64_t uaddr, len; + int ret =3D -EFAULT; =20 rcu_read_lock(); =20 iotlb =3D address_space_get_iotlb_entry(dev->vdev->dma_as, iova, write); if (iotlb.target_as !=3D NULL) { - if (vhost_memory_region_lookup(dev, iotlb.translated_addr, - &uaddr, &len)) { + ret =3D vhost_memory_region_lookup(dev, iotlb.translated_addr, + &uaddr, &len); + if (ret) { error_report("Fail to lookup the translated address " "%"PRIx64, iotlb.translated_addr); goto out; @@ -991,14 +993,17 @@ void vhost_device_iotlb_miss(struct vhost_dev *dev, u= int64_t iova, int write) len =3D MIN(iotlb.addr_mask + 1, len); iova =3D iova & ~iotlb.addr_mask; =20 - if (dev->vhost_ops->vhost_update_device_iotlb(dev, iova, uaddr, - len, iotlb.perm)) { + ret =3D dev->vhost_ops->vhost_update_device_iotlb(dev, iova, uaddr, + len, iotlb.perm); + if (ret) { error_report("Fail to update device iotlb"); goto out; } } out: rcu_read_unlock(); + + return ret; } =20 static int vhost_virtqueue_start(struct vhost_dev *dev, --=20 MST