From nobody Mon Feb 9 21:36:55 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=1657133209; cv=none; d=zohomail.com; s=zohoarc; b=lO/GTfWP+e3thoVSCnTQVdCLqpIp+8yXNDTzl2UlO0lyHGufNxQqmi54HRLkPSABRTR6aYzMIYo6FHjj3ber/NnJNH9CttcsD40MUg8MDfCz1/VmMSf+R0N3sT4i2L0t7HPMh+IvXLrzvVVsSxRmaHbSh5naR1SKxiAdOZJlaSI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657133209; 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=8v0tmzPobnEi4Wx4h6QV+k89ZEL0PYdAdrE9PK3ftP4=; b=TpRGYRZKsjK9hVx+FG9qSRIuunijB2ZkdGGEUOt4wmOWg3io2bBmepiif2SDbpjclmA12RoVkQZhajaqVEMfDN2EVJSNSrfOYTLn2GiIhhuAND5j3pIiY4b9cEiRXQb8qFzMnBO7GwaKKd13IFfu8PJl9ObjfsKZthUOA7sp1ms= 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 1657133209447226.5290609528679; Wed, 6 Jul 2022 11:46:49 -0700 (PDT) Received: from localhost ([::1]:50912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9A2x-0001WQ-NI for importer@patchew.org; Wed, 06 Jul 2022 14:46:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44614) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o99xA-0005DR-6s for qemu-devel@nongnu.org; Wed, 06 Jul 2022 14:40:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:60587) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o99x4-0000pv-9P for qemu-devel@nongnu.org; Wed, 06 Jul 2022 14:40:47 -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-349-FpkiOjocMwyFlupx64TZmg-1; Wed, 06 Jul 2022 14:40:37 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C4956805B9A; Wed, 6 Jul 2022 18:40:36 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.119]) by smtp.corp.redhat.com (Postfix) with ESMTP id 737B71415116; Wed, 6 Jul 2022 18:40:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657132840; 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=8v0tmzPobnEi4Wx4h6QV+k89ZEL0PYdAdrE9PK3ftP4=; b=O35PJlnBpUj60uDRu2wJPc2l+CW3Kqd5z3ahNEXFe5Um9gDMb8J3fEAkyzZPDDNQdaZ28V BgVEUInKhulq9YCdgFEQrBl1QQl7LanUKWuG4C3LcB3lGbCbTYA4ABa+dDKQKipAekyT5L nzA3rvYdtr3b0OBR2DCSNgjftPHNLRI= X-MC-Unique: FpkiOjocMwyFlupx64TZmg-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Liuxiangdong , Markus Armbruster , Harpreet Singh Anand , Eric Blake , Laurent Vivier , Parav Pandit , Cornelia Huck , Paolo Bonzini , Gautam Dawar , Eli Cohen , "Gonglei (Arei)" , Zhu Lingshan , "Michael S. Tsirkin" , Cindy Lu , Jason Wang Subject: [RFC PATCH v9 08/23] vhost: Decouple vhost_svq_add_split from VirtQueueElement Date: Wed, 6 Jul 2022 20:39:53 +0200 Message-Id: <20220706184008.1649478-9-eperezma@redhat.com> In-Reply-To: <20220706184008.1649478-1-eperezma@redhat.com> References: <20220706184008.1649478-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.85 on 10.11.54.7 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: 1657133210642100001 VirtQueueElement comes from the guest, but we're heading SVQ to be able to inject element without the guest's knowledge. To do so, make this accept sg buffers directly, instead of using VirtQueueElement. Add vhost_svq_add_element to maintain element convenience Signed-off-by: Eugenio P=C3=A9rez --- hw/virtio/vhost-shadow-virtqueue.c | 38 +++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/hw/virtio/vhost-shadow-virtqueue.c b/hw/virtio/vhost-shadow-vi= rtqueue.c index 2fc5789b73..46d3c1d74f 100644 --- a/hw/virtio/vhost-shadow-virtqueue.c +++ b/hw/virtio/vhost-shadow-virtqueue.c @@ -172,30 +172,32 @@ static bool vhost_svq_vring_write_descs(VhostShadowVi= rtqueue *svq, hwaddr *sg, } =20 static bool vhost_svq_add_split(VhostShadowVirtqueue *svq, - VirtQueueElement *elem, unsigned *head) + const struct iovec *out_sg, size_t out_num, + const struct iovec *in_sg, size_t in_num, + unsigned *head) { unsigned avail_idx; vring_avail_t *avail =3D svq->vring.avail; bool ok; - g_autofree hwaddr *sgs =3D g_new(hwaddr, MAX(elem->out_num, elem->in_n= um)); + g_autofree hwaddr *sgs =3D NULL; =20 *head =3D svq->free_head; =20 /* We need some descriptors here */ - if (unlikely(!elem->out_num && !elem->in_num)) { + if (unlikely(!out_num && !in_num)) { qemu_log_mask(LOG_GUEST_ERROR, "Guest provided element with no descriptors"); return false; } =20 - ok =3D vhost_svq_vring_write_descs(svq, sgs, elem->out_sg, elem->out_n= um, - elem->in_num > 0, false); + sgs =3D g_new(hwaddr, MAX(out_num, in_num)); + ok =3D vhost_svq_vring_write_descs(svq, sgs, out_sg, out_num, in_num >= 0, + false); if (unlikely(!ok)) { return false; } =20 - ok =3D vhost_svq_vring_write_descs(svq, sgs, elem->in_sg, elem->in_num= , false, - true); + ok =3D vhost_svq_vring_write_descs(svq, sgs, in_sg, in_num, false, tru= e); if (unlikely(!ok)) { /* TODO unwind out_sg */ return false; @@ -223,10 +225,13 @@ static bool vhost_svq_add_split(VhostShadowVirtqueue = *svq, * takes ownership of the element: In case of failure, it is free and the = SVQ * is considered broken. */ -static bool vhost_svq_add(VhostShadowVirtqueue *svq, VirtQueueElement *ele= m) +static bool vhost_svq_add(VhostShadowVirtqueue *svq, const struct iovec *o= ut_sg, + size_t out_num, const struct iovec *in_sg, + size_t in_num, VirtQueueElement *elem) { unsigned qemu_head; - bool ok =3D vhost_svq_add_split(svq, elem, &qemu_head); + bool ok =3D vhost_svq_add_split(svq, out_sg, out_num, in_sg, in_num, + &qemu_head); if (unlikely(!ok)) { g_free(elem); return false; @@ -250,6 +255,18 @@ static void vhost_svq_kick(VhostShadowVirtqueue *svq) event_notifier_set(&svq->hdev_kick); } =20 +static bool vhost_svq_add_element(VhostShadowVirtqueue *svq, + VirtQueueElement *elem) +{ + bool ok =3D vhost_svq_add(svq, elem->out_sg, elem->out_num, elem->in_s= g, + elem->in_num, elem); + if (ok) { + vhost_svq_kick(svq); + } + + return ok; +} + /** * Forward available buffers. * @@ -302,12 +319,11 @@ static void vhost_handle_guest_kick(VhostShadowVirtqu= eue *svq) return; } =20 - ok =3D vhost_svq_add(svq, elem); + ok =3D vhost_svq_add_element(svq, g_steal_pointer(&elem)); if (unlikely(!ok)) { /* VQ is broken, just return and ignore any other kicks */ return; } - vhost_svq_kick(svq); } =20 virtio_queue_set_notification(svq->vq, true); --=20 2.31.1