From nobody Mon Feb 9 04:44:35 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1657870112; cv=none; d=zohomail.com; s=zohoarc; b=Zx5shnZyrv7uVhtxqNdd9WYPpcu7Voow8c4lUJRGUc1texzUC+zSFJzaLwLMELrV1WXRxlCe/5rYyLUyB47qdw8nOCUkLkbqy9am81X/VhPlDZLFLNQuIJTfRC/sykUfP59fV2RILedz5jFGXHltuhht2tVGVAKYkRKEocDSgKo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657870112; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DpSt7JMQBZ++VGl+BnzhEQRAj5HaqmmYD+c9V6YVc/E=; b=ni3Y9W1ghqw+pudMhQcDqw5yW30DDYY9HjSuUUZ8NLgG7yAeCRJNjMAJVX2bY2lXuckHwfMuxWaPO6Lmi1wnd4D7O0Th/swN98t+hhBBMKCu13AO0RBKZcHKaqAyu5jCuHBO/Y403i8XD1TReldAY+Cg5s+Eze6ta2mMbEvDC5Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1657870112732671.7660427546836; Fri, 15 Jul 2022 00:28:32 -0700 (PDT) Received: from localhost ([::1]:33812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oCFkU-0001A1-7x for importer@patchew.org; Fri, 15 Jul 2022 03:28:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55734) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oCFhP-0007KD-HB for qemu-devel@nongnu.org; Fri, 15 Jul 2022 03:25:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:53443) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oCFhL-0000zl-LQ for qemu-devel@nongnu.org; Fri, 15 Jul 2022 03:25:17 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-369-i1a85LSANCKffBuSItP1aQ-1; Fri, 15 Jul 2022 03:25:12 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0B6D5101A586 for ; Fri, 15 Jul 2022 07:25:12 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0421E2166B26; Fri, 15 Jul 2022 07:25:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657869913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DpSt7JMQBZ++VGl+BnzhEQRAj5HaqmmYD+c9V6YVc/E=; b=AMgMEEHX8a2N9gK49jqjNAuxntrvWm5Jz6D8i14zSBhucsZAR+hpbCaXmuEyakOsThxSgu 6C9pGwg0BQEYRhge73oaC8svhKuKmSl4v1/be/+rqp8UvGhk5ea5tEBqDIgxVc8y0D2Lcy ulLRfuzn0I5fBxfJHyJwtYu/Gf6zaig= X-MC-Unique: i1a85LSANCKffBuSItP1aQ-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Jason Wang , "Michael S. Tsirkin" Subject: [PATCH 1/2] vhost: Get vring base from vq, not svq Date: Fri, 15 Jul 2022 09:25:06 +0200 Message-Id: <20220715072507.2600431-2-eperezma@redhat.com> In-Reply-To: <20220715072507.2600431-1-eperezma@redhat.com> References: <20220715072507.2600431-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=eperezma@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1657870114136100003 The SVQ vring used idx usually match with the guest visible one, as long as all the guest buffers (GPA) maps to exactly one buffer within qemu's VA. However, as we can see in virtqueue_map_desc, a single guest buffer could map to many buffers in SVQ vring. The solution is to stop using the device's used idx and check for the last avail idx. Since we cannot report in-flight descriptors with vdpa, let's rewind all of them. Fixes: 6d0b22266633 ("vdpa: Adapt vhost_vdpa_get_vring_base to SVQ") Signed-off-by: Eugenio P=C3=A9rez --- hw/virtio/vhost-vdpa.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 795ed5a049..18820498b3 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -1194,11 +1194,10 @@ static int vhost_vdpa_get_vring_base(struct vhost_d= ev *dev, struct vhost_vring_state *ring) { struct vhost_vdpa *v =3D dev->opaque; - int vdpa_idx =3D ring->index - dev->vq_index; int ret; =20 if (v->shadow_vqs_enabled) { - VhostShadowVirtqueue *svq =3D g_ptr_array_index(v->shadow_vqs, vdp= a_idx); + VirtQueue *vq =3D virtio_get_queue(dev->vdev, ring->index); =20 /* * Setting base as last used idx, so destination will see as avail= able @@ -1208,7 +1207,10 @@ static int vhost_vdpa_get_vring_base(struct vhost_de= v *dev, * TODO: This is ok for networking, but other kinds of devices mig= ht * have problems with these retransmissions. */ - ring->num =3D svq->last_used_idx; + while (virtqueue_rewind(vq, 1)) { + continue; + } + ring->num =3D virtio_queue_get_last_avail_idx(dev->vdev, ring->ind= ex); return 0; } =20 --=20 2.31.1 From nobody Mon Feb 9 04:44:35 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1657870112; cv=none; d=zohomail.com; s=zohoarc; b=ekpimtTdWASlDa6V/zq8x5Ao2+yB/jyazk8becARMZytJa6+g0giR35OXiPOGFFtzdKb7eplVVUQxXih/y1daZZi5S7TiUmch9bvjPb3K34q2KpsP3mB/Dt7fZ/xbUpV9HUkd/Y1cX3rNFCrRnD+bdpBBd1/sFIE8nf46UZDNjQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657870112; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Z+MoXENGTkhfESSUfSq/nhfoGvDVnmIdW2wYR+F4SKg=; b=MuzjGjPvNfxoQ/VK8JHIDBVBcm0btSBMAc6ZtgXIL1AlZH0X94Zbik+H7njp+jKo4zohdIYaiR4eRlg+leppgEJ/fNL2aq3OUmxWaUQUZW+1oxlngPnaw1fDiOW7m4bdc+c2ON3tZKikYB+oKI45gmmHDHKPu5oYbmFiS9JtiR4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1657870112272434.44760362554325; Fri, 15 Jul 2022 00:28:32 -0700 (PDT) Received: from localhost ([::1]:33718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oCFkU-000160-Rf for importer@patchew.org; Fri, 15 Jul 2022 03:28:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55736) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oCFhP-0007KE-Ex for qemu-devel@nongnu.org; Fri, 15 Jul 2022 03:25:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:46585) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oCFhM-00010v-VK for qemu-devel@nongnu.org; Fri, 15 Jul 2022 03:25:18 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-455-pLuNtR6NNXmIVfWXGdWJ_w-1; Fri, 15 Jul 2022 03:25:13 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4B16C101A586 for ; Fri, 15 Jul 2022 07:25:13 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7573B2166B26; Fri, 15 Jul 2022 07:25:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657869916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Z+MoXENGTkhfESSUfSq/nhfoGvDVnmIdW2wYR+F4SKg=; b=dFA2yZWUCPiXWduqeE8vDRZkABjZV1iQCgpF2XnOlYXNxmZRYitsTY81yPWc89+qCD2VN8 ZdvnMvvMBmbzCd2fhdmQNySDsSAPR0PaQH0DbBj4paiH8qfLiMg7E3joJq20P6YNJQJG19 a5FogHBzkpMRP+9wsnwW8NNJbsCXDtg= X-MC-Unique: pLuNtR6NNXmIVfWXGdWJ_w-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Jason Wang , "Michael S. Tsirkin" Subject: [PATCH 2/2] vhost: Move SVQ queue rewind to the destination Date: Fri, 15 Jul 2022 09:25:07 +0200 Message-Id: <20220715072507.2600431-3-eperezma@redhat.com> In-Reply-To: <20220715072507.2600431-1-eperezma@redhat.com> References: <20220715072507.2600431-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=eperezma@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1657870114134100002 Migration with SVQ already migrate the inflight descriptors, so the destination can perform the work. This makes easier to migrate between backends or to recover them in vhost devices that support set in flight descriptors. Signed-off-by: Eugenio P=C3=A9rez --- hw/virtio/vhost-vdpa.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 18820498b3..4458c8d23e 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -1178,7 +1178,18 @@ static int vhost_vdpa_set_vring_base(struct vhost_de= v *dev, struct vhost_vring_state *ring) { struct vhost_vdpa *v =3D dev->opaque; + VirtQueue *vq =3D virtio_get_queue(dev->vdev, ring->index); =20 + /* + * vhost-vdpa devices does not support in-flight requests. Set all of = them + * as available. + * + * TODO: This is ok for networking, but other kinds of devices might + * have problems with these retransmissions. + */ + while (virtqueue_rewind(vq, 1)) { + continue; + } if (v->shadow_vqs_enabled) { /* * Device vring base was set at device start. SVQ base is handled = by @@ -1197,19 +1208,6 @@ static int vhost_vdpa_get_vring_base(struct vhost_de= v *dev, int ret; =20 if (v->shadow_vqs_enabled) { - VirtQueue *vq =3D virtio_get_queue(dev->vdev, ring->index); - - /* - * Setting base as last used idx, so destination will see as avail= able - * all the entries that the device did not use, including the in-f= light - * processing ones. - * - * TODO: This is ok for networking, but other kinds of devices mig= ht - * have problems with these retransmissions. - */ - while (virtqueue_rewind(vq, 1)) { - continue; - } ring->num =3D virtio_queue_get_last_avail_idx(dev->vdev, ring->ind= ex); return 0; } --=20 2.31.1