From nobody Thu Apr 25 20:22:54 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=1669311252; cv=none; d=zohomail.com; s=zohoarc; b=NMqZ1MZRLKUkvni9bBHORDj456varTYo/BP+iX3bty7sQmiIK0KH0bFCHgYhrI0q6AGERPiGb/wtTbvweiK/dXoFQFX20xJPGB/pHEIaopie5iNkh+/NgwP8jJrDC3CvQNyMUuiDJ6P6HGcOJo1xxx1+k7UsU9gUgIa4pSqP5I4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669311252; 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=yL2V6njy9W3hahjt4IUqaIlGpLwKYOXSPAmRmVqy63M=; b=c8fRJZxkbKTNXnndXh2YThgrd1uI63zHRi2r75+0QngJvqO1S5GNLMtN8nB9FSYnh4GVYtpTeZBBq0jrrXFveSEk20o8Dqfze4x6UC1JEnf3jaD9V0hDPtunzsrZtkM99mb9ztcaHupgWFleQsZY7WdsQu4y/6wDSDPSv4WJrBg= 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 1669311252540806.3291183737076; Thu, 24 Nov 2022 09:34:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyG6O-0000eA-Ph; Thu, 24 Nov 2022 12:33:32 -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 1oyG6N-0000df-B1 for qemu-devel@nongnu.org; Thu, 24 Nov 2022 12:33:31 -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 1oyG6L-0006mt-4M for qemu-devel@nongnu.org; Thu, 24 Nov 2022 12:33:31 -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-313-wmdZtQhMOue-YOQfMwUABA-1; Thu, 24 Nov 2022 12:33:25 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A479C811E7A; Thu, 24 Nov 2022 17:33:24 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 357A64C819; Thu, 24 Nov 2022 17:33:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669311208; 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=yL2V6njy9W3hahjt4IUqaIlGpLwKYOXSPAmRmVqy63M=; b=eVfttYu3QSMLsc9QbhceuSQCirZLA3GJiiPAxIBGzkoPV6n59INMjkvDnPSp3td1dfbqWG 9bpI9ARBBRCcDbGymlKBXKaGL3K/+9OOdqzFCEbqqHeB+XqC5ISHfMNHA9QTP6l3Gs9xWN dZX2E5js+IAnSoc+z2/oBRlz/2XHfAo= X-MC-Unique: wmdZtQhMOue-YOQfMwUABA-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Eli Cohen , "Michael S. Tsirkin" , Jason Wang , Liuxiangdong , Zhu Lingshan , Laurent Vivier , Parav Pandit , Gautam Dawar , Lei Yang , Harpreet Singh Anand , Stefano Garzarella , Si-Wei Liu , Cindy Lu Subject: [PATCH v2 1/4] virtio_net: Modify virtio_net_get_config to early return Date: Thu, 24 Nov 2022 18:33:11 +0100 Message-Id: <20221124173314.2123015-2-eperezma@redhat.com> In-Reply-To: <20221124173314.2123015-1-eperezma@redhat.com> References: <20221124173314.2123015-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.5 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: 1669311254586100005 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 aba12759d5..eed629766f 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); } } =20 --=20 2.31.1 From nobody Thu Apr 25 20:22:54 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=1669311296; cv=none; d=zohomail.com; s=zohoarc; b=GZYcup0NxL3kKsVKrmqVyhtNbuexQhEyDukKcDLPKFOeO0R8eyy6Y5Fb5P1K3YZtgF7SboF5AKGYsa7/z1JgaJamwd73COUSDIouSjDWrXVARagyqxEnsQpd7OwtmcAEaiwgceQ6Ncxk8CjrustkTp8DjiUBX1y2VFtFfw63f1Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669311296; 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=eSQfQgZwUxYz+40VJ5koviZg2km2LQPd2acwK16R2JA=; b=PjfmyXNxmq8w7q7gJNxi5zbRFTRfUPFgNh2hwinuXPyoxnzagNbcGlRkNu2TQi4JZTZBNTJ5PZHV1FCrMFQfbZ0oPcdsiwRRyjKemPu9gHrtfLaS6lsaxO55gLF2CKZZdhXOF8YocoCVlv9pfXLMDLVNPE/pva5H3UabF1A28EM= 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 1669311296712363.76249509787783; Thu, 24 Nov 2022 09:34:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyG6R-0000eb-KT; Thu, 24 Nov 2022 12:33:35 -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 1oyG6Q-0000eR-4s for qemu-devel@nongnu.org; Thu, 24 Nov 2022 12:33:34 -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 1oyG6O-0006nE-LO for qemu-devel@nongnu.org; Thu, 24 Nov 2022 12:33:33 -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-133-S_Ce2XBsNXqv5p_0cptutw-1; Thu, 24 Nov 2022 12:33:28 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 65CB1101A52A; Thu, 24 Nov 2022 17:33:27 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id EB23B4C819; Thu, 24 Nov 2022 17:33:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669311211; 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=eSQfQgZwUxYz+40VJ5koviZg2km2LQPd2acwK16R2JA=; b=dihAC7kKYhew0m0KhGKIy0mI4FWpMYPDg37GI4njZBlmUrVp7CUi08EWy9MyN+m7e0p10o 7O0msiRYgSc0V7vZqVej531Lf0m9yLhXYYEkpWR0dEosnZgV0p0pv/E5TRQJGZv85aiboh JzuQ8oxbV1T81ON2KZVD/v+aq2IeZ80= X-MC-Unique: S_Ce2XBsNXqv5p_0cptutw-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Eli Cohen , "Michael S. Tsirkin" , Jason Wang , Liuxiangdong , Zhu Lingshan , Laurent Vivier , Parav Pandit , Gautam Dawar , Lei Yang , Harpreet Singh Anand , Stefano Garzarella , Si-Wei Liu , Cindy Lu Subject: [PATCH v2 2/4] virtio_net: copy VIRTIO_NET_S_ANNOUNCE if device model has it Date: Thu, 24 Nov 2022 18:33:12 +0100 Message-Id: <20221124173314.2123015-3-eperezma@redhat.com> In-Reply-To: <20221124173314.2123015-1-eperezma@redhat.com> References: <20221124173314.2123015-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.5 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: 1669311298739100005 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 --- hw/net/virtio-net.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index eed629766f..bf71ef33e8 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -183,6 +183,7 @@ static void virtio_net_get_config(VirtIODevice *vdev, u= int8_t *config) memcpy(netcfg.mac, n->mac, ETH_ALEN); } =20 + netcfg.status |=3D (n->status & VIRTIO_NET_S_ANNOUNCE); memcpy(config, &netcfg, n->config_size); } } --=20 2.31.1 From nobody Thu Apr 25 20:22:54 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=1669311296; cv=none; d=zohomail.com; s=zohoarc; b=ESWLShJJp7B8QB5Nji3eaMZXWO1zkt+kWV6Bx8YN38RW6IoufXlUj5M7tn78+ni9FYr5+xX/rS5Egv48FOFtlj0bG7co+821CuzBGQaGSPn9QJRCqKklaKjNhgKF3BclmsxQvUlgbFDOrLT9J7v6IAJs0qw8QHhaN4EetxtToxc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669311296; 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=f2x7uBGTJBr4/qPnUNJwXtchvIVJ6BxDDXORIni7Vew=; b=IorI+7FWi8CnTeglP/3dftbLastsHMghJNYFdmGzhzJm4nNPiSvzEtihYgS49mFRep7SF7875ACObUIIGPo49Y83ot/XMdxhfCrhhQ+Dx/76eQd4lFT5lQ/dDWiXepfIvPYkX47Po8mLcCsaBP5mGZY8PN7xWEZ0rOSYbcLWIE0= 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 1669311296790890.7451505262406; Thu, 24 Nov 2022 09:34:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyG6W-0000fp-Ue; Thu, 24 Nov 2022 12:33:40 -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 1oyG6U-0000f9-J5 for qemu-devel@nongnu.org; Thu, 24 Nov 2022 12:33:38 -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 1oyG6T-0006na-5p for qemu-devel@nongnu.org; Thu, 24 Nov 2022 12:33:38 -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-323-om69iShzNU2CMMc_dzuGzA-1; Thu, 24 Nov 2022 12:33:30 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 26F551C09044; Thu, 24 Nov 2022 17:33:30 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id ACF934C819; Thu, 24 Nov 2022 17:33:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669311215; 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=f2x7uBGTJBr4/qPnUNJwXtchvIVJ6BxDDXORIni7Vew=; b=aygbAMcQHp3/RJ25WX/7FhebmR8S9747xu3TxvYDhF1LfOWTWkg/HuyaV3mScyXVz6ebdQ NQPAthJSJMopCTFJgjLwf1++ckXjnd+2o4/iTut0hdKTw1PGxKP1pYAPEnXsP9um/u1e0b 9Kl8ZAqZOKRxshzUomevs/4oLcEDS5c= X-MC-Unique: om69iShzNU2CMMc_dzuGzA-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Eli Cohen , "Michael S. Tsirkin" , Jason Wang , Liuxiangdong , Zhu Lingshan , Laurent Vivier , Parav Pandit , Gautam Dawar , Lei Yang , Harpreet Singh Anand , Stefano Garzarella , Si-Wei Liu , Cindy Lu Subject: [PATCH v2 3/4] vdpa: handle VIRTIO_NET_CTRL_ANNOUNCE in vhost_vdpa_net_handle_ctrl_avail Date: Thu, 24 Nov 2022 18:33:13 +0100 Message-Id: <20221124173314.2123015-4-eperezma@redhat.com> In-Reply-To: <20221124173314.2123015-1-eperezma@redhat.com> References: <20221124173314.2123015-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.5 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: 1669311298676100003 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 --- 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 2b4b85d8f8..8172aa8449 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 dont 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 Thu Apr 25 20:22:54 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=1669311306; cv=none; d=zohomail.com; s=zohoarc; b=WZ+GWLDEcQNE9doHxLp82Ciy94rx+Kaz7o4wGRS546eXD5JCtc2EszOHBpKyxnZh91kZ1WFlF6spoa8O+OCX6nyFyPAHW8Oifj6g/cBmKbWvOcLIUp1jjICB6BVZ7+x2iLTNbYP0GVzIEOetNYt7iVRpov4Pa3NmbiqKkwoEaYw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669311306; 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=jxSaZR7f+8Mlb3ugqwigOl8aChdPsaR66sNuJYO/XCY=; b=Dgr3pJCsIUgaIGNk4vWSCA1oS7rwf0yBKtM/AjIkNXgYI+ULftSGUt058uwETrb25mr3ZZEctnLAxbRKzYrMCnH9xQsxXqUWJiVxRtjcYB73cqxlfyv4DG7aXvB+i3CF/OlC62kePdBjALGY+TPqYtrm8Fddbwubz8g2lAMOACk= 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 1669311306155149.78886409709708; Thu, 24 Nov 2022 09:35:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyG6W-0000fb-1T; Thu, 24 Nov 2022 12:33:40 -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 1oyG6U-0000f2-BZ for qemu-devel@nongnu.org; Thu, 24 Nov 2022 12:33:38 -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 1oyG6T-0006nd-0q for qemu-devel@nongnu.org; Thu, 24 Nov 2022 12:33:38 -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-613-u4hbdNH4PaKCWXUCWZaBsA-1; Thu, 24 Nov 2022 12:33:33 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DCD16811E75; Thu, 24 Nov 2022 17:33:32 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6E3014C819; Thu, 24 Nov 2022 17:33:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669311216; 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=jxSaZR7f+8Mlb3ugqwigOl8aChdPsaR66sNuJYO/XCY=; b=OQLpWHcAAKvbwa0WzngnCSsu7YxXzsQJ4PVLMGyPovNWeEJ9EayO4142X2Ur+yUFqCBVN9 RZnKKbwfFiIYBC23AbsITi22Oi1djTp2nqiXa8m5TLciGF+dlyifYf9A2f3oKU63y50oZn OJC1oZ71rtwiZlPwEsYHV1UmFlB3ndc= X-MC-Unique: u4hbdNH4PaKCWXUCWZaBsA-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Eli Cohen , "Michael S. Tsirkin" , Jason Wang , Liuxiangdong , Zhu Lingshan , Laurent Vivier , Parav Pandit , Gautam Dawar , Lei Yang , Harpreet Singh Anand , Stefano Garzarella , Si-Wei Liu , Cindy Lu Subject: [PATCH v2 4/4] vdpa: do not handle VIRTIO_NET_F_GUEST_ANNOUNCE in vhost-vdpa Date: Thu, 24 Nov 2022 18:33:14 +0100 Message-Id: <20221124173314.2123015-5-eperezma@redhat.com> In-Reply-To: <20221124173314.2123015-1-eperezma@redhat.com> References: <20221124173314.2123015-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.5 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: 1669311306734100001 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 8172aa8449..79f022c2bf 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