From nobody Mon Feb 9 06:34:23 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=1659463174; cv=none; d=zohomail.com; s=zohoarc; b=I25SCd3Lav8/qKysaDjs7lpwVz1NgGdg/R1l6pUNOZg34zRMzan/Dg6HWvmERn0J6WMgisSOKiKXHHD4F2GfiCw/ReSf8WWFj0kPwogv/OLr/dmfQIeY7WMzdTL51Faic7TfEB6LjFlnkncE6y2BCWvrH363ps+1SNfHgw/ZQhY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659463174; 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=llogMxhLwS4wPcct3O3yVcIdtEGtdPdorDjYbZBJ6UM=; b=bFmMgh1keK/UbSInXOev4V1VDzCCD4N5vNTLMWJCTBehcOX7t30ZEWFjH4//kQiM+QPghgrHqqMle+CjqjL80rzyqAewaYrqOMdwGYlWDeqnrLIJFgi+ZEzAkBZLRFCpIfq7gW1T/ICF5xzJrD2R585F/DHDfHPlPvOzsOMpP98= 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 1659463174032736.2344274156037; Tue, 2 Aug 2022 10:59:34 -0700 (PDT) Received: from localhost ([::1]:35544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oIwB2-0003jO-Rd for importer@patchew.org; Tue, 02 Aug 2022 13:59:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oIw9R-00016x-3z for qemu-devel@nongnu.org; Tue, 02 Aug 2022 13:57:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:52509) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oIw9O-0003dK-Ix for qemu-devel@nongnu.org; Tue, 02 Aug 2022 13:57:51 -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-281-rKb6Lx-dNfm6Fp3RxEB-xA-1; Tue, 02 Aug 2022 13:57:48 -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 0F1A9801231; Tue, 2 Aug 2022 17:57:48 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4942C492C3B; Tue, 2 Aug 2022 17:57:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659463070; 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=llogMxhLwS4wPcct3O3yVcIdtEGtdPdorDjYbZBJ6UM=; b=a3kFadW6bRge1+miMLPFg2h+MxLUnnB+lK2FqSF27AqXxFhqkOuK2hfW6MkzPkGUBzJIrb xcSBDX6QyosUqAe517jm7as+b0Iv1E+Ff3jTienz08lrp0+bRNW3oz3O6ahKz3ZP9b/HbO BPfSnEB76I0qC6jdMLqDtXdFFzhbAyw= X-MC-Unique: rKb6Lx-dNfm6Fp3RxEB-xA-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 04/10] vdpa: Get buffers from VhostVDPAState on vhost_vdpa_net_cvq_map_elem Date: Tue, 2 Aug 2022 19:57:25 +0200 Message-Id: <20220802175731.312115-5-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: 1659463174527100001 There is no need to get them by parameter, since they're contained in VhostVDPAState. The only useful information was the written length in out. Simplify the function removing those. Signed-off-by: Eugenio P=C3=A9rez --- net/vhost-vdpa.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index ac1810723c..c6699edfbc 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -303,34 +303,29 @@ dma_map_err: =20 /** * Copy the guest element into a dedicated buffer suitable to be sent to N= IC - * - * @iov: [0] is the out buffer, [1] is the in one */ static bool vhost_vdpa_net_cvq_map_elem(VhostVDPAState *s, VirtQueueElement *elem, - struct iovec *iov) + size_t *out_len) { size_t in_copied; bool ok; =20 - iov[0].iov_base =3D s->cvq_cmd_out_buffer; ok =3D vhost_vdpa_cvq_map_buf(&s->vhost_vdpa, elem->out_sg, elem->out_= num, - vhost_vdpa_net_cvq_cmd_len(), iov[0].iov_b= ase, - &iov[0].iov_len, false); + vhost_vdpa_net_cvq_cmd_len(), + s->cvq_cmd_out_buffer, out_len, false); if (unlikely(!ok)) { return false; } =20 - iov[1].iov_base =3D s->cvq_cmd_in_buffer; ok =3D vhost_vdpa_cvq_map_buf(&s->vhost_vdpa, NULL, 0, - sizeof(virtio_net_ctrl_ack), iov[1].iov_ba= se, - &in_copied, true); + sizeof(virtio_net_ctrl_ack), + s->cvq_cmd_in_buffer, &in_copied, true); if (unlikely(!ok)) { vhost_vdpa_cvq_unmap_buf(&s->vhost_vdpa, s->cvq_cmd_out_buffer); return false; } =20 - iov[1].iov_len =3D sizeof(virtio_net_ctrl_ack); return true; } =20 @@ -395,7 +390,7 @@ static int vhost_vdpa_net_handle_ctrl_avail(VhostShadow= Virtqueue *svq, int r =3D -EINVAL; bool ok; =20 - ok =3D vhost_vdpa_net_cvq_map_elem(s, elem, dev_buffers); + ok =3D vhost_vdpa_net_cvq_map_elem(s, elem, &dev_buffers[0].iov_len); if (unlikely(!ok)) { goto out; } --=20 2.31.1