Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E4AD4C19F29 for ; Tue, 2 Aug 2022 17:59:39 +0000 (UTC) Received: from localhost ([::1]:36494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oIwB8-0004Mz-VJ for qemu-devel@archiver.kernel.org; Tue, 02 Aug 2022 13:59:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58230) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oIw9f-0001jj-JU for qemu-devel@nongnu.org; Tue, 02 Aug 2022 13:58:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:48970) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oIw9d-0003lG-NK for qemu-devel@nongnu.org; Tue, 02 Aug 2022 13:58:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659463085; 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=ROTiFf/ghtUwz+t5YtpFTbVGZwHeiepB1ydvv/NzF5I=; b=Crht73kxC1x9Xa0qLOHJrOqCeXsOiPyIkOFObjAnc7OZ1AEaSZ+oUUZvsz5cFfxzuKv6KG pLngeH+2JnZoJOij6J1VATZ1SiLuX5PQCTGVfoUZwGb9DiMt3INzw2jVPzh7n/7YyaJY9Y jiNj5g2LPiUAzFno7d0OJ8qoU8M8f0o= 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-335-l12o12s8PH64t9N0vGD0bw-1; Tue, 02 Aug 2022 13:58:03 -0400 X-MC-Unique: l12o12s8PH64t9N0vGD0bw-1 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 41D7B801755; Tue, 2 Aug 2022 17:58:03 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 79960492C3B; Tue, 2 Aug 2022 17:58:00 +0000 (UTC) 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 09/10] vdpa: Add virtio-net mac address via CVQ at start Date: Tue, 2 Aug 2022 19:57:30 +0200 Message-Id: <20220802175731.312115-10-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: 8bit X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This is needed so the destination vdpa device see the same state a the guest set in the source. Signed-off-by: Eugenio Pérez --- v5: * Rename s/start/load/ * Use independent NetClientInfo to only add load callback on cvq. --- net/vhost-vdpa.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 8d400f2dff..d489fcd91e 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -375,10 +375,60 @@ static virtio_net_ctrl_ack vhost_vdpa_net_cvq_add(VhostVDPAState *s, return VIRTIO_NET_OK; } +static int vhost_vdpa_net_load(NetClientState *nc) +{ + VhostVDPAState *s = DO_UPCAST(VhostVDPAState, nc, nc); + struct vhost_vdpa *v = &s->vhost_vdpa; + VirtIONet *n; + uint64_t features; + + assert(nc->info->type == NET_CLIENT_DRIVER_VHOST_VDPA); + + if (!v->shadow_vqs_enabled) { + return 0; + } + + n = VIRTIO_NET(v->dev->vdev); + features = v->dev->vdev->host_features; + if (features & BIT_ULL(VIRTIO_NET_F_CTRL_MAC_ADDR)) { + const struct virtio_net_ctrl_hdr ctrl = { + .class = VIRTIO_NET_CTRL_MAC, + .cmd = VIRTIO_NET_CTRL_MAC_ADDR_SET, + }; + uint8_t mac[6]; + const struct iovec out[] = { + { + .iov_base = (void *)&ctrl, + .iov_len = sizeof(ctrl), + },{ + .iov_base = mac, + .iov_len = sizeof(mac), + }, + }; + size_t out_len; + bool ok; + virtio_net_ctrl_ack state; + + ok = vhost_vdpa_net_cvq_map_sg(s, out, ARRAY_SIZE(out), &out_len); + if (unlikely(!ok)) { + return -1; + } + + memcpy(mac, n->mac, sizeof(mac)); + state = vhost_vdpa_net_cvq_add(s, out_len); + vhost_vdpa_cvq_unmap_buf(v, s->cvq_cmd_out_buffer); + vhost_vdpa_cvq_unmap_buf(v, s->cvq_cmd_in_buffer); + return state == VIRTIO_NET_OK ? 0 : 1; + } + + return 0; +} + static NetClientInfo net_vhost_vdpa_cvq_info = { .type = NET_CLIENT_DRIVER_VHOST_VDPA, .size = sizeof(VhostVDPAState), .receive = vhost_vdpa_receive, + .load = vhost_vdpa_net_load, .cleanup = vhost_vdpa_cleanup, .has_vnet_hdr = vhost_vdpa_has_vnet_hdr, .has_ufo = vhost_vdpa_has_ufo, -- 2.31.1