From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E8EBFD4F19 for ; Tue, 10 Mar 2026 19:17:26 +0000 (UTC) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F391940E21; Tue, 10 Mar 2026 20:17:09 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id E930740E22 for ; Tue, 10 Mar 2026 20:17:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773170227; 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=3WKsMGz50TDVYQZ6IsjacPFk0aijQMLYX4T+yruc+Kc=; b=Ck0pF9rtNm6iLX6HUF+CYfs9RNXn5hXCcoROn93ioGo/LHmQK4mO6OpglNEIlfOaEfWNCF 9J8kX34+62zwI2NFQXE1MzYgmrfQ1K7cLdMEbc07I7VDmanKOwUUW/T2YIQmdpJJbQCH6a 4kT0fIvxVB9iGhcxcBxJvp2ZngZ+DuI= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-433-bn5PRzdtNTWb4qygpMD4DQ-1; Tue, 10 Mar 2026 15:17:04 -0400 X-MC-Unique: bn5PRzdtNTWb4qygpMD4DQ-1 X-Mimecast-MFC-AGG-ID: bn5PRzdtNTWb4qygpMD4DQ_1773170223 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3B9EF1800359; Tue, 10 Mar 2026 19:17:03 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.44.32.202]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A9A661956095; Tue, 10 Mar 2026 19:17:00 +0000 (UTC) From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: Maxime Coquelin Cc: david.marchand@redhat.com, mst@redhat.com, chenbox@nvidia.com, Yongji Xie , jasowang@redhat.com, dev@dpdk.org Subject: [RFC v2 04/10] vhost: add virtqueues groups support to VDUSE Date: Tue, 10 Mar 2026 20:16:39 +0100 Message-ID: <20260310191645.1104892-5-eperezma@redhat.com> In-Reply-To: <20260310191645.1104892-1-eperezma@redhat.com> References: <20260310191645.1104892-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: KB3VQBfpn4ENlokLM1nozJ-98A24mNxBhdzN8seLQLg_1773170223 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Maxime Coquelin VDUSE API version 1 introduces the notion of virtqueue groups, which once supported, enables the support of multiple addresses spaces. For VDUSE networking devices, we need two groups, one for the datapath queues, and one for the control queue. Signed-off-by: Maxime Coquelin Signed-off-by: Eugenio Pérez --- lib/vhost/vduse.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/lib/vhost/vduse.c b/lib/vhost/vduse.c index fc52b4cd0703..bb3a4363baad 100644 --- a/lib/vhost/vduse.c +++ b/lib/vhost/vduse.c @@ -38,12 +38,24 @@ static const char * const vduse_reqs_str[] = { "VDUSE_GET_VQ_STATE", "VDUSE_SET_STATUS", "VDUSE_UPDATE_IOTLB", + "VDUSE_SET_VQ_GROUP_ASID", }; #define vduse_req_id_to_str(id) \ (id < RTE_DIM(vduse_reqs_str) ? \ vduse_reqs_str[id] : "Unknown") +static uint64_t vduse_vq_to_group(struct virtio_net *dev, struct vhost_virtqueue *vq) +{ + if (dev->vduse_api_ver < 1) + return 0; + + if (vq == dev->cvq) + return 1; + + return 0; +} + static int vduse_inject_irq(struct virtio_net *dev, struct vhost_virtqueue *vq) { @@ -271,6 +283,7 @@ vduse_vring_cleanup(struct virtio_net *dev, unsigned int index) vq->size = 0; vq->last_used_idx = 0; vq->last_avail_idx = 0; + vq->asid = 0; } /* @@ -410,6 +423,7 @@ vduse_events_handler(int fd, void *arg, int *close __rte_unused) struct vduse_dev_response resp; struct vhost_virtqueue *vq; uint8_t old_status = dev->status; + uint32_t i; int ret; memset(&resp, 0, sizeof(resp)); @@ -450,6 +464,26 @@ vduse_events_handler(int fd, void *arg, int *close __rte_unused) req.iova.last - req.iova.start + 1); /* ToDo: use ASID once API available, using 0 for now */ resp.result = VDUSE_REQ_RESULT_OK; break; + case VDUSE_SET_VQ_GROUP_ASID: + if (dev->vduse_api_ver < 1) { + resp.result = VDUSE_REQ_RESULT_FAILED; + break; + } + + VHOST_CONFIG_LOG(dev->ifname, INFO, "\tAssigning ASID %d to group %d", + req.vq_group_asid.asid, req.vq_group_asid.group); + + for (i = 0; i < dev->nr_vring; i++) { + vq = dev->virtqueue[i]; + + if (vduse_vq_to_group(dev, vq) == req.vq_group_asid.group) { + vq->asid = req.vq_group_asid.asid; + VHOST_CONFIG_LOG(dev->ifname, INFO, "\t\tVQ %d gets ASID %d", + i, req.vq_group_asid.asid); + } + } + resp.result = VDUSE_REQ_RESULT_OK; + break; default: resp.result = VDUSE_REQ_RESULT_FAILED; break; @@ -760,6 +794,10 @@ vduse_device_create(const char *path, bool compliant_ol_flags, bool extbuf, bool dev_config->features = features; dev_config->vq_num = total_queues; dev_config->vq_align = rte_mem_page_size(); + if (ver >= 1) { + dev_config->ngroups = 2; + dev_config->nas = 2; + } dev_config->config_size = sizeof(struct virtio_net_config); memcpy(dev_config->config, &vnet_config, sizeof(vnet_config)); @@ -848,11 +886,15 @@ vduse_device_create(const char *path, bool compliant_ol_flags, bool extbuf, bool vq = dev->virtqueue[i]; vq->reconnect_log = &dev->reconnect_log->vring[i]; + if (i == max_queue_pairs * 2) + dev->cvq = vq; + if (reconnect) continue; vq_cfg.index = i; vq_cfg.max_size = 1024; + vq_cfg.group = vduse_vq_to_group(dev, vq); ret = ioctl(dev->vduse_dev_fd, VDUSE_VQ_SETUP, &vq_cfg); if (ret) { @@ -861,8 +903,6 @@ vduse_device_create(const char *path, bool compliant_ol_flags, bool extbuf, bool } } - dev->cvq = dev->virtqueue[max_queue_pairs * 2]; - ret = fdset_add(vduse.fdset, dev->vduse_dev_fd, vduse_events_handler, NULL, dev); if (ret) { VHOST_CONFIG_LOG(name, ERR, "Failed to add fd %d to vduse fdset", -- 2.53.0