From nobody Mon Feb 9 07:22:56 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=1659463776; cv=none; d=zohomail.com; s=zohoarc; b=ZoheAhcDbWqDA/Iaeuc83ViLuwhKXFwcDnkuNDKh82/SuNwf+kklz3EXvmEe8b6VRST3o8yfYN+WGivOTOiRXQ7NjJzZyc8kr8wbIYwBynnq3yAWa5vLttgaemUR0vXCLOjfNf4WguW7dKhNGArxo4Fb7Isc+n+yKq3WxZ5u9Ps= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659463776; 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=OsCSTTnWlEBOYdl6G8Z7JvD5ZH5EWFYrxQxq3Q3qHIw=; b=fBhXjuX8+8uwgaFdSxbcEOS3dSzZHHaGq9TM50dRsfMS6bwnBpcGleS9s4CV4/ijgdnM7lvqfBaDalnpHlykR41H0miIq0L47upw4ezqmHnk8KA90Jp15Nep2uBIQpuK23blTjJjUxrAvfihIgkH99Mr4yJnBfjdSJNbqSEs8Lo= 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 1659463776634156.25936670641624; Tue, 2 Aug 2022 11:09:36 -0700 (PDT) Received: from localhost ([::1]:53864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oIwKl-0000DB-CX for importer@patchew.org; Tue, 02 Aug 2022 14:09:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oIw9V-0001MW-Pu for qemu-devel@nongnu.org; Tue, 02 Aug 2022 13:57:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:59734) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oIw9U-0003gT-09 for qemu-devel@nongnu.org; Tue, 02 Aug 2022 13:57:57 -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-531-PFPT8DZyPTqInGYdnuUkIw-1; Tue, 02 Aug 2022 13:57:51 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 16B788037AC; Tue, 2 Aug 2022 17:57:51 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E45E492C3B; Tue, 2 Aug 2022 17:57:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659463075; 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=OsCSTTnWlEBOYdl6G8Z7JvD5ZH5EWFYrxQxq3Q3qHIw=; b=eiNM3hHFO4FrRBBKk6wFfvn5XKPBWHlDBkRPuqHe6sdCUui39NYQJc2ofYZ9I0ZyOp7PwA Zc2VjhION7Cndx/pVIbwdV0p2E3huoBCGh9UXSq7BsqdDgEN98SgRlm9QJObhzbd87W6zX GuniEb6PgNiVP3sAHG0/Elz+obMY1CM= X-MC-Unique: PFPT8DZyPTqInGYdnuUkIw-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Eli Cohen , Stefano Garzarella , Parav Pandit , Markus Armbruster , Gautam Dawar , Stefan Hajnoczi , Harpreet Singh Anand , "Gonglei (Arei)" , Paolo Bonzini , Eric Blake , "Michael S. Tsirkin" , Laurent Vivier , Cornelia Huck , Cindy Lu , Jason Wang , Liuxiangdong , Zhu Lingshan Subject: [PATCH v5 05/10] vdpa: Extract vhost_vdpa_net_cvq_add from vhost_vdpa_net_handle_ctrl_avail Date: Tue, 2 Aug 2022 19:57:26 +0200 Message-Id: <20220802175731.312115-6-eperezma@redhat.com> In-Reply-To: <20220802175731.312115-1-eperezma@redhat.com> References: <20220802175731.312115-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.9 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: 1659463778723100001 So we can reuse it to inject state messages. Signed-off-by: Eugenio P=C3=A9rez -- v5: * Do not use an artificial !NULL VirtQueueElement * Use only out size instead of iovec dev_buffers for these functions. --- net/vhost-vdpa.c | 73 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 49 insertions(+), 24 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index c6699edfbc..33bf3d6409 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -329,6 +329,52 @@ static bool vhost_vdpa_net_cvq_map_elem(VhostVDPAState= *s, return true; } =20 +static virtio_net_ctrl_ack vhost_vdpa_net_cvq_add(VhostVDPAState *s, + size_t out_len) +{ + /* Buffers for the device */ + const struct iovec out =3D { + .iov_base =3D s->cvq_cmd_out_buffer, + .iov_len =3D out_len, + }; + const struct iovec in =3D { + .iov_base =3D s->cvq_cmd_in_buffer, + .iov_len =3D sizeof(virtio_net_ctrl_ack), + }; + VhostShadowVirtqueue *svq =3D g_ptr_array_index(s->vhost_vdpa.shadow_v= qs, 0); + /* in buffer used for device model */ + virtio_net_ctrl_ack status; + size_t dev_written; + int r; + + r =3D vhost_svq_add(svq, &out, 1, &in, 1, NULL); + if (unlikely(r !=3D 0)) { + if (unlikely(r =3D=3D -ENOSPC)) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: No space on device queue\n= ", + __func__); + } + return VIRTIO_NET_ERR; + } + + /* + * We can poll here since we've had BQL from the time we sent the + * descriptor. Also, we need to take the answer before SVQ pulls by it= self, + * when BQL is released + */ + dev_written =3D vhost_svq_poll(svq); + if (unlikely(dev_written < sizeof(status))) { + error_report("Insufficient written data (%zu)", dev_written); + return VIRTIO_NET_ERR; + } + + memcpy(&status, s->cvq_cmd_in_buffer, sizeof(status)); + if (status !=3D VIRTIO_NET_OK) { + return VIRTIO_NET_ERR; + } + + return VIRTIO_NET_OK; +} + /** * Do not forward commands not supported by SVQ. Otherwise, the device cou= ld * accept it and qemu would not know how to update the device model. @@ -375,7 +421,7 @@ static int vhost_vdpa_net_handle_ctrl_avail(VhostShadow= Virtqueue *svq, void *opaque) { VhostVDPAState *s =3D opaque; - size_t in_len, dev_written; + size_t in_len; virtio_net_ctrl_ack status =3D VIRTIO_NET_ERR; /* out and in buffers sent to the device */ struct iovec dev_buffers[2] =3D { @@ -387,7 +433,6 @@ static int vhost_vdpa_net_handle_ctrl_avail(VhostShadow= Virtqueue *svq, .iov_base =3D &status, .iov_len =3D sizeof(status), }; - int r =3D -EINVAL; bool ok; =20 ok =3D vhost_vdpa_net_cvq_map_elem(s, elem, &dev_buffers[0].iov_len); @@ -400,27 +445,7 @@ static int vhost_vdpa_net_handle_ctrl_avail(VhostShado= wVirtqueue *svq, goto out; } =20 - r =3D vhost_svq_add(svq, &dev_buffers[0], 1, &dev_buffers[1], 1, elem); - if (unlikely(r !=3D 0)) { - if (unlikely(r =3D=3D -ENOSPC)) { - qemu_log_mask(LOG_GUEST_ERROR, "%s: No space on device queue\n= ", - __func__); - } - goto out; - } - - /* - * We can poll here since we've had BQL from the time we sent the - * descriptor. Also, we need to take the answer before SVQ pulls by it= self, - * when BQL is released - */ - dev_written =3D vhost_svq_poll(svq); - if (unlikely(dev_written < sizeof(status))) { - error_report("Insufficient written data (%zu)", dev_written); - goto out; - } - - memcpy(&status, dev_buffers[1].iov_base, sizeof(status)); + status =3D vhost_vdpa_net_cvq_add(s, dev_buffers[0].iov_len); if (status !=3D VIRTIO_NET_OK) { goto out; } @@ -445,7 +470,7 @@ out: if (dev_buffers[1].iov_base) { vhost_vdpa_cvq_unmap_buf(&s->vhost_vdpa, dev_buffers[1].iov_base); } - return r; + return 0; } =20 static const VhostShadowVirtqueueOps vhost_vdpa_net_svq_ops =3D { --=20 2.31.1