From nobody Mon Feb 9 09:33:53 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=1657906445; cv=none; d=zohomail.com; s=zohoarc; b=CHfK190RjE9ZeZ2mzewtJl9LoYd2qfd0veKU/8VT/1Bx5RznR1vEwKUz0qPl5qda5+59VNIgciFPhowYDwUUp64tnqYSgHK6jiMuqD8KqfjlmkmXZwgBIz6q/xWVwKK/Ez61NJwVxUU23ZU25sd31XDgYzAtTXdnswauHuQSTnU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657906445; 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=Tq5ZOp4oFPUNGw/PfAIhXLL0S4qhqlNmbps1kNQIPjM=; b=VI/GAOvCg0ixF2mkYZRs4VUc/q6OkpYB03cjPk1jN3eNaCNf1/sPLI7i0qbvmfwV5JojJxJnyrqT2vVZlDrFRn17o6OVkaVthKwT5pePfJWmrZVBce85SBoIQevegE/4l8PSMh55HdB8UUfuT39k4oboUymuymWqLZx2ZEAy5OU= 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 1657906445661253.75880139736694; Fri, 15 Jul 2022 10:34:05 -0700 (PDT) Received: from localhost ([::1]:52772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oCPCV-00074z-Fo for importer@patchew.org; Fri, 15 Jul 2022 13:34:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46238) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oCOyE-0005O7-EU for qemu-devel@nongnu.org; Fri, 15 Jul 2022 13:19:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:41846) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oCOyB-0005tG-Lw for qemu-devel@nongnu.org; Fri, 15 Jul 2022 13:19: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-418--UcohZjENZqKwt-evFvN-g-1; Fri, 15 Jul 2022 13:19:05 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 69869101A589; Fri, 15 Jul 2022 17:19:05 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.71]) by smtp.corp.redhat.com (Postfix) with ESMTP id 77F0140E8B06; Fri, 15 Jul 2022 17:19:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657905555; 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=Tq5ZOp4oFPUNGw/PfAIhXLL0S4qhqlNmbps1kNQIPjM=; b=Ch0LnfcUAmLa3O5E27tj+wnWQcYcoI1nJiEi/p3suaARZB3eJBxIx07Os+1+70NVig4cHR +0sw1YVxOlcaWWA0v1t0+Ek/UVaRRrZKbToi5+5jzmQ9lqpVBp3AbDcUKq6XlBK6y371E/ E+bEP+VNb0r3hzid9ZNdXc331MaGHwM= X-MC-Unique: -UcohZjENZqKwt-evFvN-g-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Cornelia Huck , "Gonglei (Arei)" , Stefano Garzarella , Eli Cohen , "Michael S. Tsirkin" , Jason Wang , Stefan Hajnoczi , Cindy Lu , Zhu Lingshan , Parav Pandit , Markus Armbruster , Liuxiangdong , Laurent Vivier , Gautam Dawar , Eric Blake , Harpreet Singh Anand , Paolo Bonzini Subject: [PATCH v3 08/19] vhost: Add SVQDescState Date: Fri, 15 Jul 2022 19:18:23 +0200 Message-Id: <20220715171834.2666455-9-eperezma@redhat.com> In-Reply-To: <20220715171834.2666455-1-eperezma@redhat.com> References: <20220715171834.2666455-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.84 on 10.11.54.2 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.133.124; envelope-from=eperezma@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 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_NONE=-0.0001, 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: 1657906447261100001 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 | 16 ++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/hw/virtio/vhost-shadow-virtqueue.h b/hw/virtio/vhost-shadow-vi= rtqueue.h index c132c994e9..d646c35054 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 SVQDescState { + VirtQueueElement *elem; +} SVQDescState; + /* Shadow virtqueue to relay notifications */ typedef struct VhostShadowVirtqueue { /* Shadow vring */ @@ -47,8 +51,8 @@ typedef struct VhostShadowVirtqueue { /* IOVA mapping */ VhostIOVATree *iova_tree; =20 - /* Map for use the guest's descriptors */ - VirtQueueElement **ring_id_maps; + /* SVQ vring descriptors state */ + SVQDescState *desc_state; =20 /* Next VirtQueue element that guest made available */ VirtQueueElement *next_guest_avail_elem; diff --git a/hw/virtio/vhost-shadow-virtqueue.c b/hw/virtio/vhost-shadow-vi= rtqueue.c index b005a457c6..d12f5afffb 100644 --- a/hw/virtio/vhost-shadow-virtqueue.c +++ b/hw/virtio/vhost-shadow-virtqueue.c @@ -256,7 +256,7 @@ static int vhost_svq_add(VhostShadowVirtqueue *svq, con= st struct iovec *out_sg, return -EINVAL; } =20 - svq->ring_id_maps[qemu_head] =3D elem; + svq->desc_state[qemu_head].elem =3D elem; vhost_svq_kick(svq); return 0; } @@ -410,21 +410,21 @@ static VirtQueueElement *vhost_svq_get_buf(VhostShado= wVirtqueue *svq, return NULL; } =20 - if (unlikely(!svq->ring_id_maps[used_elem.id])) { + if (unlikely(!svq->desc_state[used_elem.id].elem)) { qemu_log_mask(LOG_GUEST_ERROR, "Device %s says index %u is used, but it was not available", svq->vdev->name, used_elem.id); return NULL; } =20 - num =3D svq->ring_id_maps[used_elem.id]->in_num + - svq->ring_id_maps[used_elem.id]->out_num; + num =3D svq->desc_state[used_elem.id].elem->in_num + + svq->desc_state[used_elem.id].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; =20 *len =3D used_elem.len; - return g_steal_pointer(&svq->ring_id_maps[used_elem.id]); + return g_steal_pointer(&svq->desc_state[used_elem.id].elem); } =20 static void vhost_svq_flush(VhostShadowVirtqueue *svq, @@ -594,7 +594,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->desc_state =3D g_new0(SVQDescState, 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); @@ -619,7 +619,7 @@ void vhost_svq_stop(VhostShadowVirtqueue *svq) =20 for (unsigned i =3D 0; i < svq->vring.num; ++i) { g_autofree VirtQueueElement *elem =3D NULL; - elem =3D g_steal_pointer(&svq->ring_id_maps[i]); + elem =3D g_steal_pointer(&svq->desc_state[i].elem); if (elem) { virtqueue_detach_element(svq->vq, elem, 0); } @@ -631,7 +631,7 @@ void vhost_svq_stop(VhostShadowVirtqueue *svq) } svq->vq =3D NULL; g_free(svq->desc_next); - g_free(svq->ring_id_maps); + g_free(svq->desc_state); qemu_vfree(svq->vring.desc); qemu_vfree(svq->vring.used); } --=20 2.31.1