From nobody Mon Feb 9 04:59:37 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=1657816738; cv=none; d=zohomail.com; s=zohoarc; b=JXG9y1LGAgBZVPhyUzxGXK62QNC9tUwCtqo/35nUkupJ5k4aog2odN7gmgHII++61Fk3+JILapGlbtNwBKLlnIGKMPOmUB9BGGh2/2/nlFENiBz7Ic2qw+qZpY6/FecCkle+DZAnDtJ2o01QTPKfevL9ZbBDPgT79dBuVIIPm7M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657816738; 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=hKq2YAk9fNcaFJ8TwjenxdE4lwtqYY/nCPcPaPP+diQ=; b=Vv6EJkpdNWUFI8fyAQfRT9x1n0Wb+qjYcFYVmI/LVtttiQlrZd5+vBNJ5Wo7TqxsXoZnOv092RcYVr5FQAwlHN1FRBIQsp5au0zhKe9IXUYEwkJnFoRV1kviTY/Nga+7MVOVA7WxHMJKv/c7IfZnKWgRb/icZcwlhbwKUVwZAr8= 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 1657816738495882.6720163495746; Thu, 14 Jul 2022 09:38:58 -0700 (PDT) Received: from localhost ([::1]:43558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oC1rd-00089T-GZ for importer@patchew.org; Thu, 14 Jul 2022 12:38:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36776) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oC1lL-0007YV-Cl for qemu-devel@nongnu.org; Thu, 14 Jul 2022 12:32:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:21518) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oC1lJ-0003Lz-FT for qemu-devel@nongnu.org; Thu, 14 Jul 2022 12:32:26 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-631-rDvMj-M5Oa-EZoaPLU33fA-1; Thu, 14 Jul 2022 12:32:21 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B47D63802B9C; Thu, 14 Jul 2022 16:32:20 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE7A41121315; Thu, 14 Jul 2022 16:32:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657816344; 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=hKq2YAk9fNcaFJ8TwjenxdE4lwtqYY/nCPcPaPP+diQ=; b=Q4znCHj9kYwpgZ/rL8lOmxPNhAuSBct4lnQR4S21kDI6ZYJcLKyv6vJalr+yOzBLEugaUb ckHwADiumGXHEGHlwXlq7zOXXtG41cC99VZiyz2c32rXmMJj0iifpm80UBpVtBg5hasruc QaoNM8QISeG2IUdzFioFjLgLaVRAjjg= X-MC-Unique: rDvMj-M5Oa-EZoaPLU33fA-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Gautam Dawar , Paolo Bonzini , "Michael S. Tsirkin" , Stefano Garzarella , Eric Blake , Zhu Lingshan , Stefan Hajnoczi , Markus Armbruster , Cornelia Huck , Parav Pandit , Laurent Vivier , Liuxiangdong , Eli Cohen , Cindy Lu , Harpreet Singh Anand , Jason Wang , "Gonglei (Arei)" Subject: [PATCH v2 08/19] vhost: Add SVQElement Date: Thu, 14 Jul 2022 18:31:39 +0200 Message-Id: <20220714163150.2536327-9-eperezma@redhat.com> In-Reply-To: <20220714163150.2536327-1-eperezma@redhat.com> References: <20220714163150.2536327-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.3 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: 1657816740678100003 This will allow SVQ to add context to the different queue elements. This patch only store the actual element, no functional change intended. Signed-off-by: Eugenio P=C3=A9rez --- hw/virtio/vhost-shadow-virtqueue.h | 8 ++++++-- hw/virtio/vhost-shadow-virtqueue.c | 32 ++++++++++++++++-------------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/hw/virtio/vhost-shadow-virtqueue.h b/hw/virtio/vhost-shadow-vi= rtqueue.h index c132c994e9..f35d4b8f90 100644 --- a/hw/virtio/vhost-shadow-virtqueue.h +++ b/hw/virtio/vhost-shadow-virtqueue.h @@ -15,6 +15,10 @@ #include "standard-headers/linux/vhost_types.h" #include "hw/virtio/vhost-iova-tree.h" =20 +typedef struct SVQElement { + VirtQueueElement elem; +} SVQElement; + /* Shadow virtqueue to relay notifications */ typedef struct VhostShadowVirtqueue { /* Shadow vring */ @@ -48,10 +52,10 @@ typedef struct VhostShadowVirtqueue { VhostIOVATree *iova_tree; =20 /* Map for use the guest's descriptors */ - VirtQueueElement **ring_id_maps; + SVQElement **ring_id_maps; =20 /* Next VirtQueue element that guest made available */ - VirtQueueElement *next_guest_avail_elem; + SVQElement *next_guest_avail_elem; =20 /* * Backup next field for each descriptor so we can recover securely, n= ot diff --git a/hw/virtio/vhost-shadow-virtqueue.c b/hw/virtio/vhost-shadow-vi= rtqueue.c index b005a457c6..442ca3cbd3 100644 --- a/hw/virtio/vhost-shadow-virtqueue.c +++ b/hw/virtio/vhost-shadow-virtqueue.c @@ -240,7 +240,7 @@ static void vhost_svq_kick(VhostShadowVirtqueue *svq) */ static int vhost_svq_add(VhostShadowVirtqueue *svq, const struct iovec *ou= t_sg, size_t out_num, const struct iovec *in_sg, - size_t in_num, VirtQueueElement *elem) + size_t in_num, SVQElement *svq_elem) { unsigned qemu_head; unsigned ndescs =3D in_num + out_num; @@ -252,21 +252,22 @@ static int vhost_svq_add(VhostShadowVirtqueue *svq, c= onst struct iovec *out_sg, =20 ok =3D vhost_svq_add_split(svq, out_sg, out_num, in_sg, in_num, &qemu_= head); if (unlikely(!ok)) { - g_free(elem); + g_free(svq_elem); return -EINVAL; } =20 - svq->ring_id_maps[qemu_head] =3D elem; + svq->ring_id_maps[qemu_head] =3D svq_elem; vhost_svq_kick(svq); return 0; } =20 /* Convenience wrapper to add a guest's element to SVQ */ static int vhost_svq_add_element(VhostShadowVirtqueue *svq, - VirtQueueElement *elem) + SVQElement *svq_elem) { + VirtQueueElement *elem =3D &svq_elem->elem; return vhost_svq_add(svq, elem->out_sg, elem->out_num, elem->in_sg, - elem->in_num, elem); + elem->in_num, svq_elem); } =20 /** @@ -292,7 +293,7 @@ static void vhost_handle_guest_kick(VhostShadowVirtqueu= e *svq) virtio_queue_set_notification(svq->vq, false); =20 while (true) { - VirtQueueElement *elem; + SVQElement *elem; int r; =20 if (svq->next_guest_avail_elem) { @@ -386,9 +387,10 @@ static uint16_t vhost_svq_last_desc_of_chain(const Vho= stShadowVirtqueue *svq, return i; } =20 -static VirtQueueElement *vhost_svq_get_buf(VhostShadowVirtqueue *svq, - uint32_t *len) +static SVQElement *vhost_svq_get_buf(VhostShadowVirtqueue *svq, + uint32_t *len) { + SVQElement *elem; const vring_used_t *used =3D svq->vring.used; vring_used_elem_t used_elem; uint16_t last_used, last_used_chain, num; @@ -417,8 +419,8 @@ static VirtQueueElement *vhost_svq_get_buf(VhostShadowV= irtqueue *svq, return NULL; } =20 - num =3D svq->ring_id_maps[used_elem.id]->in_num + - svq->ring_id_maps[used_elem.id]->out_num; + elem =3D svq->ring_id_maps[used_elem.id]; + num =3D elem->elem.in_num + elem->elem.out_num; last_used_chain =3D vhost_svq_last_desc_of_chain(svq, num, used_elem.i= d); svq->desc_next[last_used_chain] =3D svq->free_head; svq->free_head =3D used_elem.id; @@ -439,8 +441,8 @@ static void vhost_svq_flush(VhostShadowVirtqueue *svq, vhost_svq_disable_notification(svq); while (true) { uint32_t len; - g_autofree VirtQueueElement *elem =3D vhost_svq_get_buf(svq, &= len); - if (!elem) { + g_autofree SVQElement *svq_elem =3D vhost_svq_get_buf(svq, &le= n); + if (!svq_elem) { break; } =20 @@ -448,11 +450,11 @@ static void vhost_svq_flush(VhostShadowVirtqueue *svq, qemu_log_mask(LOG_GUEST_ERROR, "More than %u used buffers obtained in a %u size = SVQ", i, svq->vring.num); - virtqueue_fill(vq, elem, len, i); + virtqueue_fill(vq, &svq_elem->elem, len, i); virtqueue_flush(vq, i); return; } - virtqueue_fill(vq, elem, len, i++); + virtqueue_fill(vq, &svq_elem->elem, len, i++); } =20 virtqueue_flush(vq, i); @@ -594,7 +596,7 @@ void vhost_svq_start(VhostShadowVirtqueue *svq, VirtIOD= evice *vdev, memset(svq->vring.desc, 0, driver_size); svq->vring.used =3D qemu_memalign(qemu_real_host_page_size(), device_s= ize); memset(svq->vring.used, 0, device_size); - svq->ring_id_maps =3D g_new0(VirtQueueElement *, svq->vring.num); + svq->ring_id_maps =3D g_new0(SVQElement *, svq->vring.num); svq->desc_next =3D g_new0(uint16_t, svq->vring.num); for (unsigned i =3D 0; i < svq->vring.num - 1; i++) { svq->desc_next[i] =3D cpu_to_le16(i + 1); --=20 2.31.1