From nobody Sat May 18 17:34:37 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1637317716598951.0223961137402; Fri, 19 Nov 2021 02:28:36 -0800 (PST) Received: from localhost ([::1]:40266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mo18F-0002Lj-9E for importer@patchew.org; Fri, 19 Nov 2021 05:28:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59562) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mo15u-0000gZ-7J for qemu-devel@nongnu.org; Fri, 19 Nov 2021 05:26:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:39152) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mo15q-000137-1o for qemu-devel@nongnu.org; Fri, 19 Nov 2021 05:26:09 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-405-mlJsCxJ0MbWxykNbI8p5jQ-1; Fri, 19 Nov 2021 05:20:48 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 04B9D100C660; Fri, 19 Nov 2021 10:20:47 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.145]) by smtp.corp.redhat.com (Postfix) with ESMTP id 685735C1A1; Fri, 19 Nov 2021 10:20:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637317564; 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=IZKSD6Myo8SxCVi800/nbGsckMp86BB2aHMAFA1bZeE=; b=GtRzYZXW17848w8up8M0AF9/2aea+bcC9XqYcmAVB3HTZ/NHbXMoMPflA3yGPyR/Hh0uPN tOhJ3+Sl/3lP5nJ4OypCQvA1PsUeUWbQbOzkGPwYnrYkSfD6E9FGr85sos7Uezwq5mWJTW kxPbaqETxDHTz2jUwjrNEfLNF6LFLrs= X-MC-Unique: mlJsCxJ0MbWxykNbI8p5jQ-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Subject: [PATCH 1/3] virtio-net: Fix indentation Date: Fri, 19 Nov 2021 11:20:31 +0100 Message-Id: <20211119102033.36149-2-eperezma@redhat.com> In-Reply-To: <20211119102033.36149-1-eperezma@redhat.com> References: <20211119102033.36149-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eperezma@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: , Cc: Laurent Vivier , Jason Wang , qemu-stable@nongnu.org, Cindy Lu , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1637317717313100001 Signed-off-by: Eugenio P=C3=A9rez --- hw/net/virtio-net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index f2014d5ea0..004acf858f 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -3501,7 +3501,7 @@ static void virtio_net_device_realize(DeviceState *de= v, Error **errp) nc =3D qemu_get_queue(n->nic); nc->rxfilter_notify_enabled =3D 1; =20 - if (nc->peer && nc->peer->info->type =3D=3D NET_CLIENT_DRIVER_VHOST_VDP= A) { + if (nc->peer && nc->peer->info->type =3D=3D NET_CLIENT_DRIVER_VHOST_VD= PA) { struct virtio_net_config netcfg =3D {}; memcpy(&netcfg.mac, &n->nic_conf.macaddr, ETH_ALEN); vhost_net_set_config(get_vhost_net(nc->peer), --=20 2.27.0 From nobody Sat May 18 17:34:37 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1637317525980272.2367568551873; Fri, 19 Nov 2021 02:25:25 -0800 (PST) Received: from localhost ([::1]:36950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mo15A-0008Ia-OQ for importer@patchew.org; Fri, 19 Nov 2021 05:25:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mo10t-0003bB-0C for qemu-devel@nongnu.org; Fri, 19 Nov 2021 05:21:01 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:22814) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mo10r-0006l2-9p for qemu-devel@nongnu.org; Fri, 19 Nov 2021 05:20:58 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-169-6gnSXvuhOCefBw4j0JuOYg-1; Fri, 19 Nov 2021 05:20:49 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EC6479F92A; Fri, 19 Nov 2021 10:20:48 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.145]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5F2165C1A1; Fri, 19 Nov 2021 10:20:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637317253; 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=LTEjc5D10czz/U/02Godm9bNDbiqSXzKead8Qmj/uRM=; b=I0TZPIkqdAfh6IiBuHogLqnio3RjwNkkTRjTfkSovjXEy15/5h9gprNMNm0aIhogR71WET Hq5gQGz1pYTkzoPkOsUZVUpWHa8DaYv0ECknwNohMz+30zR3sJHPjrmfcF9Jc+xuuW33UL Y5VxqLozsJKOESco1MsGPGQzanq+dBY= X-MC-Unique: 6gnSXvuhOCefBw4j0JuOYg-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Subject: [PATCH 2/3] vdpa: Add dummy receive callbacks Date: Fri, 19 Nov 2021 11:20:32 +0100 Message-Id: <20211119102033.36149-3-eperezma@redhat.com> In-Reply-To: <20211119102033.36149-1-eperezma@redhat.com> References: <20211119102033.36149-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eperezma@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: , Cc: Laurent Vivier , Jason Wang , qemu-stable@nongnu.org, Cindy Lu , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1637317527128100001 Qemu falls back on userland handlers even if vhost-user and vhost-vdpa cases. These assumes a tap device can handle the packets. If a vdpa device fail to start, it can trigger a sigsegv because of that. Add dummy receivers that return no progress so it can keep running. Fixes: 1e0a84ea49 ("vhost-vdpa: introduce vhost-vdpa net client") Signed-off-by: Eugenio P=C3=A9rez --- net/vhost-vdpa.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 2e3c22a8c7..4c75b78304 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -170,9 +170,25 @@ static bool vhost_vdpa_check_peer_type(NetClientState = *nc, ObjectClass *oc, return true; } =20 +/** Dummy receive in case qemu falls back to userland tap networking */ +static ssize_t vhost_vdpa_receive_iov(NetClientState *nc, + const struct iovec *iov, int iovcnt) +{ + return 0; +} + +/** Dummy receive in case qemu falls back to userland tap networking */ +static ssize_t vhost_vdpa_receive_raw(NetClientState *nc, const uint8_t *b= uf, + size_t size) +{ + return 0; +} + static NetClientInfo net_vhost_vdpa_info =3D { .type =3D NET_CLIENT_DRIVER_VHOST_VDPA, .size =3D sizeof(VhostVDPAState), + .receive_iov =3D vhost_vdpa_receive_iov, + .receive_raw =3D vhost_vdpa_receive_raw, .cleanup =3D vhost_vdpa_cleanup, .has_vnet_hdr =3D vhost_vdpa_has_vnet_hdr, .has_ufo =3D vhost_vdpa_has_ufo, --=20 2.27.0 From nobody Sat May 18 17:34:37 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1637317382950117.44947416571961; Fri, 19 Nov 2021 02:23:02 -0800 (PST) Received: from localhost ([::1]:32946 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mo12r-0005Tb-O6 for importer@patchew.org; Fri, 19 Nov 2021 05:23:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58228) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mo10u-0003bG-6u for qemu-devel@nongnu.org; Fri, 19 Nov 2021 05:21:01 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:53351) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mo10r-0006lF-AA for qemu-devel@nongnu.org; Fri, 19 Nov 2021 05:20:59 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-283-m58EByiRMU-SFlmeiDfPcg-1; Fri, 19 Nov 2021 05:20:51 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E457A100C660; Fri, 19 Nov 2021 10:20:50 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.145]) by smtp.corp.redhat.com (Postfix) with ESMTP id 547E55FC13; Fri, 19 Nov 2021 10:20:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637317255; 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=y/7e5m8s2LG4nyndoE6/xn5KZQmxXo09spI02TEboLU=; b=b4EksGT+Z22jKs/OEzntrwvCVDKC0SC5IXR/XWg6NSd1mU/XeHLODHeV+th3yEdc6rSpCO Ji4NuV6nkYFiUSd7ptCuU3YXKecu3mTlam87/yoFdLCtvWEkVPJh7mwa0E6Lygj6FznZ/L Lifjdd8F0SAgRwh2B91S1/fzVP77rOI= X-MC-Unique: m58EByiRMU-SFlmeiDfPcg-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Subject: [PATCH 3/3] virtio-net: Fix log message Date: Fri, 19 Nov 2021 11:20:33 +0100 Message-Id: <20211119102033.36149-4-eperezma@redhat.com> In-Reply-To: <20211119102033.36149-1-eperezma@redhat.com> References: <20211119102033.36149-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eperezma@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: , Cc: Laurent Vivier , Jason Wang , qemu-stable@nongnu.org, Cindy Lu , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1637317384474100002 The message has never been true in the case of non tap networking, so only tell that userland networking will be used if possible. Signed-off-by: Eugenio P=C3=A9rez --- hw/net/virtio-net.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 004acf858f..442082dd8c 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -245,6 +245,7 @@ static void virtio_net_vhost_status(VirtIONet *n, uint8= _t status) NetClientState *nc =3D qemu_get_queue(n->nic); int queue_pairs =3D n->multiqueue ? n->max_queue_pairs : 1; int cvq =3D n->max_ncs - n->max_queue_pairs; + bool tap_backend =3D nc->peer->info->type =3D=3D NET_CLIENT_DRIVER_TAP; =20 if (!get_vhost_net(nc->peer)) { return; @@ -258,9 +259,9 @@ static void virtio_net_vhost_status(VirtIONet *n, uint8= _t status) int r, i; =20 if (n->needs_vnet_hdr_swap) { - error_report("backend does not support %s vnet headers; " - "falling back on userspace virtio", - virtio_is_big_endian(vdev) ? "BE" : "LE"); + error_report("backend does not support %s vnet headers%s", + virtio_is_big_endian(vdev) ? "BE" : "LE", + tap_backend ? "; falling back on userspace virtio" : "= "); return; } =20 @@ -288,8 +289,8 @@ static void virtio_net_vhost_status(VirtIONet *n, uint8= _t status) n->vhost_started =3D 1; r =3D vhost_net_start(vdev, n->nic->ncs, queue_pairs, cvq); if (r < 0) { - error_report("unable to start vhost net: %d: " - "falling back on userspace virtio", -r); + error_report("unable to start vhost net: %d%s", -r, + tap_backend ? " falling back on userspace virtio" := ""); n->vhost_started =3D 0; } } else { --=20 2.27.0