From patchwork Wed Oct 26 09:53:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eugenio Perez Martin X-Patchwork-Id: 13020410 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 29709C433FE for ; Wed, 26 Oct 2022 09:56:29 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ond6v-0005SL-PA; Wed, 26 Oct 2022 05:54:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ond6h-0004Y9-72 for qemu-devel@nongnu.org; Wed, 26 Oct 2022 05:54:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ond6f-0001mT-Mk for qemu-devel@nongnu.org; Wed, 26 Oct 2022 05:53:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666778032; 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=BvOCltwVqxSfa5PeaaZtlOycvNKM9SIGYmSSe+gfSms=; b=cMKlgizIxX4kwhBrXBMHRMZSXeyvB5aIKCSSx1KIN9E4dkWhmPwHDsQr+yl/l+h4cCv6u9 sNd/C4EcVoPvWrqNIX7/HWQviO573GDRC94kMgT0OosU87LTtPqRzPAemDnT1xJ4OVSigs VQ2UT1E5jo5CWcLoL/hfcNSQAZCqRYE= 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-203--MlOuOS0M9iZGcE8NPB0zA-1; Wed, 26 Oct 2022 05:53:46 -0400 X-MC-Unique: -MlOuOS0M9iZGcE8NPB0zA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3B050811E7A; Wed, 26 Oct 2022 09:53:36 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.194.233]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09851492B2C; Wed, 26 Oct 2022 09:53:23 +0000 (UTC) From: =?utf-8?q?Eugenio_P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Gautam Dawar , Parav Pandit , Zhu Lingshan , Stefano Garzarella , Jason Wang , "Michael S. Tsirkin" , Cindy Lu , Eli Cohen , Laurent Vivier , Si-Wei Liu , Liuxiangdong , Harpreet Singh Anand Subject: [PATCH 2/3] virtio_net: Handle _F_STATUS emulation in virtio_net_get_config Date: Wed, 26 Oct 2022 11:53:02 +0200 Message-Id: <20221026095303.37907-3-eperezma@redhat.com> In-Reply-To: <20221026095303.37907-1-eperezma@redhat.com> References: <20221026095303.37907-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.517, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org At this moment this code path is not reached, but vdpa devices can offer VIRTIO_NET_F_STATUS unconditionally. While the guest must assume that link is always up by the standard, qemu will set the status bit to 1 always in this case. This makes little use by itself, but VIRTIO_NET_F_STATUS is needed for the guest to read status bit VIRTIO_NET_F_GUEST_ANNOUNCE, used by feature VIRTIO_NET_F_GUEST_ANNOUNCE. So qemu must emulate status feature in case it needs to emulate the guest announce feature. Signed-off-by: Eugenio Pérez --- hw/net/virtio-net.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 56ff219196..6d4d75615b 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -156,8 +156,9 @@ static void virtio_net_get_config(VirtIODevice *vdev, uint8_t *config) * disconnect/reconnect a VDPA peer. */ if (nc->peer && nc->peer->info->type == NET_CLIENT_DRIVER_VHOST_VDPA) { - ret = vhost_net_get_config(get_vhost_net(nc->peer), (uint8_t *)&netcfg, - n->config_size); + struct vhost_net *net = get_vhost_net(nc->peer); + + ret = vhost_net_get_config(net, (uint8_t *)&netcfg, n->config_size); if (ret == -1) { return; } @@ -173,6 +174,12 @@ static void virtio_net_get_config(VirtIODevice *vdev, uint8_t *config) memcpy(netcfg.mac, n->mac, ETH_ALEN); } + if (vdev->guest_features & BIT_ULL(VIRTIO_NET_F_STATUS) && + !(net->dev.features & BIT_ULL(VIRTIO_NET_F_STATUS))) { + /* Emulating link up in qemu */ + netcfg.status |= virtio_tswap16(vdev, VIRTIO_NET_S_LINK_UP); + } + memcpy(config, &netcfg, n->config_size); } }