From nobody Sun Feb 8 15:01:51 2026 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=1660931466; cv=none; d=zohomail.com; s=zohoarc; b=Y3UQzZrLFOPU7QMeL8Z2FX8epX9wwapmaux95JKBwIKFPloSLr+x8GRuWLMMmp6zNaMdPPI7pU4Ejq0ZoxKP3/EoHFZAqSGtpD89EG7n8a/ty1Wkd+GGJKNXA52rONGrTISDbstUtw5Mo+7CRVMyI+nn1WdPX8pfL4+hphfL5QI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660931466; 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=9ltBVP/2bbvjIm1EZXLG2VJuU/x835gJJ9NjPPqZAo0=; b=Tu1f5PySICdOLVuRyPFPfcRBZawZelYvEqRzNhMBmm+P+4C8qEsdYGQ/cSRVkm0YfWzS0dc+HlaSb/gc7n6Sc+OZymAzjt4by3cHArBFumvf6CYzA6+RZZY836w7tXwrbUmrCq/Yb3Go/G5X6wO3Sb2X0m2+dXv8AP+fts7vbsU= 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 1660931466543950.2681477338215; Fri, 19 Aug 2022 10:51:06 -0700 (PDT) Received: from localhost ([::1]:56030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oP69B-0007uy-8H for importer@patchew.org; Fri, 19 Aug 2022 13:51:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oP5Z3-0001Dr-9e for qemu-devel@nongnu.org; Fri, 19 Aug 2022 13:13:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:44657) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oP5Z0-0003R4-LQ for qemu-devel@nongnu.org; Fri, 19 Aug 2022 13:13:43 -0400 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-90-__VdpV2VMB-RgIh-rz8dAw-1; Fri, 19 Aug 2022 13:13:38 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0D95929324B0; Fri, 19 Aug 2022 17:13:38 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.194.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A48040CFD0A; Fri, 19 Aug 2022 17:13:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660929221; 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=9ltBVP/2bbvjIm1EZXLG2VJuU/x835gJJ9NjPPqZAo0=; b=R0nUsEAb6oUgpYq7FPqYvAe8233MGqXQppq7he+FaM0FmxfHyJXMKPBDYIJpI8KodjAMMa aNcVearaufsLMExF3v8YfwbC52WjsIOpz6OF1g+OCoBEsBxbL5hoVkojXAUcnxwiPBhnbg 6Gayuzz+yJK/nmoFL2GSxPPoTc3H4XU= X-MC-Unique: __VdpV2VMB-RgIh-rz8dAw-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Cindy Lu , Eli Cohen , Cornelia Huck , Laurent Vivier , Liuxiangdong , Paolo Bonzini , Zhu Lingshan , Jason Wang , Harpreet Singh Anand , Stefan Hajnoczi , Parav Pandit , Gautam Dawar , Stefano Garzarella , "Michael S. Tsirkin" , "Gonglei (Arei)" Subject: [PATCH 1/5] vdpa: extract vhost_vdpa_net_load_mac from vhost_vdpa_net_load Date: Fri, 19 Aug 2022 19:13:25 +0200 Message-Id: <20220819171329.3597027-2-eperezma@redhat.com> In-Reply-To: <20220819171329.3597027-1-eperezma@redhat.com> References: <20220819171329.3597027-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 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_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1660931468439100001 Since there may be many commands we need to issue to load the NIC state, let's split them in individual functions Signed-off-by: Eugenio P=C3=A9rez Acked-by: Jason Wang --- net/vhost-vdpa.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 97b658f412..1e0dbfcced 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -363,21 +363,10 @@ static ssize_t vhost_vdpa_net_cvq_add(VhostVDPAState = *s, size_t out_len, return vhost_svq_poll(svq); } =20 -static int vhost_vdpa_net_load(NetClientState *nc) +static int vhost_vdpa_net_load_mac(VhostVDPAState *s, + const VirtIONet *n) { - VhostVDPAState *s =3D DO_UPCAST(VhostVDPAState, nc, nc); - const struct vhost_vdpa *v =3D &s->vhost_vdpa; - const VirtIONet *n; - uint64_t features; - - assert(nc->info->type =3D=3D NET_CLIENT_DRIVER_VHOST_VDPA); - - if (!v->shadow_vqs_enabled) { - return 0; - } - - n =3D VIRTIO_NET(v->dev->vdev); - features =3D n->parent_obj.guest_features; + uint64_t features =3D n->parent_obj.guest_features; if (features & BIT_ULL(VIRTIO_NET_F_CTRL_MAC_ADDR)) { const struct virtio_net_ctrl_hdr ctrl =3D { .class =3D VIRTIO_NET_CTRL_MAC, @@ -402,6 +391,28 @@ static int vhost_vdpa_net_load(NetClientState *nc) return 0; } =20 +static int vhost_vdpa_net_load(NetClientState *nc) +{ + VhostVDPAState *s =3D DO_UPCAST(VhostVDPAState, nc, nc); + struct vhost_vdpa *v =3D &s->vhost_vdpa; + const VirtIONet *n; + int r; + + assert(nc->info->type =3D=3D NET_CLIENT_DRIVER_VHOST_VDPA); + + if (!v->shadow_vqs_enabled) { + return 0; + } + + n =3D VIRTIO_NET(v->dev->vdev); + r =3D vhost_vdpa_net_load_mac(s, n); + if (unlikely(r < 0)) { + return r; + } + + return 0; +} + static NetClientInfo net_vhost_vdpa_cvq_info =3D { .type =3D NET_CLIENT_DRIVER_VHOST_VDPA, .size =3D sizeof(VhostVDPAState), --=20 2.31.1 From nobody Sun Feb 8 15:01:51 2026 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=1660931643; cv=none; d=zohomail.com; s=zohoarc; b=hqyBQ8MAp1x7sg+UTk+MR2538qD3IxTIbkuYtv8j6Vfy6MKElK8rFJN3jBzpccStsEAKdl36/SmXVSFuRfmhJJTxuE4lg69BnmLltVlGSCl48UlTIJUcistynY+9/IBZnZVBBXwgc7KiUlDdBI+Bk2/ROEHVGZJou11sdNs98Rw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660931643; 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=yhm0gsPDkilsBilRLwOl3RJdeTaUppXVAvGqhwRvYv8=; b=HoDugpumJCxfOHy8f8N/aDBLMjrzKdFRFtDrAt1m4nGAHDq5hac32jj2zHhSABnUIlCJf05TLTKbTVbVEpp4YTvdy+QrFc9spvwNOPaoaYazI9zxemf6Ycm7szLkUeMk4e3awE/Ffe5Fqlo+ft519j+ioORTSl57ZWooj/HVThk= 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 1660931643871596.1731500241524; Fri, 19 Aug 2022 10:54:03 -0700 (PDT) Received: from localhost ([::1]:42702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oP6C2-0006UA-Ma for importer@patchew.org; Fri, 19 Aug 2022 13:54:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58588) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oP5Z3-0001HJ-9I for qemu-devel@nongnu.org; Fri, 19 Aug 2022 13:13:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:60839) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oP5Z1-0003R8-Gk for qemu-devel@nongnu.org; Fri, 19 Aug 2022 13:13:44 -0400 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-611-Nmj0cMBePs2TPOHOj0QVkA-1; Fri, 19 Aug 2022 13:13:41 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D256C80418F; Fri, 19 Aug 2022 17:13:40 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.194.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4F83A40CF8EE; Fri, 19 Aug 2022 17:13:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660929222; 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=yhm0gsPDkilsBilRLwOl3RJdeTaUppXVAvGqhwRvYv8=; b=JQlqK+D7SbioJWjmI6FqfFsxEUmJJqYkMkXnQxZUmNGY+cXpFsSfRn2bUCBFqT1dMZGog/ vZkVqndHfD5UNKAn40cjETeXGBEedsSSkzR9LfndQv6L2WoPaQDwMvVXBiFaj4nEIfSPsD EXGKSkCLQleIlmvM5xbeQtoo6Q1Femw= X-MC-Unique: Nmj0cMBePs2TPOHOj0QVkA-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Cindy Lu , Eli Cohen , Cornelia Huck , Laurent Vivier , Liuxiangdong , Paolo Bonzini , Zhu Lingshan , Jason Wang , Harpreet Singh Anand , Stefan Hajnoczi , Parav Pandit , Gautam Dawar , Stefano Garzarella , "Michael S. Tsirkin" , "Gonglei (Arei)" Subject: [PATCH 2/5] vdpa: Add vhost_vdpa_net_load_mq Date: Fri, 19 Aug 2022 19:13:26 +0200 Message-Id: <20220819171329.3597027-3-eperezma@redhat.com> In-Reply-To: <20220819171329.3597027-1-eperezma@redhat.com> References: <20220819171329.3597027-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 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: -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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1660931645983100001 Same way as with the MAC, restore the expected number of queues at device's start. Signed-off-by: Eugenio P=C3=A9rez --- net/vhost-vdpa.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 1e0dbfcced..96fd3bc835 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -391,6 +391,35 @@ static int vhost_vdpa_net_load_mac(VhostVDPAState *s, return 0; } =20 +static int vhost_vdpa_net_load_mq(VhostVDPAState *s, + const VirtIONet *n) +{ + uint64_t features =3D n->parent_obj.guest_features; + ssize_t dev_written; + void *cursor =3D s->cvq_cmd_out_buffer; + if (!(features & BIT_ULL(VIRTIO_NET_F_MQ))) { + return 0; + } + + *(struct virtio_net_ctrl_hdr *)cursor =3D (struct virtio_net_ctrl_hdr)= { + .class =3D VIRTIO_NET_CTRL_MQ, + .cmd =3D VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET, + }; + cursor +=3D sizeof(struct virtio_net_ctrl_hdr); + *(struct virtio_net_ctrl_mq *)cursor =3D (struct virtio_net_ctrl_mq) { + .virtqueue_pairs =3D cpu_to_le16(n->curr_queue_pairs), + }; + cursor +=3D sizeof(struct virtio_net_ctrl_mq); + + dev_written =3D vhost_vdpa_net_cvq_add(s, cursor - s->cvq_cmd_out_buff= er, + sizeof(virtio_net_ctrl_ack)); + if (unlikely(dev_written < 0)) { + return dev_written; + } + + return *((virtio_net_ctrl_ack *)s->cvq_cmd_in_buffer) !=3D VIRTIO_NET_= OK; +} + static int vhost_vdpa_net_load(NetClientState *nc) { VhostVDPAState *s =3D DO_UPCAST(VhostVDPAState, nc, nc); @@ -409,6 +438,10 @@ static int vhost_vdpa_net_load(NetClientState *nc) if (unlikely(r < 0)) { return r; } + r =3D vhost_vdpa_net_load_mq(s, n); + if (unlikely(r)) { + return r; + } =20 return 0; } --=20 2.31.1 From nobody Sun Feb 8 15:01:51 2026 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=1660931833; cv=none; d=zohomail.com; s=zohoarc; b=OWwTiyll+LmT4kTJ6LJP8z+inhpl+C+nl0gXlp7y1Hf+Igds51LHZlAX+qEzIaAIZVfhMI7GJ7CccxMCOC4iZOJsU1FLELqe0URdJLIY8/jE40dlJ0h5opohaFplONWBq9XOr1WBLPScEr9CS6YpM05cS0dISJQxKnIWfH7Vcrk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660931833; 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=6yOOSSDaKQ0fbJWVvbTbvPbjlySzJC5W4RikkHdw5Gg=; b=TYpgfgpgWFjcGMd9kMPjWy/enAdADo4odqnwBXXqeJn/esFrS8rm3gnDpv9DHHbFzcrHR9kSFAUbqGglb2PdfXLLm/PlaHrH8Le+7Q5MyRD0NiyBjIbRYwth/lH0H1p/b/gjdVg40c3BpcdgM+6K+4YE3nmqHWlyh6Ee2rf1zzk= 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 1660931833810327.9238140263467; Fri, 19 Aug 2022 10:57:13 -0700 (PDT) Received: from localhost ([::1]:33248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oP6F6-00019o-Kp for importer@patchew.org; Fri, 19 Aug 2022 13:57:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50614) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oP5ZA-0001fr-9c for qemu-devel@nongnu.org; Fri, 19 Aug 2022 13:13:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:54317) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oP5Z8-0003RT-PI for qemu-devel@nongnu.org; Fri, 19 Aug 2022 13:13:52 -0400 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-639-vH7NQXQUPESlgcpxNjfICg-1; Fri, 19 Aug 2022 13:13:44 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AC17F3802BAC; Fri, 19 Aug 2022 17:13:43 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.194.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 20D90404C6E3; Fri, 19 Aug 2022 17:13:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660929228; 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=6yOOSSDaKQ0fbJWVvbTbvPbjlySzJC5W4RikkHdw5Gg=; b=NDtAewdqnOJzqgfVX85Gz7qQ+uij0WNW27fAlnnKvHLpw+QR00akNLp1vyRy4S9VEabsYk Bp6ht2BP/qFegeCnLLbQTtOEvikiXzZ46hb3nipxnmotlbD5Fl6kf1XiFiaWTxnQAgARBK sc4TxMuiJcfaCYQa78c5boiEsdREFzE= X-MC-Unique: vH7NQXQUPESlgcpxNjfICg-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Cindy Lu , Eli Cohen , Cornelia Huck , Laurent Vivier , Liuxiangdong , Paolo Bonzini , Zhu Lingshan , Jason Wang , Harpreet Singh Anand , Stefan Hajnoczi , Parav Pandit , Gautam Dawar , Stefano Garzarella , "Michael S. Tsirkin" , "Gonglei (Arei)" Subject: [PATCH 3/5] vdpa: validate MQ CVQ commands Date: Fri, 19 Aug 2022 19:13:27 +0200 Message-Id: <20220819171329.3597027-4-eperezma@redhat.com> In-Reply-To: <20220819171329.3597027-1-eperezma@redhat.com> References: <20220819171329.3597027-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 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: -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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1660931835931100001 So we are sure we can update the device model properly before sending to the device. Signed-off-by: Eugenio P=C3=A9rez --- net/vhost-vdpa.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 96fd3bc835..d5bbda37a1 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -484,6 +484,15 @@ static bool vhost_vdpa_net_cvq_validate_cmd(const void= *out_buf, size_t len) __func__, ctrl.cmd); }; break; + case VIRTIO_NET_CTRL_MQ: + switch (ctrl.cmd) { + case VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET: + return true; + default: + qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid mq cmd %u\n", + __func__, ctrl.cmd); + }; + break; default: qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid control class %u\n", __func__, ctrl.class); --=20 2.31.1 From nobody Sun Feb 8 15:01:51 2026 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=1660931132; cv=none; d=zohomail.com; s=zohoarc; b=ewslv4CTo91LMZ2xACoJ7ZVxx5GHc98alZLOUxjCU7TyWCJbGw7l23+V2fKZpRZpnzqpVNIZFapPD0eEphajMw/xUUUXyQ7plTVg0hXdP9Qy9avhqTBkb2W3qNGzc/OKXsNVpvcW/UaF+O1RPSn7baml+uI2hQ6CTSMuZjD8jKw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660931132; 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=xoutYqkapS/nIMsepScl0jd/aod9k3GRqbKF46hCZW0=; b=F1/XoW2tcrKibFyCYRLF1+lEoE4PRRdDgjKaZHT7TqUEQe0kPrGz247REbfkwsA2kua9ziPcqsXQF7tGh9NrldmW6076oSKnEV8dU4HlKDzoSk+d0gEm+12ygRt5kqZ11t1LvpOxiZXFVWR8NGECBa2U6Pz3bnpqEUy92CWkEAY= 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 1660931132956852.3936569338332; Fri, 19 Aug 2022 10:45:32 -0700 (PDT) Received: from localhost ([::1]:57998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oP63n-0001O5-UG for importer@patchew.org; Fri, 19 Aug 2022 13:45:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oP5ZA-0001g4-Bw for qemu-devel@nongnu.org; Fri, 19 Aug 2022 13:13:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:40467) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oP5Z8-0003Rh-PY for qemu-devel@nongnu.org; Fri, 19 Aug 2022 13:13:52 -0400 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-248-w261hrxRN6ugZDoYdbcFEw-1; Fri, 19 Aug 2022 13:13:47 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7E53D804197; Fri, 19 Aug 2022 17:13:46 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.194.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id ECE7640CFD0A; Fri, 19 Aug 2022 17:13:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660929230; 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=xoutYqkapS/nIMsepScl0jd/aod9k3GRqbKF46hCZW0=; b=c66M0NkmMd3CUKX6J6s21l2fgI0U9RbU89ZplJVd2//37g4f4zy4wcdJHYVxa36z6DW5Gq fuA3s+WCOo/NheioFTNI8Lu6fTvOdL0kxZQ4IKhz7AL86TFGU0V40o4SNlXjU5TpjcoNHg 4ZdJq2kjhT15R56J4QDaVcljna9YVsI= X-MC-Unique: w261hrxRN6ugZDoYdbcFEw-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Cindy Lu , Eli Cohen , Cornelia Huck , Laurent Vivier , Liuxiangdong , Paolo Bonzini , Zhu Lingshan , Jason Wang , Harpreet Singh Anand , Stefan Hajnoczi , Parav Pandit , Gautam Dawar , Stefano Garzarella , "Michael S. Tsirkin" , "Gonglei (Arei)" Subject: [PATCH 4/5] virtio-net: Update virtio-net curr_queue_pairs in vdpa backends Date: Fri, 19 Aug 2022 19:13:28 +0200 Message-Id: <20220819171329.3597027-5-eperezma@redhat.com> In-Reply-To: <20220819171329.3597027-1-eperezma@redhat.com> References: <20220819171329.3597027-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 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_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1660931134726100001 It was returned as error before. Instead of it, simply update the corresponding field so qemu can send it in the migration data. Signed-off-by: Eugenio P=C3=A9rez Acked-by: Si-Wei Liu --- hw/net/virtio-net.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index dd0d056fde..63a8332cd0 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -1412,19 +1412,14 @@ static int virtio_net_handle_mq(VirtIONet *n, uint8= _t cmd, return VIRTIO_NET_ERR; } =20 - /* Avoid changing the number of queue_pairs for vdpa device in - * userspace handler. A future fix is needed to handle the mq - * change in userspace handler with vhost-vdpa. Let's disable - * the mq handling from userspace for now and only allow get - * done through the kernel. Ripples may be seen when falling - * back to userspace, but without doing it qemu process would - * crash on a recursive entry to virtio_net_set_status(). - */ + n->curr_queue_pairs =3D queue_pairs; if (nc->peer && nc->peer->info->type =3D=3D NET_CLIENT_DRIVER_VHOST_VD= PA) { - return VIRTIO_NET_ERR; + /* + * Avoid updating the backend for a vdpa device: We're only intere= sted + * in updating the device model queues. + */ + return VIRTIO_NET_OK; } - - n->curr_queue_pairs =3D queue_pairs; /* stop the backend before changing the number of queue_pairs to avoid= handling a * disabled queue */ virtio_net_set_status(vdev, vdev->status); --=20 2.31.1 From nobody Sun Feb 8 15:01:51 2026 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=1660931950; cv=none; d=zohomail.com; s=zohoarc; b=KmoF3sbJcPB+JE/vaFeBfLNWtAyLTubG/ZvQs7XK6CWRdo02hgW/6g7CgetUPhc7UkLrG0QI8eCYKa7v7AwtExUxM9AicZyUWA3T4MJxBdliT4zQ4CRDO6lzeGm2D1cx0fj0EG/ESpTVH9wtyZz5/nyvhUqBv2o1NytG78FYCDA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660931950; 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=p/n5MnQ0jzbHLzKdTX7QTpFEyA7YupvUHbQWd8PZo8U=; b=cQLrUpRoNjbRI2uEs8swEguzk1Bd+NllEG3sThStADvr2QANPeMqh4osgSx020HlRriTPm1CwpoIzcx048xXsolHV+ZOvDccw7DK7QG2NJAObiTXNOIQk9CNbDjsqq15gDmV8m9CedB8iMFoROtpmM6Xfpm6WK6Eoj+Ud+mepRE= 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 1660931950292864.9749470464084; Fri, 19 Aug 2022 10:59:10 -0700 (PDT) Received: from localhost ([::1]:56504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oP6Gz-00047Q-6O for importer@patchew.org; Fri, 19 Aug 2022 13:59:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50618) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oP5ZC-0001mw-V2 for qemu-devel@nongnu.org; Fri, 19 Aug 2022 13:13:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:23135) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oP5ZB-0003S7-Ga for qemu-devel@nongnu.org; Fri, 19 Aug 2022 13:13:54 -0400 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-597-xMNFEzO4PCSrssCfm-DdCQ-1; Fri, 19 Aug 2022 13:13:49 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5A2B53C02186; Fri, 19 Aug 2022 17:13:49 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.194.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id C078C400DFA6; Fri, 19 Aug 2022 17:13:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660929232; 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=p/n5MnQ0jzbHLzKdTX7QTpFEyA7YupvUHbQWd8PZo8U=; b=N+gur+lrPcUANgcuqjf2sTbpDXgHpmLYQJproV7jyF6nwF9tTGeg/0eSI/uGtU4bdK/8st p0KfusXUvXlJvwiTjgsN8jpyXIF+iw1v+bzlg9SJKH/Jz1Zg97s2MLfyR3UiL5W9mlVJ0w kxcfB+cmL7pLI2wkuvj0pd1lkdKh/JE= X-MC-Unique: xMNFEzO4PCSrssCfm-DdCQ-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Cindy Lu , Eli Cohen , Cornelia Huck , Laurent Vivier , Liuxiangdong , Paolo Bonzini , Zhu Lingshan , Jason Wang , Harpreet Singh Anand , Stefan Hajnoczi , Parav Pandit , Gautam Dawar , Stefano Garzarella , "Michael S. Tsirkin" , "Gonglei (Arei)" Subject: [PATCH 5/5] vdpa: Allow MQ feture in SVQ Date: Fri, 19 Aug 2022 19:13:29 +0200 Message-Id: <20220819171329.3597027-6-eperezma@redhat.com> In-Reply-To: <20220819171329.3597027-1-eperezma@redhat.com> References: <20220819171329.3597027-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 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: -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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1660931952350100001 Finally enable SVQ with MQ feature. Signed-off-by: Eugenio P=C3=A9rez --- net/vhost-vdpa.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index d5bbda37a1..ccf933de2f 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -92,6 +92,7 @@ static const uint64_t vdpa_svq_device_features =3D BIT_ULL(VIRTIO_NET_F_MRG_RXBUF) | BIT_ULL(VIRTIO_NET_F_STATUS) | BIT_ULL(VIRTIO_NET_F_CTRL_VQ) | + BIT_ULL(VIRTIO_NET_F_MQ) | BIT_ULL(VIRTIO_F_ANY_LAYOUT) | BIT_ULL(VIRTIO_NET_F_CTRL_MAC_ADDR) | BIT_ULL(VIRTIO_NET_F_RSC_EXT) | --=20 2.31.1