From nobody Sat Apr 11 23:08:08 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772645815; cv=none; d=zohomail.com; s=zohoarc; b=HmoiAb4aGRG7k08erdTwKK+2Qy7c+6OEr2gPJFD1aa9D9B6Cn+UkAs7xfF7WEq6b+pmbFkbPe8djnOj2KyjrPhHaKcHPvGDBLP3GSVfbv66bSgax23ZFMHbGjHXExkZE+v7GptV0aIPC0TLUwJny1dFikNroquz+P1cSlMxjYOI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772645815; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=CH5QCvElWuMKlv3q8MrRwa9vvlKsZCp58YnKNPAF+ZU=; b=PKndcWxWzdj5fQyqRTMMYpsIxJGqTGcA9uBHf7cl+mCp9ucVICCHT/bb1qpx7xv79k7DHlfRgnrZ/2KmiN+23cihKlBa/L5sK70ch9FWaZClFiKX7PHTiHGNh/Flo0x7o5+kyq28/aLK7IFf/EXqfB6JObrP97Ng7I9gE1+Gnos= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772645815521577.8611765196408; Wed, 4 Mar 2026 09:36:55 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxq90-0003MU-Fa; Wed, 04 Mar 2026 12:36:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vxq8n-0003De-P0 for qemu-devel@nongnu.org; Wed, 04 Mar 2026 12:36:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vxq8l-0004uk-Ho for qemu-devel@nongnu.org; Wed, 04 Mar 2026 12:36:09 -0500 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-553--pSsULqLMf2bfkhrxF4vdg-1; Wed, 04 Mar 2026 12:36:05 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5BACD18005B4; Wed, 4 Mar 2026 17:36:04 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.224.212]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6C70D1958DC5; Wed, 4 Mar 2026 17:36:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772645766; 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=CH5QCvElWuMKlv3q8MrRwa9vvlKsZCp58YnKNPAF+ZU=; b=JQ14q7HPvBIpwqcCC5B9rufPvQXLUcXhxs18Mn2nqnk2L4OLT2T80uiYfo5XFZFIJv0F62 hlBQdbZsSVB2rV78t3Cblkx8iUdh/Sw8d4F7+jUVDLkwvi1FENKW/5Nc5kF3IJjI28F/rN QzVQDwRtmKWYHLWaE/lP2PMNnK1URRE= X-MC-Unique: -pSsULqLMf2bfkhrxF4vdg-1 X-Mimecast-MFC-AGG-ID: -pSsULqLMf2bfkhrxF4vdg_1772645764 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Jason Wang , Dragos Tatulea DE , Jonah Palmer , "Michael S. Tsirkin" , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Lei Yang , Koushik Dutta , Stefano Garzarella , qemu-stable@nongnu.org, Cindy Lu , Maxime Coquelin Subject: [PATCH 5/7] vhost: factor out the detach buf logic in SVQ Date: Wed, 4 Mar 2026 18:35:33 +0100 Message-ID: <20260304173535.2702587-6-eperezma@redhat.com> In-Reply-To: <20260304173535.2702587-1-eperezma@redhat.com> References: <20260304173535.2702587-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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: 0 X-Spam_score: -0.0 X-Spam_bar: / X-Spam_report: (-0.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772645818710158500 This code path is modified to handle in order devices. Abstract here so we can generalize on the caller. Signed-off-by: Eugenio P=C3=A9rez --- hw/virtio/vhost-shadow-virtqueue.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/hw/virtio/vhost-shadow-virtqueue.c b/hw/virtio/vhost-shadow-vi= rtqueue.c index e7e3c9155cd0..2d8fc82cc06f 100644 --- a/hw/virtio/vhost-shadow-virtqueue.c +++ b/hw/virtio/vhost-shadow-virtqueue.c @@ -473,11 +473,24 @@ static uint16_t vhost_svq_last_desc_of_chain(const Vh= ostShadowVirtqueue *svq, return i; } =20 +G_GNUC_WARN_UNUSED_RESULT +static VirtQueueElement *vhost_svq_detach_buf(VhostShadowVirtqueue *svq, + uint16_t id) +{ + uint16_t num =3D svq->desc_state[id].ndescs; + uint16_t last_used_chain =3D vhost_svq_last_desc_of_chain(svq, num, id= ); + + svq->desc_state[last_used_chain].next =3D svq->free_head; + svq->free_head =3D id; + + return g_steal_pointer(&svq->desc_state[id].elem); +} + G_GNUC_WARN_UNUSED_RESULT static VirtQueueElement *vhost_svq_get_buf(VhostShadowVirtqueue *svq, uint32_t *len) { - uint16_t last_used, last_used_chain, num; + uint16_t last_used; =20 if (!vhost_svq_more_used(svq)) { return NULL; @@ -500,14 +513,9 @@ static VirtQueueElement *vhost_svq_get_buf(VhostShadow= Virtqueue *svq, return NULL; } =20 - num =3D svq->desc_state[last_used].ndescs; + svq->num_free +=3D svq->desc_state[last_used].ndescs; svq->desc_state[last_used].ndescs =3D 0; - last_used_chain =3D vhost_svq_last_desc_of_chain(svq, num, last_used); - svq->desc_state[last_used_chain].next =3D svq->free_head; - svq->free_head =3D last_used; - svq->num_free +=3D num; - - return g_steal_pointer(&svq->desc_state[last_used].elem); + return vhost_svq_detach_buf(svq, last_used); } =20 /** --=20 2.53.0