From nobody Mon Feb 9 16:19:53 2026 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 1624249120284253.3162364529437; Sun, 20 Jun 2021 21:18:40 -0700 (PDT) Received: from localhost ([::1]:54774 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lvBOR-0003nT-41 for importer@patchew.org; Mon, 21 Jun 2021 00:18:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59208) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvBN3-0001EO-Bc for qemu-devel@nongnu.org; Mon, 21 Jun 2021 00:17:13 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:35709) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvBN0-0000qx-HE for qemu-devel@nongnu.org; Mon, 21 Jun 2021 00:17:13 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-439-Zez60RGCOjqwTd5mSVMDyQ-1; Mon, 21 Jun 2021 00:17:08 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5FB5B100C609; Mon, 21 Jun 2021 04:17:07 +0000 (UTC) Received: from localhost.localdomain (ovpn-12-217.pek2.redhat.com [10.72.12.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id E59A960877; Mon, 21 Jun 2021 04:17:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624249030; 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=pIHZoMcmHpo2reoC9xzaIVCloljT1fO9pTKelBYVJFM=; b=J0WzUk0DqMd7/GCy1kTYAa+KRRlKTNH8ZDV8pF+tFggcNWZWl/PcrlR/eqzL7jSqL2MmJe 4Y8H/bM2c0sD8OoPkZJenw66rv0vIzhcu/dwiwGJD59xfay7x6B67giqZaYaulF8kvc2Zi DKFQYH0q4DeWzp8pMxMfHj5VXPsWadI= X-MC-Unique: Zez60RGCOjqwTd5mSVMDyQ-1 From: Jason Wang To: mst@redhat.com, jasowang@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 03/18] vhost_net: do not assume nvqs is always 2 Date: Mon, 21 Jun 2021 12:16:35 +0800 Message-Id: <20210621041650.5826-4-jasowang@redhat.com> In-Reply-To: <20210621041650.5826-1-jasowang@redhat.com> References: <20210621041650.5826-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.299, 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.01, RCVD_IN_MSPIKE_WL=-0.01, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: eperezma@redhat.com, elic@nvidia.com, lingshan.zhu@intel.com, lulu@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This patch switches to initialize dev.nvqs from the VhostNetOptions instead of assuming it was 2. This is useful for implementing control virtqueue support which will be a single vhost_net structure with a single cvq. Signed-off-by: Jason Wang Reviewed-by: Eli Cohen Reviewed-by: Stefano Garzarella --- hw/net/vhost_net.c | 2 +- include/net/vhost_net.h | 1 + net/tap.c | 1 + net/vhost-user.c | 1 + net/vhost-vdpa.c | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index 6bd4184f96..ef1370bd92 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -163,9 +163,9 @@ struct vhost_net *vhost_net_init(VhostNetOptions *optio= ns) goto fail; } net->nc =3D options->net_backend; + net->dev.nvqs =3D options->nvqs; =20 net->dev.max_queues =3D 1; - net->dev.nvqs =3D 2; net->dev.vqs =3D net->vqs; =20 if (backend_kernel) { diff --git a/include/net/vhost_net.h b/include/net/vhost_net.h index 172b0051d8..fba40cf695 100644 --- a/include/net/vhost_net.h +++ b/include/net/vhost_net.h @@ -14,6 +14,7 @@ typedef struct VhostNetOptions { VhostBackendType backend_type; NetClientState *net_backend; uint32_t busyloop_timeout; + unsigned int nvqs; void *opaque; } VhostNetOptions; =20 diff --git a/net/tap.c b/net/tap.c index f5686bbf77..f716be3e3f 100644 --- a/net/tap.c +++ b/net/tap.c @@ -749,6 +749,7 @@ static void net_init_tap_one(const NetdevTapOptions *ta= p, NetClientState *peer, qemu_set_nonblock(vhostfd); } options.opaque =3D (void *)(uintptr_t)vhostfd; + options.nvqs =3D 2; =20 s->vhost_net =3D vhost_net_init(&options); if (!s->vhost_net) { diff --git a/net/vhost-user.c b/net/vhost-user.c index ffbd94d944..b93918c5a4 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -85,6 +85,7 @@ static int vhost_user_start(int queues, NetClientState *n= cs[], options.net_backend =3D ncs[i]; options.opaque =3D be; options.busyloop_timeout =3D 0; + options.nvqs =3D 2; net =3D vhost_net_init(&options); if (!net) { error_report("failed to init vhost_net for queue %d", i); diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 19187dce8c..18b45ad777 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -105,6 +105,7 @@ static int vhost_vdpa_add(NetClientState *ncs, void *be) options.net_backend =3D ncs; options.opaque =3D be; options.busyloop_timeout =3D 0; + options.nvqs =3D 2; =20 net =3D vhost_net_init(&options); if (!net) { --=20 2.25.1