From nobody Sun May 12 20:40:12 2024 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=1671623525; cv=none; d=zohomail.com; s=zohoarc; b=c2lIH8DZFmch/Kn9uNOtdES0f/12dI11lFrxji6Rrv3bh3N4WPiRAVkpJmYLl34FdcYPNIf2HfsWN6st7HIBR0YHVYY3qNT3bWaPuUCGwwpXZgMTq8vSukCTtA2axZ/qKU1RgK0lb7X63kvusTJDokt4ANMQCDLgviaSo7X/3Vs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671623525; 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=ifDmXu0iK/aelGps1t+uYd832wmxy8I4mAhmuB3yNEQ=; b=GIdtLWC6e4Z2Tzhvk9dygbDSxiQWTheEoVje1ITDLiEC3gg+jMBRxdTaVUCF6m6YlUC/VMp+2DeKFUlFXvnbhpN0ODcvJtvvddHd7hOibACBvJz/R99STB5eT0nVTMZmoN6sBCaI+uZJDMYD7zUr/0GM0wl6A34NDOYrm1oXxxg= 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 1671623525932893.4606723186132; Wed, 21 Dec 2022 03:52:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7xcW-0001CG-7k; Wed, 21 Dec 2022 06:50:48 -0500 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 1p7xcJ-00017T-PQ for qemu-devel@nongnu.org; Wed, 21 Dec 2022 06:50:41 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p7xcH-00074z-BB for qemu-devel@nongnu.org; Wed, 21 Dec 2022 06:50:34 -0500 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-656-bRwamrq_OwK38ocfZgE_hA-1; Wed, 21 Dec 2022 06:50:29 -0500 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 D4D34884343; Wed, 21 Dec 2022 11:50:28 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.148]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2075A492C14; Wed, 21 Dec 2022 11:50:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671623432; 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=ifDmXu0iK/aelGps1t+uYd832wmxy8I4mAhmuB3yNEQ=; b=afvuSWCAb/C8L57QarNngpOmkzeDhFRAsESPP4qfPpDLS3Y1bBu7bfdI4OGS701qU4gDjp tCELLHnZFoF2kK/EM9IwwfrqqpsCP3YIg7y0AiOX8OcG3H4zeTqX2JYh5Sd8LuI/RbRo91 ro/M4x21rXv5G55P5ie3xCRi5Eq4KDg= X-MC-Unique: bRwamrq_OwK38ocfZgE_hA-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Stefano Garzarella , Lei Yang , Zhu Lingshan , Eli Cohen , "Michael S. Tsirkin" , Gautam Dawar , Jason Wang , Parav Pandit , Laurent Vivier , Si-Wei Liu , Harpreet Singh Anand , Liuxiangdong , Cindy Lu Subject: [PATCH v3 1/4] virtio_net: Modify virtio_net_get_config to early return Date: Wed, 21 Dec 2022 12:50:12 +0100 Message-Id: <20221221115015.1400889-2-eperezma@redhat.com> In-Reply-To: <20221221115015.1400889-1-eperezma@redhat.com> References: <20221221115015.1400889-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 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.133.124; envelope-from=eperezma@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671623526411100001 Next patches introduce more code on vhost-vdpa branch, with already have too much indentation. Signed-off-by: Eugenio P=C3=A9rez Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Michael S. Tsirkin Acked-by: Jason Wang --- hw/net/virtio-net.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 9cbdfa5547..b30038d130 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -168,20 +168,22 @@ static void virtio_net_get_config(VirtIODevice *vdev,= uint8_t *config) if (nc->peer && nc->peer->info->type =3D=3D NET_CLIENT_DRIVER_VHOST_VD= PA) { ret =3D vhost_net_get_config(get_vhost_net(nc->peer), (uint8_t *)&= netcfg, n->config_size); - if (ret !=3D -1) { - /* - * Some NIC/kernel combinations present 0 as the mac address. = As - * that is not a legal address, try to proceed with the - * address from the QEMU command line in the hope that the - * address has been configured correctly elsewhere - just not - * reported by the device. - */ - if (memcmp(&netcfg.mac, &zero, sizeof(zero)) =3D=3D 0) { - info_report("Zero hardware mac address detected. Ignoring.= "); - memcpy(netcfg.mac, n->mac, ETH_ALEN); - } - memcpy(config, &netcfg, n->config_size); + if (ret =3D=3D -1) { + return; } + + /* + * Some NIC/kernel combinations present 0 as the mac address. As = that + * is not a legal address, try to proceed with the address from the + * QEMU command line in the hope that the address has been configu= red + * correctly elsewhere - just not reported by the device. + */ + if (memcmp(&netcfg.mac, &zero, sizeof(zero)) =3D=3D 0) { + info_report("Zero hardware mac address detected. Ignoring."); + memcpy(netcfg.mac, n->mac, ETH_ALEN); + } + + memcpy(config, &netcfg, n->config_size); } } -- 2.31.1 From nobody Sun May 12 20:40:12 2024 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=1671623514; cv=none; d=zohomail.com; s=zohoarc; b=VZDHil3U00EQa/qnbNdjAc4DUjpyxdf964yATfockyXRLhqQ9MYsmqUKMOKcw7J0wrStj6OqHLGposR7ow87q07T+GDURwFS70tKGGRnN52q3W4xh1PhIovlFBpSYFi43nVf+2HD3WMvwI5kWG4MnA/CePdr1dxYtTyeXaUYmio= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671623514; 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=hTQxFFjHU/5hVdUjMJcQhhbiVvXHeK6QGCHBg+oW/kI=; b=E/iYnU9yuZouXKzGKBB9VgJsDdHTbZNnh+LE7spIxgH1Y4kX8bjATk2jh2ts7GmVo/xDz+TNqeayjrwPL/rppZ1cTU42/JaKHtcRAOhBUmdzVCBz3BdH+i9qrnxFBNRkMQ1yIotjpwOTjl4L2NYPc8sY29zkXkSxGXrAoIckFAQ= 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 1671623514502421.77109175964813; Wed, 21 Dec 2022 03:51:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7xcX-0001Cz-Pj; Wed, 21 Dec 2022 06:50:50 -0500 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 1p7xcQ-0001A2-4K for qemu-devel@nongnu.org; Wed, 21 Dec 2022 06:50:42 -0500 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 1p7xcM-00075I-Uu for qemu-devel@nongnu.org; Wed, 21 Dec 2022 06:50:40 -0500 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-599-PtLs50JYND6_FvREpkQhEg-1; Wed, 21 Dec 2022 06:50:32 -0500 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 D15D6811E9C; Wed, 21 Dec 2022 11:50:31 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.148]) by smtp.corp.redhat.com (Postfix) with ESMTP id 341FB492C1B; Wed, 21 Dec 2022 11:50:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671623437; 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=hTQxFFjHU/5hVdUjMJcQhhbiVvXHeK6QGCHBg+oW/kI=; b=FDBTUG+Vl1VmC7bBwDBQRf2cmmdqGiLoOIlq/s0KewhjLg5s0vxoK8vawSanPUQmjWHA3L ynPhQpHsxhwzbM1eTTDAVOygL2oltA+Gq4pr7aDmcO28AGiuBoNPCFRNRpVRTPD7fOeNnc gJLXw8qYHL8E1MTWXS40MC6Cp1Il4CA= X-MC-Unique: PtLs50JYND6_FvREpkQhEg-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Stefano Garzarella , Lei Yang , Zhu Lingshan , Eli Cohen , "Michael S. Tsirkin" , Gautam Dawar , Jason Wang , Parav Pandit , Laurent Vivier , Si-Wei Liu , Harpreet Singh Anand , Liuxiangdong , Cindy Lu Subject: [PATCH v3 2/4] virtio_net: copy VIRTIO_NET_S_ANNOUNCE if device model has it Date: Wed, 21 Dec 2022 12:50:13 +0100 Message-Id: <20221221115015.1400889-3-eperezma@redhat.com> In-Reply-To: <20221221115015.1400889-1-eperezma@redhat.com> References: <20221221115015.1400889-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671623515626100001 Status part of the emulated feature. It will follow device model, so we must copy it as long as NIC device model has it set. Signed-off-by: Eugenio P=C3=A9rez Acked-by: Jason Wang --- v3: Add virtio byte swapping writing net config status. --- hw/net/virtio-net.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index b30038d130..122eac25ee 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -183,6 +183,8 @@ static void virtio_net_get_config(VirtIODevice *vdev, u= int8_t *config) memcpy(netcfg.mac, n->mac, ETH_ALEN); } =20 + netcfg.status |=3D virtio_tswap16(vdev, + n->status & VIRTIO_NET_S_ANNOUNCE); memcpy(config, &netcfg, n->config_size); } } --=20 2.31.1 From nobody Sun May 12 20:40:12 2024 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=1671623489; cv=none; d=zohomail.com; s=zohoarc; b=ZsVROPJ2uFS5TvBWTDZVmFCIXWM40Uvt2KwVCoXuHrFFE6OQryq9z0WDj/6YXVnF89skht4Ixmp5GKcnFQ4uxGPO3AwGiBoTERiHuPKfrK32VXxmYkBvsZG9LzNkPTtnhO6kTrj/FUQGmu2U0Oy8IaaIVJqi11oqPHIZBeFZ2Xs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671623489; 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=NEGiWila+ehSegfW6BTL7ZnoiH8dQE36x5C3HeXiBFQ=; b=ni49PIVr7+dfzamCv5F0ZAUPOdp59RJrJS1D0Z3PZWLFQJB8v9eZQ8lXMUWCG5Y5CSbnNnan/CyZ5ABONS4TRJKKfv4cFon9Iy4FkAjPuDi9NOA6dD/dXJ5zUepqkvyoGeH+i+IH7QMqh3UTMa7rcu1UZJ5c4jRUF65UlW2p+0Y= 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 16716234897021016.7686941962637; Wed, 21 Dec 2022 03:51:29 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7xcV-0001Az-G5; Wed, 21 Dec 2022 06:50:47 -0500 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 1p7xcO-00019U-89 for qemu-devel@nongnu.org; Wed, 21 Dec 2022 06:50:41 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p7xcM-00075E-9L for qemu-devel@nongnu.org; Wed, 21 Dec 2022 06:50:39 -0500 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-578-1gKPgm1HPiS7WilNoMBCdQ-1; Wed, 21 Dec 2022 06:50:35 -0500 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 D7B2385A588; Wed, 21 Dec 2022 11:50:34 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.148]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3062C492C14; Wed, 21 Dec 2022 11:50:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671623436; 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=NEGiWila+ehSegfW6BTL7ZnoiH8dQE36x5C3HeXiBFQ=; b=cNOMbiPsTo/5IZ84D58YQnqSDGlFaLbU5RUEgzKn7Uc8StegGYNRVaXTZGjn+/JZpl/L/d hIXVRsK8OzTU9x5iaN+DJ73RvIxrwMLNBx7C+FHZpz3Ge6NlPrYMnz9VqDJ58+XuXqNgnD hmbC+wiYxkzr3gBVY1TF8BZ5JwoAlDQ= X-MC-Unique: 1gKPgm1HPiS7WilNoMBCdQ-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Stefano Garzarella , Lei Yang , Zhu Lingshan , Eli Cohen , "Michael S. Tsirkin" , Gautam Dawar , Jason Wang , Parav Pandit , Laurent Vivier , Si-Wei Liu , Harpreet Singh Anand , Liuxiangdong , Cindy Lu Subject: [PATCH v3 3/4] vdpa: handle VIRTIO_NET_CTRL_ANNOUNCE in vhost_vdpa_net_handle_ctrl_avail Date: Wed, 21 Dec 2022 12:50:14 +0100 Message-Id: <20221221115015.1400889-4-eperezma@redhat.com> In-Reply-To: <20221221115015.1400889-1-eperezma@redhat.com> References: <20221221115015.1400889-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 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.133.124; envelope-from=eperezma@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671623491520100011 Since this capability is emulated by qemu shadowed CVQ cannot forward it to the device. Process all that command within qemu. Signed-off-by: Eugenio P=C3=A9rez Acked-by: Jason Wang --- net/vhost-vdpa.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 260e474863..0b0712cd8a 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -489,9 +489,18 @@ static int vhost_vdpa_net_handle_ctrl_avail(VhostShado= wVirtqueue *svq, out.iov_len =3D iov_to_buf(elem->out_sg, elem->out_num, 0, s->cvq_cmd_out_buffer, vhost_vdpa_net_cvq_cmd_len()); - dev_written =3D vhost_vdpa_net_cvq_add(s, out.iov_len, sizeof(status)); - if (unlikely(dev_written < 0)) { - goto out; + if (*(uint8_t *)s->cvq_cmd_out_buffer =3D=3D VIRTIO_NET_CTRL_ANNOUNCE)= { + /* + * Guest announce capability is emulated by qemu, so don't forward= to + * the device. + */ + dev_written =3D sizeof(status); + *s->status =3D VIRTIO_NET_OK; + } else { + dev_written =3D vhost_vdpa_net_cvq_add(s, out.iov_len, sizeof(stat= us)); + if (unlikely(dev_written < 0)) { + goto out; + } } =20 if (unlikely(dev_written < sizeof(status))) { --=20 2.31.1 From nobody Sun May 12 20:40:12 2024 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=1671623486; cv=none; d=zohomail.com; s=zohoarc; b=A2i3AqR8V/CCkqdHoUM52HEpman59SZWtLLUiPXcb/mHvKHcwhAS+oRy3vSRfSQwKuVIhUlPdQ47jYWTFF0Zbymfptg0pRntLls1nf84xxC7EQRps1cq7lnWz2fUBUL0JL/MLf3a9WjJslY232ISsFPgWcVj10LE8EzGZz3IHlM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671623486; 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=1hvZ6/hTfqaz+/K2Su585yUavmkRideztQheIrYg7CA=; b=iJRGEkdXlgXyD3sGVNLDsG3USVQiY3rOz+I89ZF+nu5LCmeecoFkvMHNv86xuA96UZ0DOf5VDjLcZMSeVa6qMA0jZFR5O6LcdCr9e2cDZuWEK0OSuSWTDNxL2vIy4jZXNrYduXH3uxJW1MFUveDkZqS7lX0oyli9drw3Jz3kBvo= 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 1671623486651987.7786686477133; Wed, 21 Dec 2022 03:51:26 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7xcZ-0001E5-S3; Wed, 21 Dec 2022 06:50:51 -0500 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 1p7xcX-0001Cn-1D for qemu-devel@nongnu.org; Wed, 21 Dec 2022 06:50:49 -0500 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 1p7xcV-0007B2-ML for qemu-devel@nongnu.org; Wed, 21 Dec 2022 06:50:48 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-543-q4ZYdclOMPu95UFouXueRA-1; Wed, 21 Dec 2022 06:50:43 -0500 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 383D2382C967; Wed, 21 Dec 2022 11:50:43 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.148]) by smtp.corp.redhat.com (Postfix) with ESMTP id 283FD492C14; Wed, 21 Dec 2022 11:50:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671623447; 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=1hvZ6/hTfqaz+/K2Su585yUavmkRideztQheIrYg7CA=; b=GRdgEHbJ+Ow8q1CiKkEevn9uVBxcMzlJH8PMifnNvqs7zLGmAKUaMrIig6afuxAfMCIOTq g/8kBjIWQ9TIZlEbbEVjWvQ69peDaWsA4LJpy7fcrGOQ+1ou9sgvamJ0hKFyDf/IL285nj ZB8ce2zvdoWYjXef/mUyOBn2/6wI95o= X-MC-Unique: q4ZYdclOMPu95UFouXueRA-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Stefano Garzarella , Lei Yang , Zhu Lingshan , Eli Cohen , "Michael S. Tsirkin" , Gautam Dawar , Jason Wang , Parav Pandit , Laurent Vivier , Si-Wei Liu , Harpreet Singh Anand , Liuxiangdong , Cindy Lu Subject: [PATCH v3 4/4] vdpa: do not handle VIRTIO_NET_F_GUEST_ANNOUNCE in vhost-vdpa Date: Wed, 21 Dec 2022 12:50:15 +0100 Message-Id: <20221221115015.1400889-5-eperezma@redhat.com> In-Reply-To: <20221221115015.1400889-1-eperezma@redhat.com> References: <20221221115015.1400889-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1671623487574100001 So qemu emulates it even in case the device does not support it. Signed-off-by: Eugenio P=C3=A9rez Acked-by: Jason Wang --- net/vhost-vdpa.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 0b0712cd8a..6e71c74da2 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -72,7 +72,6 @@ const int vdpa_feature_bits[] =3D { VIRTIO_F_RING_RESET, VIRTIO_NET_F_RSS, VIRTIO_NET_F_HASH_REPORT, - VIRTIO_NET_F_GUEST_ANNOUNCE, VIRTIO_NET_F_STATUS, VHOST_INVALID_FEATURE_BIT }; --=20 2.31.1