From nobody Mon Feb 9 23:39:02 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=1658225763; cv=none; d=zohomail.com; s=zohoarc; b=n8OuJ/IBmO1LgBPDmmIq0gCO/4CkZW3vf+mCvHkjTZDino2Fsni6nyb+bZg6Gj0AG1eK9cgzjhX3HtdDdtHMRmFeQUEXpPAVxPt8Uitfy2wG8ai0T6K7TI+XZ3BsA5nk1XSGr+IYFzSIFZNpZaaJTL5JtXZvCa0PRmxYneJR+i0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658225763; 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=4H+U8wSNcX4JZbeeKzhQcCq+VvtHuoOrUr7FSQWW5rA=; b=JwRm4QIKguFgHD4Qx6OtiQAdb50AQUhtjEjprZ6nNovUxH/Xd4X/Qg0VqjsbBz5Ruoux/YF0xqQJD1dxtDICQC+kompoN1Xgt2QZhSzZOjOWtYe+PE3PUACZ42+LRQ4CVPzOk/ojnEaBxi5sSvCRuogUPQFXMK8yogobcgko3EY= 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 1658225763399104.47187096868151; Tue, 19 Jul 2022 03:16:03 -0700 (PDT) Received: from localhost ([::1]:34160 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDkGo-0005ex-8U for importer@patchew.org; Tue, 19 Jul 2022 06:16:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDjym-00008o-DI for qemu-devel@nongnu.org; Tue, 19 Jul 2022 05:57:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:32623) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDjyk-00059S-Ql for qemu-devel@nongnu.org; Tue, 19 Jul 2022 05:57:24 -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-20-kH2T91uQPPafsl-qpwMjKw-1; Tue, 19 Jul 2022 05:57:06 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2FBA6101AA48; Tue, 19 Jul 2022 09:57:06 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.113]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4FDA218EA8; Tue, 19 Jul 2022 09:57:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658224642; 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=4H+U8wSNcX4JZbeeKzhQcCq+VvtHuoOrUr7FSQWW5rA=; b=Me5tMIgm4Fdq2rwkeuCojejETd+BxNvMsFIvnapVWzrTz43AbMupv4+4oYeiaL/7aCIJa7 c++sJia/aspVr7HUG9ZGJNeaHpm6e43xtPfzixLOwtLIC3ajw9rYfJ/FgwMtYX7YkHJFYM U1RPKGfZ89C6G6x8GW1BZZ0yvMKtBhM= X-MC-Unique: kH2T91uQPPafsl-qpwMjKw-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Gautam Dawar , Liuxiangdong , Paolo Bonzini , Markus Armbruster , Jason Wang , Cornelia Huck , Parav Pandit , Eric Blake , "Michael S. Tsirkin" , Laurent Vivier , Zhu Lingshan , Eli Cohen , Cindy Lu , "Gonglei (Arei)" , Stefano Garzarella , Harpreet Singh Anand Subject: [PATCH v5 10/20] vhost: Track number of descs in SVQDescState Date: Tue, 19 Jul 2022 11:56:19 +0200 Message-Id: <20220719095629.3031338-11-eperezma@redhat.com> In-Reply-To: <20220719095629.3031338-1-eperezma@redhat.com> References: <20220719095629.3031338-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.79 on 10.11.54.5 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: 1658225765214100003 A guest's buffer continuos on GPA may need multiple descriptors on qemu's VA, so SVQ should track its length sepparatedly. Signed-off-by: Eugenio P=C3=A9rez --- hw/virtio/vhost-shadow-virtqueue.h | 6 ++++++ hw/virtio/vhost-shadow-virtqueue.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/virtio/vhost-shadow-virtqueue.h b/hw/virtio/vhost-shadow-vi= rtqueue.h index d646c35054..5c7e7cbab6 100644 --- a/hw/virtio/vhost-shadow-virtqueue.h +++ b/hw/virtio/vhost-shadow-virtqueue.h @@ -17,6 +17,12 @@ =20 typedef struct SVQDescState { VirtQueueElement *elem; + + /* + * Number of descriptors exposed to the device. May or may not match + * guest's + */ + unsigned int ndescs; } SVQDescState; =20 /* Shadow virtqueue to relay notifications */ diff --git a/hw/virtio/vhost-shadow-virtqueue.c b/hw/virtio/vhost-shadow-vi= rtqueue.c index e4c09e2d88..8314405e01 100644 --- a/hw/virtio/vhost-shadow-virtqueue.c +++ b/hw/virtio/vhost-shadow-virtqueue.c @@ -257,6 +257,7 @@ static int vhost_svq_add(VhostShadowVirtqueue *svq, con= st struct iovec *out_sg, } =20 svq->desc_state[qemu_head].elem =3D elem; + svq->desc_state[qemu_head].ndescs =3D ndescs; vhost_svq_kick(svq); return 0; } @@ -418,8 +419,7 @@ static VirtQueueElement *vhost_svq_get_buf(VhostShadowV= irtqueue *svq, return NULL; } =20 - num =3D svq->desc_state[used_elem.id].elem->in_num + - svq->desc_state[used_elem.id].elem->out_num; + num =3D svq->desc_state[used_elem.id].ndescs; 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 2.31.1