From nobody Thu May 2 01:55:07 2024 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 1492191792216366.8878823092731; Fri, 14 Apr 2017 10:43:12 -0700 (PDT) Received: from localhost ([::1]:54100 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cz5FV-0005Pc-CB for importer@patchew.org; Fri, 14 Apr 2017 13:43:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48641) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cz5Dz-0004MV-0X for qemu-devel@nongnu.org; Fri, 14 Apr 2017 13:41:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cz5Dy-0005ef-18 for qemu-devel@nongnu.org; Fri, 14 Apr 2017 13:41:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36072) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cz5Dx-0005eH-Ov for qemu-devel@nongnu.org; Fri, 14 Apr 2017 13:41:33 -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 C9C9A51459; Fri, 14 Apr 2017 17:41:32 +0000 (UTC) Received: from localhost.localdomain (ovpn-112-20.ams2.redhat.com [10.36.112.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7DD7762925; Fri, 14 Apr 2017 17:41:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C9C9A51459 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=maxime.coquelin@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com C9C9A51459 From: Maxime Coquelin To: mst@redhat.com, marcandre.lureau@gmail.com, vkaplans@redhat.com, jasowang@redhat.com, wexu@redhat.com, peterx@redhat.com, yuanhan.liu@linux.intel.com, qemu-devel@nongnu.org Date: Fri, 14 Apr 2017 19:40:53 +0200 Message-Id: <20170414174056.28946-2-maxime.coquelin@redhat.com> In-Reply-To: <20170414174056.28946-1-maxime.coquelin@redhat.com> References: <20170414174056.28946-1-maxime.coquelin@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, 14 Apr 2017 17:41:33 +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] [RFC v2 1/4] 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: 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 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Some backends might want to know when things went wrong. Signed-off-by: Maxime Coquelin --- hw/virtio/vhost.c | 15 ++++++++++----- include/hw/virtio/vhost.h | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 613494d..c490cf9 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -964,18 +964,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; @@ -984,14 +986,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, 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 --=20 2.9.3 From nobody Thu May 2 01:55:07 2024 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 1492191805896380.3589789823575; Fri, 14 Apr 2017 10:43:25 -0700 (PDT) Received: from localhost ([::1]:54101 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cz5Fj-0005bb-2F for importer@patchew.org; Fri, 14 Apr 2017 13:43:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48664) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cz5E4-0004PD-LF for qemu-devel@nongnu.org; Fri, 14 Apr 2017 13:41:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cz5E3-0005kK-Kw for qemu-devel@nongnu.org; Fri, 14 Apr 2017 13:41:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54460) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cz5E3-0005jK-At for qemu-devel@nongnu.org; Fri, 14 Apr 2017 13:41:39 -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 4189A3B707; Fri, 14 Apr 2017 17:41:38 +0000 (UTC) Received: from localhost.localdomain (ovpn-112-20.ams2.redhat.com [10.36.112.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5652452FC3; Fri, 14 Apr 2017 17:41:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 4189A3B707 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=maxime.coquelin@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 4189A3B707 From: Maxime Coquelin To: mst@redhat.com, marcandre.lureau@gmail.com, vkaplans@redhat.com, jasowang@redhat.com, wexu@redhat.com, peterx@redhat.com, yuanhan.liu@linux.intel.com, qemu-devel@nongnu.org Date: Fri, 14 Apr 2017 19:40:54 +0200 Message-Id: <20170414174056.28946-3-maxime.coquelin@redhat.com> In-Reply-To: <20170414174056.28946-1-maxime.coquelin@redhat.com> References: <20170414174056.28946-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 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.30]); Fri, 14 Apr 2017 17:41:38 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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] [RFC v2 2/4] vhost-user: add vhost_user to hold the chr 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Maxime Coquelin Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Marc-Andr=C3=A9 Lureau Next patches will add more fields to the structure Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Maxime Coquelin --- hw/virtio/vhost-user.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 9334a8a..f0e10d0 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -111,6 +111,10 @@ static VhostUserMsg m __attribute__ ((unused)); /* The version of the protocol we support */ #define VHOST_USER_VERSION (0x1) =20 +struct vhost_user { + CharBackend *chr; +}; + static bool ioeventfd_enabled(void) { return kvm_enabled() && kvm_eventfds_enabled(); @@ -118,7 +122,8 @@ static bool ioeventfd_enabled(void) =20 static int vhost_user_read(struct vhost_dev *dev, VhostUserMsg *msg) { - CharBackend *chr =3D dev->opaque; + struct vhost_user *u =3D dev->opaque; + CharBackend *chr =3D u->chr; uint8_t *p =3D (uint8_t *) msg; int r, size =3D VHOST_USER_HDR_SIZE; =20 @@ -199,7 +204,8 @@ static bool vhost_user_one_time_request(VhostUserReques= t request) static int vhost_user_write(struct vhost_dev *dev, VhostUserMsg *msg, int *fds, int fd_num) { - CharBackend *chr =3D dev->opaque; + struct vhost_user *u =3D dev->opaque; + CharBackend *chr =3D u->chr; int ret, size =3D VHOST_USER_HDR_SIZE + msg->size; =20 /* @@ -571,11 +577,14 @@ static int vhost_user_reset_device(struct vhost_dev *= dev) static int vhost_user_init(struct vhost_dev *dev, void *opaque) { uint64_t features; + struct vhost_user *u; int err; =20 assert(dev->vhost_ops->backend_type =3D=3D VHOST_BACKEND_TYPE_USER); =20 - dev->opaque =3D opaque; + u =3D g_new0(struct vhost_user, 1); + u->chr =3D opaque; + dev->opaque =3D u; =20 err =3D vhost_user_get_features(dev, &features); if (err < 0) { @@ -620,8 +629,12 @@ static int vhost_user_init(struct vhost_dev *dev, void= *opaque) =20 static int vhost_user_cleanup(struct vhost_dev *dev) { + struct vhost_user *u; + assert(dev->vhost_ops->backend_type =3D=3D VHOST_BACKEND_TYPE_USER); =20 + u =3D dev->opaque; + g_free(u); dev->opaque =3D 0; =20 return 0; --=20 2.9.3 From nobody Thu May 2 01:55:07 2024 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 14921918915981010.4917138834965; Fri, 14 Apr 2017 10:44:51 -0700 (PDT) Received: from localhost ([::1]:54107 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cz5H6-0006ms-Ch for importer@patchew.org; Fri, 14 Apr 2017 13:44:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48725) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cz5EI-0004b5-0J for qemu-devel@nongnu.org; Fri, 14 Apr 2017 13:41:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cz5ED-0005to-VR for qemu-devel@nongnu.org; Fri, 14 Apr 2017 13:41:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36322) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cz5ED-0005tI-Lf for qemu-devel@nongnu.org; Fri, 14 Apr 2017 13:41:49 -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 8B2FF51459; Fri, 14 Apr 2017 17:41:48 +0000 (UTC) Received: from localhost.localdomain (ovpn-112-20.ams2.redhat.com [10.36.112.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C87517493; Fri, 14 Apr 2017 17:41:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8B2FF51459 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=maxime.coquelin@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 8B2FF51459 From: Maxime Coquelin To: mst@redhat.com, marcandre.lureau@gmail.com, vkaplans@redhat.com, jasowang@redhat.com, wexu@redhat.com, peterx@redhat.com, yuanhan.liu@linux.intel.com, qemu-devel@nongnu.org Date: Fri, 14 Apr 2017 19:40:55 +0200 Message-Id: <20170414174056.28946-4-maxime.coquelin@redhat.com> In-Reply-To: <20170414174056.28946-1-maxime.coquelin@redhat.com> References: <20170414174056.28946-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 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, 14 Apr 2017 17:41:48 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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] [RFC v2 3/4] vhost-user: add slave-req-fd support 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Maxime Coquelin Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Marc-Andr=C3=A9 Lureau Learn to give a socket to the slave to let him make requests to the master. Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Maxime Coquelin --- docs/specs/vhost-user.txt | 30 +++++++++++- hw/virtio/vhost-user.c | 117 ++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 145 insertions(+), 2 deletions(-) diff --git a/docs/specs/vhost-user.txt b/docs/specs/vhost-user.txt index 036890f..49c6293 100644 --- a/docs/specs/vhost-user.txt +++ b/docs/specs/vhost-user.txt @@ -139,6 +139,7 @@ in the ancillary data: * VHOST_USER_SET_VRING_KICK * VHOST_USER_SET_VRING_CALL * VHOST_USER_SET_VRING_ERR + * VHOST_USER_SET_SLAVE_REQ_FD =20 If Master is unable to send the full message or receives a wrong reply it = will close the connection. An optional reconnection mechanism can be implemente= d. @@ -252,6 +253,18 @@ Once the source has finished migration, rings will be = stopped by the source. No further update must be done before rings are restarted. =20 +Slave communication +------------------- + +An optional communication channel is provided if the slave declares +VHOST_USER_PROTOCOL_F_SLAVE_REQ protocol feature, to allow the slave to ma= ke +requests to the master. + +The fd is provided via VHOST_USER_SET_SLAVE_REQ_FD ancillary data. + +A slave may then send VHOST_USER_SLAVE_* messages to the master +using this fd communication channel. + Protocol features ----------------- =20 @@ -260,9 +273,10 @@ Protocol features #define VHOST_USER_PROTOCOL_F_RARP 2 #define VHOST_USER_PROTOCOL_F_REPLY_ACK 3 #define VHOST_USER_PROTOCOL_F_MTU 4 +#define VHOST_USER_PROTOCOL_F_SLAVE_REQ 5 =20 -Message types -------------- +Master message types +-------------------- =20 * VHOST_USER_GET_FEATURES =20 @@ -486,6 +500,18 @@ Message types If VHOST_USER_PROTOCOL_F_REPLY_ACK is negotiated, slave must respond with zero in case the specified MTU is valid, or non-zero otherwise. =20 + * VHOST_USER_SET_SLAVE_REQ_FD + + Id: 21 + Equivalent ioctl: N/A + Master payload: N/A + + Set the socket file descriptor for slave initiated requests. It is p= assed + in the ancillary data. + This request should be sent only when VHOST_USER_F_PROTOCOL_FEATURES + has been negotiated, and protocol feature bit VHOST_USER_PROTOCOL_F_= SLAVE_REQ + bit is present in VHOST_USER_GET_PROTOCOL_FEATURES. + VHOST_USER_PROTOCOL_F_REPLY_ACK: ------------------------------- The original vhost-user specification only demands replies for certain diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index f0e10d0..f26f11b 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -33,6 +33,7 @@ enum VhostUserProtocolFeature { VHOST_USER_PROTOCOL_F_RARP =3D 2, VHOST_USER_PROTOCOL_F_REPLY_ACK =3D 3, VHOST_USER_PROTOCOL_F_NET_MTU =3D 4, + VHOST_USER_PROTOCOL_F_SLAVE_REQ =3D 5, =20 VHOST_USER_PROTOCOL_F_MAX }; @@ -61,9 +62,15 @@ typedef enum VhostUserRequest { VHOST_USER_SET_VRING_ENABLE =3D 18, VHOST_USER_SEND_RARP =3D 19, VHOST_USER_NET_SET_MTU =3D 20, + VHOST_USER_SET_SLAVE_REQ_FD =3D 21, VHOST_USER_MAX } VhostUserRequest; =20 +typedef enum VhostUserSlaveRequest { + VHOST_USER_SLAVE_NONE =3D 0, + VHOST_USER_SLAVE_MAX +} VhostUserSlaveRequest; + typedef struct VhostUserMemoryRegion { uint64_t guest_phys_addr; uint64_t memory_size; @@ -113,6 +120,7 @@ static VhostUserMsg m __attribute__ ((unused)); =20 struct vhost_user { CharBackend *chr; + int slave_fd; }; =20 static bool ioeventfd_enabled(void) @@ -574,6 +582,104 @@ static int vhost_user_reset_device(struct vhost_dev *= dev) return 0; } =20 +static void slave_read(void *opaque) +{ + struct vhost_dev *dev =3D opaque; + struct vhost_user *u =3D dev->opaque; + VhostUserMsg msg =3D { 0, }; + int size, ret =3D 0; + + /* Read header */ + size =3D read(u->slave_fd, &msg, VHOST_USER_HDR_SIZE); + if (size !=3D VHOST_USER_HDR_SIZE) { + error_report("Failed to read from slave."); + goto err; + } + + if (msg.size > VHOST_USER_PAYLOAD_SIZE) { + error_report("Failed to read msg header." + " Size %d exceeds the maximum %zu.", msg.size, + VHOST_USER_PAYLOAD_SIZE); + goto err; + } + + /* Read payload */ + size =3D read(u->slave_fd, &msg.payload, msg.size); + if (size !=3D msg.size) { + error_report("Failed to read payload from slave."); + goto err; + } + + switch (msg.request) { + default: + error_report("Received unexpected msg type."); + ret =3D -EINVAL; + } + + /* + * REPLY_ACK feature handling. Other reply types has to be managed + * directly in their request handlers. + */ + if (msg.flags & VHOST_USER_NEED_REPLY_MASK) { + msg.flags &=3D ~VHOST_USER_NEED_REPLY_MASK; + msg.flags |=3D VHOST_USER_REPLY_MASK; + + msg.payload.u64 =3D !!ret; + msg.size =3D sizeof(msg.payload.u64); + + size =3D write(u->slave_fd, &msg, VHOST_USER_HDR_SIZE + msg.size); + if (size !=3D VHOST_USER_HDR_SIZE + msg.size) { + error_report("Failed to send msg reply to slave."); + goto err; + } + } + + return; + +err: + qemu_set_fd_handler(u->slave_fd, NULL, NULL, NULL); + close(u->slave_fd); + u->slave_fd =3D -1; + return; +} + +static int vhost_setup_slave_channel(struct vhost_dev *dev) +{ + VhostUserMsg msg =3D { + .request =3D VHOST_USER_SET_SLAVE_REQ_FD, + .flags =3D VHOST_USER_VERSION, + }; + struct vhost_user *u =3D dev->opaque; + int sv[2]; + bool reply_supported =3D virtio_has_feature(dev->protocol_features, + VHOST_USER_PROTOCOL_F_REPLY_= ACK); + + if (!virtio_has_feature(dev->protocol_features, + VHOST_USER_PROTOCOL_F_SLAVE_REQ)) { + return 0; + } + + if (socketpair(PF_UNIX, SOCK_STREAM, 0, sv) =3D=3D -1) { + error_report("socketpair() failed"); + return -1; + } + + u->slave_fd =3D sv[0]; + qemu_set_fd_handler(u->slave_fd, slave_read, NULL, dev); + + if (reply_supported) { + msg.flags |=3D VHOST_USER_NEED_REPLY_MASK; + } + + vhost_user_write(dev, &msg, &sv[1], 1); + + if (reply_supported) { + return process_message_reply(dev, msg.request); + } + + return 0; +} + static int vhost_user_init(struct vhost_dev *dev, void *opaque) { uint64_t features; @@ -584,6 +690,7 @@ static int vhost_user_init(struct vhost_dev *dev, void = *opaque) =20 u =3D g_new0(struct vhost_user, 1); u->chr =3D opaque; + u->slave_fd =3D -1; dev->opaque =3D u; =20 err =3D vhost_user_get_features(dev, &features); @@ -624,6 +731,12 @@ static int vhost_user_init(struct vhost_dev *dev, void= *opaque) "VHOST_USER_PROTOCOL_F_LOG_SHMFD feature."); } =20 + + err =3D vhost_setup_slave_channel(dev); + if (err < 0) { + return err; + } + return 0; } =20 @@ -634,6 +747,10 @@ static int vhost_user_cleanup(struct vhost_dev *dev) assert(dev->vhost_ops->backend_type =3D=3D VHOST_BACKEND_TYPE_USER); =20 u =3D dev->opaque; + if (u->slave_fd >=3D 0) { + close(u->slave_fd); + u->slave_fd =3D -1; + } g_free(u); dev->opaque =3D 0; =20 --=20 2.9.3 From nobody Thu May 2 01:55:07 2024 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 1492191825248203.38966476517646; Fri, 14 Apr 2017 10:43:45 -0700 (PDT) Received: from localhost ([::1]:54102 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cz5G1-0005rh-Su for importer@patchew.org; Fri, 14 Apr 2017 13:43:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48740) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cz5EM-0004dM-6W for qemu-devel@nongnu.org; Fri, 14 Apr 2017 13:41:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cz5EK-00061v-Mz for qemu-devel@nongnu.org; Fri, 14 Apr 2017 13:41:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41222) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cz5EK-00060t-EN for qemu-devel@nongnu.org; Fri, 14 Apr 2017 13:41:56 -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 724D98553F; Fri, 14 Apr 2017 17:41:55 +0000 (UTC) Received: from localhost.localdomain (ovpn-112-20.ams2.redhat.com [10.36.112.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id E058F1714E; Fri, 14 Apr 2017 17:41:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 724D98553F Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=maxime.coquelin@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 724D98553F From: Maxime Coquelin To: mst@redhat.com, marcandre.lureau@gmail.com, vkaplans@redhat.com, jasowang@redhat.com, wexu@redhat.com, peterx@redhat.com, yuanhan.liu@linux.intel.com, qemu-devel@nongnu.org Date: Fri, 14 Apr 2017 19:40:56 +0200 Message-Id: <20170414174056.28946-5-maxime.coquelin@redhat.com> In-Reply-To: <20170414174056.28946-1-maxime.coquelin@redhat.com> References: <20170414174056.28946-1-maxime.coquelin@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.28]); Fri, 14 Apr 2017 17:41:55 +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] [RFC v2 4/4] spec/vhost-user spec: Add IOMMU support 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: 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 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This patch specifies and implements the master/slave communication to support device IOTLB in slave. The vhost_iotlb_msg structure introduced for kernel backends is re-used, making the design close between the two backends. An exception is the use of the secondary channel to enable the slave to send IOTLB miss requests to the master. Signed-off-by: Maxime Coquelin --- docs/specs/vhost-user.txt | 74 +++++++++++++++++++++++++++++++++++ hw/virtio/vhost-user.c | 98 +++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 172 insertions(+) diff --git a/docs/specs/vhost-user.txt b/docs/specs/vhost-user.txt index 49c6293..a16dc44 100644 --- a/docs/specs/vhost-user.txt +++ b/docs/specs/vhost-user.txt @@ -97,6 +97,23 @@ Depending on the request type, payload can be: log offset: offset from start of supplied file descriptor where logging starts (i.e. where guest address 0 would be logged) =20 + * An IOTLB message + --------------------------------------------------------- + | iova | size | user address | permissions flags | type | + --------------------------------------------------------- + + IOVA: a 64-bit guest I/O virtual address + Size: a 64-bit size + User address: a 64-bit user address + Permissions flags: a 8-bit bit field: + - Bit 0: Read access + - Bit 1: Write access + Type: a 8-bit IOTLB message type: + - 1: IOTLB miss + - 2: IOTLB update + - 3: IOTLB invalidate + - 4: IOTLB access fail + In QEMU the vhost-user message is implemented with the following struct: =20 typedef struct VhostUserMsg { @@ -109,6 +126,7 @@ typedef struct VhostUserMsg { struct vhost_vring_addr addr; VhostUserMemory memory; VhostUserLog log; + struct vhost_iotlb_msg iotlb; }; } QEMU_PACKED VhostUserMsg; =20 @@ -253,6 +271,30 @@ Once the source has finished migration, rings will be = stopped by the source. No further update must be done before rings are restarted. =20 +IOMMU support +------------- + +When the VIRTIO_F_IOMMU_PLATFORM feature has been negotiated, the master h= as +to send IOTLB entries update & invalidation by sending VHOST_USER_IOTLB_MSG +requests to the slave with a struct vhost_iotlb_msg payload. For update ev= ents, +the iotlb payload has to be filled with the update message type (2), the I= /O +virtual address, the size, the user virtual address, and the permissions +flags. For invalidation events, the iotlb payload has to be filled with the +update message type (3), the I/O virtual address and the size. On success,= the +slave is expected to reply with a zero payload, non-zero otherwise. + +When the VHOST_USER_PROTOCOL_F_SLAVE_REQ is supported by the slave, and the +master initiated the slave to master communication channel using the +VHOST_USER_SET_SLAVE_REQ_FD request, the slave can send IOTLB miss and acc= ess +failure events by sending VHOST_USER_SLAVE_IOTLB_MSG requests to the master +with a struct vhost_iotlb_msg payload. For miss events, the iotlb payload = has +to be filled with the miss message type (1), the I/O virtual address and t= he +permissions flags. For access failure event, the iotlb payload has to be +filled with the access failure message type (4), the I/O virtual address a= nd +the permissions flags. For synchronization purpose, the slave may rely on = the +reply-ack feature, so the master may send a reply when operation is comple= ted +if the reply-ack feature is negotiated and slaves requests a reply. + Slave communication ------------------- =20 @@ -512,6 +554,38 @@ Master message types has been negotiated, and protocol feature bit VHOST_USER_PROTOCOL_F_= SLAVE_REQ bit is present in VHOST_USER_GET_PROTOCOL_FEATURES. =20 + * VHOST_USER_IOTLB_MSG + + Id: 22 + Equivalent ioctl: N/A (equivalent to VHOST_IOTLB_MSG message type) + Master payload: struct vhost_iotlb_msg + Slave payload: u64 + + Send IOTLB messages with struct vhost_iotlb_msg as payload. + Master sends such requests to update and invalidate entries in the d= evice + IOTLB. The slave has to acknowledge the request with sending zero as= u64 + payload for success, non-zero otherwise. + This request should be send only when VIRTIO_F_IOMMU_PLATFORM feature + has been successfully negotiated. + +Slave message types +------------------- + + * VHOST_USER_SLAVE_IOTLB_MSG + + Id: 1 + Equivalent ioctl: N/A (equivalent to VHOST_IOTLB_MSG message type) + Slave payload: struct vhost_iotlb_msg + Master payload: N/A + + Send IOTLB messages with struct vhost_iotlb_msg as payload. + Slave sends such requests to notify of an IOTLB miss, or an IOTLB + access failure. If VHOST_USER_PROTOCOL_F_REPLY_ACK is negotiated, + and slave set the VHOST_USER_NEED_REPLY flag, master must respond wi= th + zero when operation is successfully completed, or non-zero otherwise. + This request should be send only when VIRTIO_F_IOMMU_PLATFORM feature + has been successfully negotiated. + VHOST_USER_PROTOCOL_F_REPLY_ACK: ------------------------------- The original vhost-user specification only demands replies for certain diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index f26f11b..d06886b 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -63,11 +63,13 @@ typedef enum VhostUserRequest { VHOST_USER_SEND_RARP =3D 19, VHOST_USER_NET_SET_MTU =3D 20, VHOST_USER_SET_SLAVE_REQ_FD =3D 21, + VHOST_USER_IOTLB_MSG =3D 22, VHOST_USER_MAX } VhostUserRequest; =20 typedef enum VhostUserSlaveRequest { VHOST_USER_SLAVE_NONE =3D 0, + VHOST_USER_SLAVE_IOTLB_MSG =3D 1, VHOST_USER_SLAVE_MAX } VhostUserSlaveRequest; =20 @@ -105,6 +107,7 @@ typedef struct VhostUserMsg { struct vhost_vring_addr addr; VhostUserMemory memory; VhostUserLog log; + struct vhost_iotlb_msg iotlb; } payload; } QEMU_PACKED VhostUserMsg; =20 @@ -582,6 +585,31 @@ static int vhost_user_reset_device(struct vhost_dev *d= ev) return 0; } =20 +static int vhost_user_iotlb_read(struct vhost_dev *dev, VhostUserMsg *msg) +{ + struct vhost_iotlb_msg *imsg =3D &msg->payload.iotlb; + int ret =3D 0; + + switch (imsg->type) { + case VHOST_IOTLB_MISS: + ret =3D vhost_device_iotlb_miss(dev, imsg->iova, + imsg->perm !=3D VHOST_ACCESS_RO); + break; + case VHOST_IOTLB_ACCESS_FAIL: + /* FIXME: report device iotlb error */ + ret =3D -ENOTSUP; + break; + case VHOST_IOTLB_UPDATE: + case VHOST_IOTLB_INVALIDATE: + default: + error_report("Unexpected IOTLB message type"); + ret =3D -EINVAL; + break; + } + + return ret; +} + static void slave_read(void *opaque) { struct vhost_dev *dev =3D opaque; @@ -611,6 +639,8 @@ static void slave_read(void *opaque) } =20 switch (msg.request) { + ret =3D vhost_user_iotlb_read(dev, &msg); + break; default: error_report("Received unexpected msg type."); ret =3D -EINVAL; @@ -848,6 +878,71 @@ static int vhost_user_net_set_mtu(struct vhost_dev *de= v, uint16_t mtu) return 0; } =20 +static int vhost_user_update_device_iotlb(struct vhost_dev *dev, + uint64_t iova, uint64_t uaddr, + uint64_t len, + IOMMUAccessFlags perm) +{ + VhostUserMsg msg =3D { + .request =3D VHOST_USER_IOTLB_MSG, + .size =3D sizeof(msg.payload.iotlb), + .flags =3D VHOST_USER_VERSION | VHOST_USER_NEED_REPLY_MASK, + .payload.iotlb =3D { + .iova =3D iova, + .uaddr =3D uaddr, + .size =3D len, + .type =3D VHOST_IOTLB_UPDATE, + }, + }; + + switch (perm) { + case IOMMU_RO: + msg.payload.iotlb.perm =3D VHOST_ACCESS_RO; + break; + case IOMMU_WO: + msg.payload.iotlb.perm =3D VHOST_ACCESS_WO; + break; + case IOMMU_RW: + msg.payload.iotlb.perm =3D VHOST_ACCESS_RW; + break; + default: + g_assert_not_reached(); + } + + if (vhost_user_write(dev, &msg, NULL, 0) < 0) { + return -1; + } + + return process_message_reply(dev, msg.request); +} + +static int vhost_user_invalidate_device_iotlb(struct vhost_dev *dev, + uint64_t iova, uint64_t len) +{ + VhostUserMsg msg =3D { + .request =3D VHOST_USER_IOTLB_MSG, + .size =3D sizeof(msg.payload.iotlb), + .flags =3D VHOST_USER_VERSION | VHOST_USER_NEED_REPLY_MASK, + .payload.iotlb =3D { + .iova =3D iova, + .size =3D len, + .type =3D VHOST_IOTLB_INVALIDATE, + }, + }; + + if (vhost_user_write(dev, &msg, NULL, 0) < 0) { + return -1; + } + + return process_message_reply(dev, msg.request); +} + + +static void vhost_user_set_iotlb_callback(struct vhost_dev *dev, int enabl= ed) +{ + /* No-op as the receive channel is not dedicated to IOTLB messages. */ +} + const VhostOps user_ops =3D { .backend_type =3D VHOST_BACKEND_TYPE_USER, .vhost_backend_init =3D vhost_user_init, @@ -872,4 +967,7 @@ const VhostOps user_ops =3D { .vhost_migration_done =3D vhost_user_migration_done, .vhost_backend_can_merge =3D vhost_user_can_merge, .vhost_net_set_mtu =3D vhost_user_net_set_mtu, + .vhost_set_iotlb_callback =3D vhost_user_set_iotlb_callback, + .vhost_update_device_iotlb =3D vhost_user_update_device_iotlb, + .vhost_invalidate_device_iotlb =3D vhost_user_invalidate_device_io= tlb, }; --=20 2.9.3