From nobody Mon Feb 9 10:29:54 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=1658151329; cv=none; d=zohomail.com; s=zohoarc; b=InnKJB1PpmlB/YyYftZ0+F5bGAkFkbvKDR02XAX0lbaUkc2YDImKEJI40qBawLe5zdF40CgPMIO7JluD4YskiRvWJKO7FxCNQi6Tb3fw2eyhmHZ5D6YC+VNMkrfLlnTpl/wuTghkWH7zQaIzdOOjypxQC4h4N9O5sjyXCTYv8G0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658151329; 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=ryBjW7wwJ2lyg4XACQ3EZHs29EK9/HavUG+ow8PFrqU=; b=Uhe+bi0FiMVHs2LHVAmkFCkyGfWkIpTZDsBLHovwNj6pxX1Jp4c2I1niDr0zHTJMQYbbbh0FmR+sdkouopMHUT9c53UMlO6/XRLRKZMBWAYzX/00s4N3FP2Ru6wwzku/UUH/t09nvwIsTNXK4iDo62G2J2dkOckpYFMQTl4cg74= 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 1658151329892653.2810872734258; Mon, 18 Jul 2022 06:35:29 -0700 (PDT) Received: from localhost ([::1]:54046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDQuF-00012I-Rx for importer@patchew.org; Mon, 18 Jul 2022 09:35:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDQsd-0007KW-0Z for qemu-devel@nongnu.org; Mon, 18 Jul 2022 09:33:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:27848) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDQsb-0007Ni-B1 for qemu-devel@nongnu.org; Mon, 18 Jul 2022 09:33:46 -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-537-YgXN2BAFMMaDld_LSsEL6Q-1; Mon, 18 Jul 2022 09:33:39 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 458A5185A7BA; Mon, 18 Jul 2022 13:33:39 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.86]) by smtp.corp.redhat.com (Postfix) with ESMTP id 651F82166B26; Mon, 18 Jul 2022 13:33:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658151224; 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=ryBjW7wwJ2lyg4XACQ3EZHs29EK9/HavUG+ow8PFrqU=; b=OWBOw3mvj+w0EnFFJkslGggUipsemAqurMCRa0Od4oOB9gQsq+XY2MRVe2vfF4ghfTNaBc N+gH9GK9lGRzcLffjCXnkk2HY7TFmMmx1nJoHKpzfPGBJE1tVC0LGrPHt9OlDA76Gc18T7 wWRyS4KGweQJ2oVBPAf9lIu0+fvDH1c= X-MC-Unique: YgXN2BAFMMaDld_LSsEL6Q-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Stefano Garzarella , Harpreet Singh Anand , Gautam Dawar , "Gonglei (Arei)" , Stefan Hajnoczi , Liuxiangdong , "Michael S. Tsirkin" , Laurent Vivier , Eli Cohen , Parav Pandit , Paolo Bonzini , Zhu Lingshan , Cornelia Huck , Jason Wang , Cindy Lu , Markus Armbruster , Eric Blake Subject: [PATCH 4/5] vdpa: Add virtio-net mac address via CVQ at start Date: Mon, 18 Jul 2022 15:33:20 +0200 Message-Id: <20220718133321.2902838-5-eperezma@redhat.com> In-Reply-To: <20220718133321.2902838-1-eperezma@redhat.com> References: <20220718133321.2902838-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.78 on 10.11.54.6 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: 1658151331854100001 This is needed so the destination vdpa device see the same state a the guest set in the source. Signed-off-by: Eugenio P=C3=A9rez --- include/net/vhost-vdpa.h | 1 + hw/net/vhost_net.c | 8 ++++++ net/vhost-vdpa.c | 59 ++++++++++++++++++++++++++++++++++++++-- 3 files changed, 66 insertions(+), 2 deletions(-) diff --git a/include/net/vhost-vdpa.h b/include/net/vhost-vdpa.h index b81f9a6f2a..38d65e845d 100644 --- a/include/net/vhost-vdpa.h +++ b/include/net/vhost-vdpa.h @@ -15,6 +15,7 @@ #define TYPE_VHOST_VDPA "vhost-vdpa" =20 struct vhost_net *vhost_vdpa_get_vhost_net(NetClientState *nc); +int vhost_vdpa_start(NetClientState *nc); =20 extern const int vdpa_feature_bits[]; =20 diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index ccac5b7a64..f9cebd9716 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -274,6 +274,13 @@ static int vhost_net_start_one(struct vhost_net *net, } } } + + if (net->nc->info->type =3D=3D NET_CLIENT_DRIVER_VHOST_VDPA) { + r =3D vhost_vdpa_start(net->nc); + if (r < 0) { + goto fail; + } + } return 0; fail: file.fd =3D -1; @@ -373,6 +380,7 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *= ncs, r =3D vhost_net_start_one(get_vhost_net(peer), dev); =20 if (r < 0) { + vhost_net_stop_one(get_vhost_net(peer), dev); goto err_start; } =20 diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 533bd9f680..e03f026738 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -342,9 +342,12 @@ static virtio_net_ctrl_ack vhost_vdpa_net_cvq_add(Vhos= tShadowVirtqueue *svq, virtio_net_ctrl_ack status; size_t dev_written; int r; - void *unused =3D (void *)1; =20 - r =3D vhost_svq_add(svq, &dev_buffers[0], 1, &dev_buffers[1], 1, unuse= d); + /* + * Add a fake non-NULL VirtQueueElement since we'll remove before SVQ + * event loop can get it. + */ + r =3D vhost_svq_add(svq, &dev_buffers[0], 1, &dev_buffers[1], 1, (void= *)1); if (unlikely(r !=3D 0)) { if (unlikely(r =3D=3D -ENOSPC)) { qemu_log_mask(LOG_GUEST_ERROR, "%s: No space on device queue\n= ", @@ -372,6 +375,58 @@ static virtio_net_ctrl_ack vhost_vdpa_net_cvq_add(Vhos= tShadowVirtqueue *svq, return VIRTIO_NET_OK; } =20 +int vhost_vdpa_start(NetClientState *nc) +{ + VhostVDPAState *s =3D DO_UPCAST(VhostVDPAState, nc, nc); + struct vhost_vdpa *v =3D &s->vhost_vdpa; + VirtIONet *n =3D VIRTIO_NET(v->dev->vdev); + uint64_t features =3D v->dev->vdev->host_features; + VhostShadowVirtqueue *svq =3D g_ptr_array_index(v->shadow_vqs, 0); + + if (v->dev->vq_index + v->dev->nvqs !=3D v->dev->vq_index_end) { + /* Only interested in CVQ */ + return 0; + } + + assert(nc->info->type =3D=3D NET_CLIENT_DRIVER_VHOST_VDPA); + + if (features & BIT_ULL(VIRTIO_NET_F_CTRL_MAC_ADDR)) { + const struct virtio_net_ctrl_hdr ctrl =3D { + .class =3D VIRTIO_NET_CTRL_MAC, + .cmd =3D VIRTIO_NET_CTRL_MAC_ADDR_SET, + }; + uint8_t mac[6]; + const struct iovec out[] =3D { + { + .iov_base =3D (void *)&ctrl, + .iov_len =3D sizeof(ctrl), + },{ + .iov_base =3D mac, + .iov_len =3D sizeof(mac), + }, + }; + struct iovec dev_buffers[2] =3D { + { .iov_base =3D s->cvq_cmd_out_buffer }, + { .iov_base =3D s->cvq_cmd_in_buffer }, + }; + bool ok; + virtio_net_ctrl_ack state; + + ok =3D vhost_vdpa_net_cvq_map_sg(s, out, ARRAY_SIZE(out), dev_buff= ers); + if (unlikely(!ok)) { + return -1; + } + + memcpy(mac, n->mac, sizeof(mac)); + state =3D vhost_vdpa_net_cvq_add(svq, dev_buffers); + vhost_vdpa_cvq_unmap_buf(v, dev_buffers[0].iov_base); + vhost_vdpa_cvq_unmap_buf(v, dev_buffers[1].iov_base); + return state =3D=3D VIRTIO_NET_OK ? 0 : 1; + } + + return 0; +} + /** * 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. --=20 2.31.1