From nobody Wed Sep 24 15:20:54 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0679F29D26A for ; Tue, 26 Aug 2025 11:27:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756207647; cv=none; b=GRYetuiO1Goe8PcKsKBKJiu3AJZFFmi4jgX5vApiRTajmCbLZ/v3qHdf2L1Ek5ptY//gxYV9N8Bm3XpGIa86neLgUyOX6lFWX8Qqb9hA3aNWhG/AnArMH+EEMKOmaeGY57T6BpI0XVRFEciGlgC1OFc/ze7rjX749YYXiCse6fM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756207647; c=relaxed/simple; bh=L9q1m9CtNlhgChDvcgNwi+HhAOc8fJ9V+nf/txfRDPk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=gy+97zUYAgtGkuggRH6gbCpcZHgUcqlUaJVtW6jGsiw+Cv/QLMgoei1HChvNl2Mln4XUn9R4M83AfpkzznBu6W2b85F/tEAQJAi/mIlUsHN8UuV39vipkvvqTOpbASsSWREw9xS3liKEkrUbK7/CaAB/IdWGIovx2p+KMdz5VnU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Fkg4gXd9; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Fkg4gXd9" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1756207645; 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=jgIUz6Q5sS/rQUHeGlq36B08BX4dcUMxKfvHNOBbzXE=; b=Fkg4gXd9RKn/fgzyHgd3BM0jhxde7TzHLfIAs3bYrr3JAOxJNOn6kcmaAIKMUqlR6GRowJ /tbT9bldsiaNemfKoVr/s0shyY0Wrk1bkS70gD9XcQ8yup8xPfg0rr2WDJwVNsgjcEp8QI 5KItDLytNvz3MWLTuFmKCCjw6/+EJaw= 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-224-clajb460MrmjZIdTnnav6w-1; Tue, 26 Aug 2025 07:27:21 -0400 X-MC-Unique: clajb460MrmjZIdTnnav6w-1 X-Mimecast-MFC-AGG-ID: clajb460MrmjZIdTnnav6w_1756207640 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 852271800446; Tue, 26 Aug 2025 11:27:20 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.224.67]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 773811800280; Tue, 26 Aug 2025 11:27:16 +0000 (UTC) From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: "Michael S . Tsirkin " Cc: =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Cindy Lu , Stefano Garzarella , Xuan Zhuo , Laurent Vivier , virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, jasowang@redhat.com, Yongji Xie , Maxime Coquelin Subject: [PATCH 1/6] vduse: add v1 API definition Date: Tue, 26 Aug 2025 13:27:04 +0200 Message-ID: <20250826112709.1051172-2-eperezma@redhat.com> In-Reply-To: <20250826112709.1051172-1-eperezma@redhat.com> References: <20250826112709.1051172-1-eperezma@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 This allows the kernel to detect whether the userspace VDUSE device supports the VQ group and ASID features. VDUSE devices that don't set the V1 API will not receive the new messages, and vdpa device will be created with only one vq group and asid. The next patches implement the new feature incrementally, only enabling the VDUSE device to set the V1 API version by the end of the series. Signed-off-by: Eugenio P=C3=A9rez --- include/uapi/linux/vduse.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/uapi/linux/vduse.h b/include/uapi/linux/vduse.h index 68a627d04afa..9a56d0416bfe 100644 --- a/include/uapi/linux/vduse.h +++ b/include/uapi/linux/vduse.h @@ -10,6 +10,10 @@ =20 #define VDUSE_API_VERSION 0 =20 +/* VQ groups and ASID support */ + +#define VDUSE_API_VERSION_1 1 + /* * Get the version of VDUSE API that kernel supported (VDUSE_API_VERSION). * This is used for future extension. --=20 2.51.0 From nobody Wed Sep 24 15:20:54 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C8DFD2F83C1 for ; Tue, 26 Aug 2025 11:27:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756207653; cv=none; b=qk6YCSzzHcC67F6MFXjmmLVdBXIdNQUR3iHazTyhTzfOSV1O9S8kIKX4DkDPYItYRvYydvtf32v7cjFvhYImjYoTajiTrAFXFX4YszBQAh4VsHNdLdKv4Z3SnhBEQlX6ITKUyvK7Nr6c7YELayiS7Duztbe1fyJ7Nn6StcUjsgM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756207653; c=relaxed/simple; bh=91MrTF4kyUyQSid52eyDTM8REpCvGVqOFxU099T5b+A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=kJO/kATR8EqEeEMaRXu1gh3RxWC9NEJTLmUecNDh0rwzze1CGn7lUymRwurO6W6j9Akz08VXjOjDQsn3yLRNtnM3SR+p6gsGXXGFWQ/NFs+DSN0qJFM6ZcWTI9nUTpOr9Wa2XOv0aStDdpGfhipuJOV7a1Aczjl7V/GrSkU4H5Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=X7rizRn9; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="X7rizRn9" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1756207649; 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=1Dfr1AP301Ho/fgPsvC3NL7D/TxBaVo5KwFeo+iScfE=; b=X7rizRn971TdFxfDjAB1EeAQK5Vl7v7gyZ9gULWxPMX7iB0Ly6filB77pmE3kVPWTO4hoV NiLPkjxtzFIkjnI8NNnfXXAgU64j4dAymgwCdVYVmTccyKwJ0QoH/txQC30j/jx/sArGmQ A8AYgobWMaWc++L+AsdKfBFXxIItSMo= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-520-YIBulR5hMoiXga6BNFXodw-1; Tue, 26 Aug 2025 07:27:26 -0400 X-MC-Unique: YIBulR5hMoiXga6BNFXodw-1 X-Mimecast-MFC-AGG-ID: YIBulR5hMoiXga6BNFXodw_1756207645 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 345D419560AF; Tue, 26 Aug 2025 11:27:25 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.224.67]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 172011800280; Tue, 26 Aug 2025 11:27:20 +0000 (UTC) From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: "Michael S . Tsirkin " Cc: =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Cindy Lu , Stefano Garzarella , Xuan Zhuo , Laurent Vivier , virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, jasowang@redhat.com, Yongji Xie , Maxime Coquelin Subject: [PATCH 2/6] vduse: add vq group support Date: Tue, 26 Aug 2025 13:27:05 +0200 Message-ID: <20250826112709.1051172-3-eperezma@redhat.com> In-Reply-To: <20250826112709.1051172-1-eperezma@redhat.com> References: <20250826112709.1051172-1-eperezma@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 This allows sepparate the different virtqueues in groups that shares the same address space. Asking the VDUSE device for the groups of the vq at the beginning as they're needed for the DMA API. Allocating 3 vq groups as net is the device that need the most groups: * Dataplane (guest passthrough) * CVQ * Shadowed vrings. Future versions of the series can include dynamic allocation of the groups array so VDUSE can declare more groups. Signed-off-by: Eugenio P=C3=A9rez --- v1: Fix: Remove BIT_ULL(VIRTIO_S_*), as _S_ is already the bit (Maxime) RFC v3: * Increase VDUSE_MAX_VQ_GROUPS to 0xffff (Jason). It was set to a lower value to reduce memory consumption, but vqs are already limited to that value and userspace VDUSE is able to allocate that many vqs. * Remove the descs vq group capability as it will not be used and we can add it on top. * Do not ask for vq groups in number of vq groups < 2. * Move the valid vq groups range check to vduse_validate_config. RFC v2: * Cache group information in kernel, as we need to provide the vq map tokens properly. * Add descs vq group to optimize SVQ forwarding and support indirect descriptors out of the box. --- drivers/vdpa/vdpa_user/vduse_dev.c | 51 ++++++++++++++++++++++++++++-- include/uapi/linux/vduse.h | 21 +++++++++++- 2 files changed, 68 insertions(+), 4 deletions(-) diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vd= use_dev.c index e7bced0b5542..0f4e36dd167e 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -58,6 +58,7 @@ struct vduse_virtqueue { struct vdpa_vq_state state; bool ready; bool kicked; + u32 vq_group; spinlock_t kick_lock; spinlock_t irq_lock; struct eventfd_ctx *kickfd; @@ -114,6 +115,7 @@ struct vduse_dev { u8 status; u32 vq_num; u32 vq_align; + u32 ngroups; struct vduse_umem *umem; struct mutex mem_lock; unsigned int bounce_size; @@ -592,6 +594,13 @@ static int vduse_vdpa_set_vq_state(struct vdpa_device = *vdpa, u16 idx, return 0; } =20 +static u32 vduse_get_vq_group(struct vdpa_device *vdpa, u16 idx) +{ + struct vduse_dev *dev =3D vdpa_to_vduse(vdpa); + + return dev->vqs[idx]->vq_group; +} + static int vduse_vdpa_get_vq_state(struct vdpa_device *vdpa, u16 idx, struct vdpa_vq_state *state) { @@ -678,6 +687,28 @@ static u8 vduse_vdpa_get_status(struct vdpa_device *vd= pa) return dev->status; } =20 +static int vduse_fill_vq_groups(struct vduse_dev *dev) +{ + /* All vqs and descs must be in vq group 0 if ngroups < 2 */ + if (dev->ngroups < 2) + return 0; + + for (int i =3D 0; i < dev->vdev->vdpa.nvqs; ++i) { + struct vduse_dev_msg msg =3D { 0 }; + int ret; + + msg.req.type =3D VDUSE_GET_VQ_GROUP; + msg.req.vq_group.index =3D i; + ret =3D vduse_dev_msg_sync(dev, &msg); + if (ret) + return ret; + + dev->vqs[i]->vq_group =3D msg.resp.vq_group.group; + } + + return 0; +} + static void vduse_vdpa_set_status(struct vdpa_device *vdpa, u8 status) { struct vduse_dev *dev =3D vdpa_to_vduse(vdpa); @@ -685,6 +716,11 @@ static void vduse_vdpa_set_status(struct vdpa_device *= vdpa, u8 status) if (vduse_dev_set_status(dev, status)) return; =20 + if (((dev->status ^ status) & VIRTIO_CONFIG_S_FEATURES_OK) && + (status & VIRTIO_CONFIG_S_FEATURES_OK)) + if (vduse_fill_vq_groups(dev)) + return; + dev->status =3D status; } =20 @@ -789,6 +825,7 @@ static const struct vdpa_config_ops vduse_vdpa_config_o= ps =3D { .set_vq_cb =3D vduse_vdpa_set_vq_cb, .set_vq_num =3D vduse_vdpa_set_vq_num, .get_vq_size =3D vduse_vdpa_get_vq_size, + .get_vq_group =3D vduse_get_vq_group, .set_vq_ready =3D vduse_vdpa_set_vq_ready, .get_vq_ready =3D vduse_vdpa_get_vq_ready, .set_vq_state =3D vduse_vdpa_set_vq_state, @@ -1737,12 +1774,19 @@ static bool features_is_valid(struct vduse_dev_conf= ig *config) return true; } =20 -static bool vduse_validate_config(struct vduse_dev_config *config) +static bool vduse_validate_config(struct vduse_dev_config *config, + u64 api_version) { if (!is_mem_zero((const char *)config->reserved, sizeof(config->reserved))) return false; =20 + if (api_version < VDUSE_API_VERSION_1 && config->ngroups) + return false; + + if (api_version >=3D VDUSE_API_VERSION_1 && config->ngroups > 0xffff) + return false; + if (config->vq_align > PAGE_SIZE) return false; =20 @@ -1858,6 +1902,7 @@ static int vduse_create_dev(struct vduse_dev_config *= config, dev->device_features =3D config->features; dev->device_id =3D config->device_id; dev->vendor_id =3D config->vendor_id; + dev->ngroups =3D (dev->api_version < 1) ? 1 : (config->ngroups ?: 1); dev->name =3D kstrdup(config->name, GFP_KERNEL); if (!dev->name) goto err_str; @@ -1936,7 +1981,7 @@ static long vduse_ioctl(struct file *file, unsigned i= nt cmd, break; =20 ret =3D -EINVAL; - if (vduse_validate_config(&config) =3D=3D false) + if (!vduse_validate_config(&config, control->api_version)) break; =20 buf =3D vmemdup_user(argp + size, config.config_size); @@ -2017,7 +2062,7 @@ static int vduse_dev_init_vdpa(struct vduse_dev *dev,= const char *name) =20 vdev =3D vdpa_alloc_device(struct vduse_vdpa, vdpa, dev->dev, &vduse_vdpa_config_ops, &vduse_map_ops, - 1, 1, name, true); + dev->ngroups, 1, name, true); if (IS_ERR(vdev)) return PTR_ERR(vdev); =20 diff --git a/include/uapi/linux/vduse.h b/include/uapi/linux/vduse.h index 9a56d0416bfe..b1c0e47d71fb 100644 --- a/include/uapi/linux/vduse.h +++ b/include/uapi/linux/vduse.h @@ -31,6 +31,7 @@ * @features: virtio features * @vq_num: the number of virtqueues * @vq_align: the allocation alignment of virtqueue's metadata + * @ngroups: number of vq groups that VDUSE device declares * @reserved: for future use, needs to be initialized to zero * @config_size: the size of the configuration space * @config: the buffer of the configuration space @@ -45,7 +46,8 @@ struct vduse_dev_config { __u64 features; __u32 vq_num; __u32 vq_align; - __u32 reserved[13]; + __u32 ngroups; /* if VDUSE_API_VERSION >=3D 1 */ + __u32 reserved[12]; __u32 config_size; __u8 config[]; }; @@ -160,6 +162,16 @@ struct vduse_vq_state_packed { __u16 last_used_idx; }; =20 +/** + * struct vduse_vq_group - virtqueue group + * @index: Index of the virtqueue + * @group: Virtqueue group + */ +struct vduse_vq_group { + __u32 index; + __u32 group; +}; + /** * struct vduse_vq_info - information of a virtqueue * @index: virtqueue index @@ -274,6 +286,7 @@ enum vduse_req_type { VDUSE_GET_VQ_STATE, VDUSE_SET_STATUS, VDUSE_UPDATE_IOTLB, + VDUSE_GET_VQ_GROUP, }; =20 /** @@ -316,6 +329,7 @@ struct vduse_iova_range { * @vq_state: virtqueue state, only index field is available * @s: device status * @iova: IOVA range for updating + * @vq_group: virtqueue group of a virtqueue * @padding: padding * * Structure used by read(2) on /dev/vduse/$NAME. @@ -328,6 +342,8 @@ struct vduse_dev_request { struct vduse_vq_state vq_state; struct vduse_dev_status s; struct vduse_iova_range iova; + /* Only if vduse api version >=3D 1 */; + struct vduse_vq_group vq_group; __u32 padding[32]; }; }; @@ -338,6 +354,7 @@ struct vduse_dev_request { * @result: the result of request * @reserved: for future use, needs to be initialized to zero * @vq_state: virtqueue state + * @vq_group: virtqueue group of a virtqueue * @padding: padding * * Structure used by write(2) on /dev/vduse/$NAME. @@ -350,6 +367,8 @@ struct vduse_dev_response { __u32 reserved[4]; union { struct vduse_vq_state vq_state; + /* Only if vduse api version >=3D 1 */ + struct vduse_vq_group vq_group; __u32 padding[32]; }; }; --=20 2.51.0 From nobody Wed Sep 24 15:20:54 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A6EF3322754 for ; Tue, 26 Aug 2025 11:27:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756207657; cv=none; b=C1w+jLfcouMtpmdLqFYE9pucKLfApBZw4hhI3IZXQ/8H/9Ewx2HqohBJQcT7gXzGIPG66VXX9hheDf9klwwJbh/wL5MmQvScpQBNgPvvcLLDtIkbzzZVSg8FK6d9r3NuQjdNgu+k0hE5qm5gbgCWIi2GfOiYhU3OHlcfisJsykA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756207657; c=relaxed/simple; bh=fyJBCsG54JY+WM3Xv4WvD/U3V/1BZ7OuzTAGcEwEYGY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=HEJjkHKJiLkWCMr/CfzYPdyLlpGQns3xrq/spV0mO98EWLG/DSFQrQC67zsMJn9ZfS+dHBdkwpbKM+Kce3K0bIUqqNcnmgir7f588J2wRIDnbigALoDU02SuS4BBGL1ItbTCbfql0QmYNpAFdrRkCJS6OMsekYckeTQj7ouqddQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=W0x9qZA5; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="W0x9qZA5" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1756207654; 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=DfofubBiNflkdS+7MPj9QFpqK45aUd4DQMvbYep/TB8=; b=W0x9qZA5dPP/kQdV7pOqpdCl/LlWTS0PD0/bswiEUA87D/Jj3C1UkY7VtQCfbjftAIx+iZ 2mltF01vPf1Gow5QM3pcUHy2u/DBQaBBdc+7gmF+LOIKu9zwpAAh7PW1FjxDWz4Jqdbrkz uzES7OyoEEe0aB1r3G8mQ6Sd4IBlE3s= 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-158-6UMgqMDLNlOdPL_RIKLerw-1; Tue, 26 Aug 2025 07:27:30 -0400 X-MC-Unique: 6UMgqMDLNlOdPL_RIKLerw-1 X-Mimecast-MFC-AGG-ID: 6UMgqMDLNlOdPL_RIKLerw_1756207650 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 97810180035D; Tue, 26 Aug 2025 11:27:29 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.224.67]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id ADD221800280; Tue, 26 Aug 2025 11:27:25 +0000 (UTC) From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: "Michael S . Tsirkin " Cc: =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Cindy Lu , Stefano Garzarella , Xuan Zhuo , Laurent Vivier , virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, jasowang@redhat.com, Yongji Xie , Maxime Coquelin Subject: [PATCH 3/6] vduse: return internal vq group struct as map token Date: Tue, 26 Aug 2025 13:27:06 +0200 Message-ID: <20250826112709.1051172-4-eperezma@redhat.com> In-Reply-To: <20250826112709.1051172-1-eperezma@redhat.com> References: <20250826112709.1051172-1-eperezma@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Return the internal struct that represents the vq group as virtqueue map token, instead of the device. This allows the map functions to access the information per group. At this moment all the virtqueues share the same vq group, that only can point to ASID 0. This change prepares the infrastructure for actual per-group address space handling Signed-off-by: Eugenio P=C3=A9rez --- v3: * Make the vq groups a dynamic array to support an arbitrary number of them. --- drivers/vdpa/vdpa_user/vduse_dev.c | 52 ++++++++++++++++++++++++------ include/linux/virtio.h | 6 ++-- 2 files changed, 46 insertions(+), 12 deletions(-) diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vd= use_dev.c index 0f4e36dd167e..cdb3dc2b5e3f 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -84,6 +85,10 @@ struct vduse_umem { struct mm_struct *mm; }; =20 +struct vduse_vq_group_int { + struct vduse_dev *dev; +}; + struct vduse_dev { struct vduse_vdpa *vdev; struct device *dev; @@ -117,6 +122,7 @@ struct vduse_dev { u32 vq_align; u32 ngroups; struct vduse_umem *umem; + struct vduse_vq_group_int *groups; struct mutex mem_lock; unsigned int bounce_size; struct mutex domain_lock; @@ -601,6 +607,15 @@ static u32 vduse_get_vq_group(struct vdpa_device *vdpa= , u16 idx) return dev->vqs[idx]->vq_group; } =20 +static union virtio_map vduse_get_vq_map(struct vdpa_device *vdpa, u16 idx) +{ + struct vduse_dev *dev =3D vdpa_to_vduse(vdpa); + u32 vq_group =3D dev->vqs[idx]->vq_group; + union virtio_map ret =3D { .group =3D &dev->groups[vq_group] }; + + return ret; +} + static int vduse_vdpa_get_vq_state(struct vdpa_device *vdpa, u16 idx, struct vdpa_vq_state *state) { @@ -848,6 +863,7 @@ static const struct vdpa_config_ops vduse_vdpa_config_o= ps =3D { .get_vq_affinity =3D vduse_vdpa_get_vq_affinity, .reset =3D vduse_vdpa_reset, .set_map =3D vduse_vdpa_set_map, + .get_vq_map =3D vduse_get_vq_map, .free =3D vduse_vdpa_free, }; =20 @@ -855,7 +871,8 @@ static void vduse_dev_sync_single_for_device(union virt= io_map token, dma_addr_t dma_addr, size_t size, enum dma_data_direction dir) { - struct vduse_iova_domain *domain =3D token.iova_domain; + struct vduse_dev *vdev =3D token.group->dev; + struct vduse_iova_domain *domain =3D vdev->domain; =20 vduse_domain_sync_single_for_device(domain, dma_addr, size, dir); } @@ -864,7 +881,8 @@ static void vduse_dev_sync_single_for_cpu(union virtio_= map token, dma_addr_t dma_addr, size_t size, enum dma_data_direction dir) { - struct vduse_iova_domain *domain =3D token.iova_domain; + struct vduse_dev *vdev =3D token.group->dev; + struct vduse_iova_domain *domain =3D vdev->domain; =20 vduse_domain_sync_single_for_cpu(domain, dma_addr, size, dir); } @@ -874,7 +892,8 @@ static dma_addr_t vduse_dev_map_page(union virtio_map t= oken, struct page *page, enum dma_data_direction dir, unsigned long attrs) { - struct vduse_iova_domain *domain =3D token.iova_domain; + struct vduse_dev *vdev =3D token.group->dev; + struct vduse_iova_domain *domain =3D vdev->domain; =20 return vduse_domain_map_page(domain, page, offset, size, dir, attrs); } @@ -883,7 +902,8 @@ static void vduse_dev_unmap_page(union virtio_map token= , dma_addr_t dma_addr, size_t size, enum dma_data_direction dir, unsigned long attrs) { - struct vduse_iova_domain *domain =3D token.iova_domain; + struct vduse_dev *vdev =3D token.group->dev; + struct vduse_iova_domain *domain =3D vdev->domain; =20 return vduse_domain_unmap_page(domain, dma_addr, size, dir, attrs); } @@ -891,7 +911,8 @@ static void vduse_dev_unmap_page(union virtio_map token= , dma_addr_t dma_addr, static void *vduse_dev_alloc_coherent(union virtio_map token, size_t size, dma_addr_t *dma_addr, gfp_t flag) { - struct vduse_iova_domain *domain =3D token.iova_domain; + struct vduse_dev *vdev =3D token.group->dev; + struct vduse_iova_domain *domain =3D vdev->domain; unsigned long iova; void *addr; =20 @@ -910,14 +931,16 @@ static void vduse_dev_free_coherent(union virtio_map = token, size_t size, void *vaddr, dma_addr_t dma_addr, unsigned long attrs) { - struct vduse_iova_domain *domain =3D token.iova_domain; + struct vduse_dev *vdev =3D token.group->dev; + struct vduse_iova_domain *domain =3D vdev->domain; =20 vduse_domain_free_coherent(domain, size, vaddr, dma_addr, attrs); } =20 static bool vduse_dev_need_sync(union virtio_map token, dma_addr_t dma_add= r) { - struct vduse_iova_domain *domain =3D token.iova_domain; + struct vduse_dev *vdev =3D token.group->dev; + struct vduse_iova_domain *domain =3D vdev->domain; =20 return dma_addr < domain->bounce_size; } @@ -931,7 +954,8 @@ static int vduse_dev_mapping_error(union virtio_map tok= en, dma_addr_t dma_addr) =20 static size_t vduse_dev_max_mapping_size(union virtio_map token) { - struct vduse_iova_domain *domain =3D token.iova_domain; + struct vduse_dev *vdev =3D token.group->dev; + struct vduse_iova_domain *domain =3D vdev->domain; =20 return domain->bounce_size; } @@ -1737,6 +1761,7 @@ static int vduse_destroy_dev(char *name) if (dev->domain) vduse_domain_destroy(dev->domain); kfree(dev->name); + kfree(dev->groups); vduse_dev_destroy(dev); module_put(THIS_MODULE); =20 @@ -1902,7 +1927,15 @@ static int vduse_create_dev(struct vduse_dev_config = *config, dev->device_features =3D config->features; dev->device_id =3D config->device_id; dev->vendor_id =3D config->vendor_id; + dev->ngroups =3D (dev->api_version < 1) ? 1 : (config->ngroups ?: 1); + dev->groups =3D kcalloc(dev->ngroups, sizeof(dev->groups[0]), + GFP_KERNEL); + if (!dev->groups) + goto err_vq_groups; + for (u32 i =3D 0; i < dev->ngroups; ++i) + dev->groups[i].dev =3D dev; + dev->name =3D kstrdup(config->name, GFP_KERNEL); if (!dev->name) goto err_str; @@ -1939,6 +1972,8 @@ static int vduse_create_dev(struct vduse_dev_config *= config, err_idr: kfree(dev->name); err_str: + kfree(dev->groups); +err_vq_groups: vduse_dev_destroy(dev); err: return ret; @@ -2100,7 +2135,6 @@ static int vdpa_dev_add(struct vdpa_mgmt_dev *mdev, c= onst char *name, return -ENOMEM; } =20 - dev->vdev->vdpa.vmap.iova_domain =3D dev->domain; ret =3D _vdpa_register_device(&dev->vdev->vdpa, dev->vq_num); if (ret) { put_device(&dev->vdev->vdpa.dev); diff --git a/include/linux/virtio.h b/include/linux/virtio.h index 07040c7f1f4d..ff46d287a003 100644 --- a/include/linux/virtio.h +++ b/include/linux/virtio.h @@ -40,13 +40,13 @@ struct virtqueue { void *priv; }; =20 -struct vduse_iova_domain; +struct vduse_vq_group_int; =20 union virtio_map { /* Device that performs DMA */ struct device *dma_dev; - /* VDUSE specific mapping data */ - struct vduse_iova_domain *iova_domain; + /* VDUSE specific virtqueue group for doing map */ + struct vduse_vq_group_int *group; }; =20 int virtqueue_add_outbuf(struct virtqueue *vq, --=20 2.51.0 From nobody Wed Sep 24 15:20:54 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5E87E33470A for ; Tue, 26 Aug 2025 11:27:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756207664; cv=none; b=GOnN0ijmBzVT4Q/ZtYU3zWsyfy3xRg+pV2WFQxyxUCGrrmKFbpk0/e9+SyV5UsQJ3y/c7SJN/AGmYlAOSYzD9zyoQy7Q7vT6eslpjJNOj8xJrA0oxiHoD5MuS2oN//fSZ0gKz+5M8gN3uByrgAs7uLtJTW27hr1oRNpNk7Qj/Y8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756207664; c=relaxed/simple; bh=c7np7wFs5C7h4kp6DPHDmZu+HWXGPh/Vk8/YfTB0+hY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=R+duQgyXOK0ZrcskLndAFZYaMKD17RrTQAY7u6zvENlVTc7QJMJqdC/OPeUOpszHz0MUYFE2ThcZ553n0lZdB5J2pDn/LmBeVAUX1VXHc6lWEcWir2eboDsI2OSDIGDbpa/jqvRseBzn31NQWJiHe4t5EWL0Zi1AY88bWtY9h9I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=ayN4VL6l; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ayN4VL6l" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1756207660; 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=yx4vb+s5ggcUcQEddBgN/ctZ6bRxzwXy1Ly3fxABGVw=; b=ayN4VL6lMVVvakRA0LIin8Fykt8nhgtzTBOiV/It/7po2i9BCjp96CVhQmDgq/F6Nf3SMg TyMcn1wz0FVye1IwgUaRYyel+dxqDIjDpR+JRCeeosFh8iqnIB/3axRwrx6NncYiZxQN0E TfrizgEDZbQrEvn/hLDa/7yfsyRFN6M= Received: from mx-prod-mc-06.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-348-xFH7A1pwP3GVWuE7v-3eaA-1; Tue, 26 Aug 2025 07:27:35 -0400 X-MC-Unique: xFH7A1pwP3GVWuE7v-3eaA-1 X-Mimecast-MFC-AGG-ID: xFH7A1pwP3GVWuE7v-3eaA_1756207654 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6ED6A180035C; Tue, 26 Aug 2025 11:27:34 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.224.67]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 63E071800280; Tue, 26 Aug 2025 11:27:29 +0000 (UTC) From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: "Michael S . Tsirkin " Cc: =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Cindy Lu , Stefano Garzarella , Xuan Zhuo , Laurent Vivier , virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, jasowang@redhat.com, Yongji Xie , Maxime Coquelin Subject: [PATCH 4/6] vduse: create vduse_as to make it an array Date: Tue, 26 Aug 2025 13:27:07 +0200 Message-ID: <20250826112709.1051172-5-eperezma@redhat.com> In-Reply-To: <20250826112709.1051172-1-eperezma@redhat.com> References: <20250826112709.1051172-1-eperezma@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 This is a first step so we can make more than one different address spaces. No change on the colde flow intended. Signed-off-by: Eugenio P=C3=A9rez Acked-by: Jason Wang --- drivers/vdpa/vdpa_user/vduse_dev.c | 114 +++++++++++++++-------------- 1 file changed, 59 insertions(+), 55 deletions(-) diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vd= use_dev.c index cdb3dc2b5e3f..7d2a3ed77b1e 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -85,6 +85,12 @@ struct vduse_umem { struct mm_struct *mm; }; =20 +struct vduse_as { + struct vduse_iova_domain *domain; + struct vduse_umem *umem; + struct mutex mem_lock; +}; + struct vduse_vq_group_int { struct vduse_dev *dev; }; @@ -93,7 +99,7 @@ struct vduse_dev { struct vduse_vdpa *vdev; struct device *dev; struct vduse_virtqueue **vqs; - struct vduse_iova_domain *domain; + struct vduse_as as; char *name; struct mutex lock; spinlock_t msg_lock; @@ -121,9 +127,7 @@ struct vduse_dev { u32 vq_num; u32 vq_align; u32 ngroups; - struct vduse_umem *umem; struct vduse_vq_group_int *groups; - struct mutex mem_lock; unsigned int bounce_size; struct mutex domain_lock; }; @@ -438,7 +442,7 @@ static __poll_t vduse_dev_poll(struct file *file, poll_= table *wait) static void vduse_dev_reset(struct vduse_dev *dev) { int i; - struct vduse_iova_domain *domain =3D dev->domain; + struct vduse_iova_domain *domain =3D dev->as.domain; =20 /* The coherent mappings are handled in vduse_dev_free_coherent() */ if (domain && domain->bounce_map) @@ -814,13 +818,13 @@ static int vduse_vdpa_set_map(struct vdpa_device *vdp= a, struct vduse_dev *dev =3D vdpa_to_vduse(vdpa); int ret; =20 - ret =3D vduse_domain_set_map(dev->domain, iotlb); + ret =3D vduse_domain_set_map(dev->as.domain, iotlb); if (ret) return ret; =20 ret =3D vduse_dev_update_iotlb(dev, 0ULL, ULLONG_MAX); if (ret) { - vduse_domain_clear_map(dev->domain, iotlb); + vduse_domain_clear_map(dev->as.domain, iotlb); return ret; } =20 @@ -872,7 +876,7 @@ static void vduse_dev_sync_single_for_device(union virt= io_map token, enum dma_data_direction dir) { struct vduse_dev *vdev =3D token.group->dev; - struct vduse_iova_domain *domain =3D vdev->domain; + struct vduse_iova_domain *domain =3D vdev->as.domain; =20 vduse_domain_sync_single_for_device(domain, dma_addr, size, dir); } @@ -882,7 +886,7 @@ static void vduse_dev_sync_single_for_cpu(union virtio_= map token, enum dma_data_direction dir) { struct vduse_dev *vdev =3D token.group->dev; - struct vduse_iova_domain *domain =3D vdev->domain; + struct vduse_iova_domain *domain =3D vdev->as.domain; =20 vduse_domain_sync_single_for_cpu(domain, dma_addr, size, dir); } @@ -893,7 +897,7 @@ static dma_addr_t vduse_dev_map_page(union virtio_map t= oken, struct page *page, unsigned long attrs) { struct vduse_dev *vdev =3D token.group->dev; - struct vduse_iova_domain *domain =3D vdev->domain; + struct vduse_iova_domain *domain =3D vdev->as.domain; =20 return vduse_domain_map_page(domain, page, offset, size, dir, attrs); } @@ -903,7 +907,7 @@ static void vduse_dev_unmap_page(union virtio_map token= , dma_addr_t dma_addr, unsigned long attrs) { struct vduse_dev *vdev =3D token.group->dev; - struct vduse_iova_domain *domain =3D vdev->domain; + struct vduse_iova_domain *domain =3D vdev->as.domain; =20 return vduse_domain_unmap_page(domain, dma_addr, size, dir, attrs); } @@ -912,7 +916,7 @@ static void *vduse_dev_alloc_coherent(union virtio_map = token, size_t size, dma_addr_t *dma_addr, gfp_t flag) { struct vduse_dev *vdev =3D token.group->dev; - struct vduse_iova_domain *domain =3D vdev->domain; + struct vduse_iova_domain *domain =3D vdev->as.domain; unsigned long iova; void *addr; =20 @@ -932,7 +936,7 @@ static void vduse_dev_free_coherent(union virtio_map to= ken, size_t size, unsigned long attrs) { struct vduse_dev *vdev =3D token.group->dev; - struct vduse_iova_domain *domain =3D vdev->domain; + struct vduse_iova_domain *domain =3D vdev->as.domain; =20 vduse_domain_free_coherent(domain, size, vaddr, dma_addr, attrs); } @@ -940,7 +944,7 @@ static void vduse_dev_free_coherent(union virtio_map to= ken, size_t size, static bool vduse_dev_need_sync(union virtio_map token, dma_addr_t dma_add= r) { struct vduse_dev *vdev =3D token.group->dev; - struct vduse_iova_domain *domain =3D vdev->domain; + struct vduse_iova_domain *domain =3D vdev->as.domain; =20 return dma_addr < domain->bounce_size; } @@ -955,7 +959,7 @@ static int vduse_dev_mapping_error(union virtio_map tok= en, dma_addr_t dma_addr) static size_t vduse_dev_max_mapping_size(union virtio_map token) { struct vduse_dev *vdev =3D token.group->dev; - struct vduse_iova_domain *domain =3D vdev->domain; + struct vduse_iova_domain *domain =3D vdev->as.domain; =20 return domain->bounce_size; } @@ -1102,29 +1106,29 @@ static int vduse_dev_dereg_umem(struct vduse_dev *d= ev, { int ret; =20 - mutex_lock(&dev->mem_lock); + mutex_lock(&dev->as.mem_lock); ret =3D -ENOENT; - if (!dev->umem) + if (!dev->as.umem) goto unlock; =20 ret =3D -EINVAL; - if (!dev->domain) + if (!dev->as.domain) goto unlock; =20 - if (dev->umem->iova !=3D iova || size !=3D dev->domain->bounce_size) + if (dev->as.umem->iova !=3D iova || size !=3D dev->as.domain->bounce_size) goto unlock; =20 - vduse_domain_remove_user_bounce_pages(dev->domain); - unpin_user_pages_dirty_lock(dev->umem->pages, - dev->umem->npages, true); - atomic64_sub(dev->umem->npages, &dev->umem->mm->pinned_vm); - mmdrop(dev->umem->mm); - vfree(dev->umem->pages); - kfree(dev->umem); - dev->umem =3D NULL; + vduse_domain_remove_user_bounce_pages(dev->as.domain); + unpin_user_pages_dirty_lock(dev->as.umem->pages, + dev->as.umem->npages, true); + atomic64_sub(dev->as.umem->npages, &dev->as.umem->mm->pinned_vm); + mmdrop(dev->as.umem->mm); + vfree(dev->as.umem->pages); + kfree(dev->as.umem); + dev->as.umem =3D NULL; ret =3D 0; unlock: - mutex_unlock(&dev->mem_lock); + mutex_unlock(&dev->as.mem_lock); return ret; } =20 @@ -1137,14 +1141,14 @@ static int vduse_dev_reg_umem(struct vduse_dev *dev, unsigned long npages, lock_limit; int ret; =20 - if (!dev->domain || !dev->domain->bounce_map || - size !=3D dev->domain->bounce_size || + if (!dev->as.domain || !dev->as.domain->bounce_map || + size !=3D dev->as.domain->bounce_size || iova !=3D 0 || uaddr & ~PAGE_MASK) return -EINVAL; =20 - mutex_lock(&dev->mem_lock); + mutex_lock(&dev->as.mem_lock); ret =3D -EEXIST; - if (dev->umem) + if (dev->as.umem) goto unlock; =20 ret =3D -ENOMEM; @@ -1168,7 +1172,7 @@ static int vduse_dev_reg_umem(struct vduse_dev *dev, goto out; } =20 - ret =3D vduse_domain_add_user_bounce_pages(dev->domain, + ret =3D vduse_domain_add_user_bounce_pages(dev->as.domain, page_list, pinned); if (ret) goto out; @@ -1181,7 +1185,7 @@ static int vduse_dev_reg_umem(struct vduse_dev *dev, umem->mm =3D current->mm; mmgrab(current->mm); =20 - dev->umem =3D umem; + dev->as.umem =3D umem; out: if (ret && pinned > 0) unpin_user_pages(page_list, pinned); @@ -1192,7 +1196,7 @@ static int vduse_dev_reg_umem(struct vduse_dev *dev, vfree(page_list); kfree(umem); } - mutex_unlock(&dev->mem_lock); + mutex_unlock(&dev->as.mem_lock); return ret; } =20 @@ -1238,12 +1242,12 @@ static long vduse_dev_ioctl(struct file *file, unsi= gned int cmd, break; =20 mutex_lock(&dev->domain_lock); - if (!dev->domain) { + if (!dev->as.domain) { mutex_unlock(&dev->domain_lock); break; } - spin_lock(&dev->domain->iotlb_lock); - map =3D vhost_iotlb_itree_first(dev->domain->iotlb, + spin_lock(&dev->as.domain->iotlb_lock); + map =3D vhost_iotlb_itree_first(dev->as.domain->iotlb, entry.start, entry.last); if (map) { map_file =3D (struct vdpa_map_file *)map->opaque; @@ -1253,7 +1257,7 @@ static long vduse_dev_ioctl(struct file *file, unsign= ed int cmd, entry.last =3D map->last; entry.perm =3D map->perm; } - spin_unlock(&dev->domain->iotlb_lock); + spin_unlock(&dev->as.domain->iotlb_lock); mutex_unlock(&dev->domain_lock); ret =3D -EINVAL; if (!f) @@ -1447,22 +1451,22 @@ static long vduse_dev_ioctl(struct file *file, unsi= gned int cmd, break; =20 mutex_lock(&dev->domain_lock); - if (!dev->domain) { + if (!dev->as.domain) { mutex_unlock(&dev->domain_lock); break; } - spin_lock(&dev->domain->iotlb_lock); - map =3D vhost_iotlb_itree_first(dev->domain->iotlb, + spin_lock(&dev->as.domain->iotlb_lock); + map =3D vhost_iotlb_itree_first(dev->as.domain->iotlb, info.start, info.last); if (map) { info.start =3D map->start; info.last =3D map->last; info.capability =3D 0; - if (dev->domain->bounce_map && map->start =3D=3D 0 && - map->last =3D=3D dev->domain->bounce_size - 1) + if (dev->as.domain->bounce_map && map->start =3D=3D 0 && + map->last =3D=3D dev->as.domain->bounce_size - 1) info.capability |=3D VDUSE_IOVA_CAP_UMEM; } - spin_unlock(&dev->domain->iotlb_lock); + spin_unlock(&dev->as.domain->iotlb_lock); mutex_unlock(&dev->domain_lock); if (!map) break; @@ -1487,8 +1491,8 @@ static int vduse_dev_release(struct inode *inode, str= uct file *file) struct vduse_dev *dev =3D file->private_data; =20 mutex_lock(&dev->domain_lock); - if (dev->domain) - vduse_dev_dereg_umem(dev, 0, dev->domain->bounce_size); + if (dev->as.domain) + vduse_dev_dereg_umem(dev, 0, dev->as.domain->bounce_size); mutex_unlock(&dev->domain_lock); spin_lock(&dev->msg_lock); /* Make sure the inflight messages can processed after reconncection */ @@ -1707,7 +1711,7 @@ static struct vduse_dev *vduse_dev_create(void) return NULL; =20 mutex_init(&dev->lock); - mutex_init(&dev->mem_lock); + mutex_init(&dev->as.mem_lock); mutex_init(&dev->domain_lock); spin_lock_init(&dev->msg_lock); INIT_LIST_HEAD(&dev->send_list); @@ -1758,8 +1762,8 @@ static int vduse_destroy_dev(char *name) idr_remove(&vduse_idr, dev->minor); kvfree(dev->config); vduse_dev_deinit_vqs(dev); - if (dev->domain) - vduse_domain_destroy(dev->domain); + if (dev->as.domain) + vduse_domain_destroy(dev->as.domain); kfree(dev->name); kfree(dev->groups); vduse_dev_destroy(dev); @@ -1875,7 +1879,7 @@ static ssize_t bounce_size_store(struct device *devic= e, =20 ret =3D -EPERM; mutex_lock(&dev->domain_lock); - if (dev->domain) + if (dev->as.domain) goto unlock; =20 ret =3D kstrtouint(buf, 10, &bounce_size); @@ -2126,11 +2130,11 @@ static int vdpa_dev_add(struct vdpa_mgmt_dev *mdev,= const char *name, return ret; =20 mutex_lock(&dev->domain_lock); - if (!dev->domain) - dev->domain =3D vduse_domain_create(VDUSE_IOVA_SIZE - 1, + if (!dev->as.domain) + dev->as.domain =3D vduse_domain_create(VDUSE_IOVA_SIZE - 1, dev->bounce_size); mutex_unlock(&dev->domain_lock); - if (!dev->domain) { + if (!dev->as.domain) { put_device(&dev->vdev->vdpa.dev); return -ENOMEM; } @@ -2139,8 +2143,8 @@ static int vdpa_dev_add(struct vdpa_mgmt_dev *mdev, c= onst char *name, if (ret) { put_device(&dev->vdev->vdpa.dev); mutex_lock(&dev->domain_lock); - vduse_domain_destroy(dev->domain); - dev->domain =3D NULL; + vduse_domain_destroy(dev->as.domain); + dev->as.domain =3D NULL; mutex_unlock(&dev->domain_lock); return ret; } --=20 2.51.0 From nobody Wed Sep 24 15:20:54 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 84C35322754 for ; Tue, 26 Aug 2025 11:27:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756207669; cv=none; b=PMZOfaOhrrwCEt5r16rzvOuJOA2XrEp+yPvQRAO+enAxWVVhRMG38Rq6hac+QTrXnywi+rB64CEZDOMZCe5NHMnFxFzEcMVpcXfT+KTBBVylS9FWEqQE+41KklIjUQsXa7NHVuA5bjINno/feo+gZacVpAUAX1tlMqCFH5HgfQ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756207669; c=relaxed/simple; bh=n1P74rmJHzfV0VHe8XcwFFaiUagkGFrJxDmEgNawlR4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=hdL6WpUzRZa4naLPmV/CHPH4AYtD5CCe0kyrU/jPJhKPlRysa4pnj5eTwpV2S9WmW05QFEDuu5UzfL3At7VVGJ82kgtj97LI+Gfj1ThMTP6+5+S/OHI95y+tqbB/k0dGeStJbHsZ9C+es46vQptQk3Lbsmtl1fJ1lwm7TcYt9Hw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Wg/q2bMo; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Wg/q2bMo" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1756207664; 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=8dW7HVxHm0N1n8grSl+VHThG5ocu5hlcRlAA5xmYzPY=; b=Wg/q2bMoV3FVmBPAGqxL6al/nkkraRLVZDwiRjgsj33cw9qUkttrVzWYZJ2e1x3SvyiyMF Sbi731ll3gr7ajq6I+8neqpPsX7k/3R0afaTMdbeFum1Sdxt2QcJmQWnDMRs9btdGpZKqy dLbbaPNzvEgCWRILz5Pq010OHtKG+wk= 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-637-YcPCB_gfPgO43Gw8gpTyvQ-1; Tue, 26 Aug 2025 07:27:40 -0400 X-MC-Unique: YcPCB_gfPgO43Gw8gpTyvQ-1 X-Mimecast-MFC-AGG-ID: YcPCB_gfPgO43Gw8gpTyvQ_1756207659 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 F0ED81800347; Tue, 26 Aug 2025 11:27:38 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.224.67]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 02D52180047F; Tue, 26 Aug 2025 11:27:34 +0000 (UTC) From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: "Michael S . Tsirkin " Cc: =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Cindy Lu , Stefano Garzarella , Xuan Zhuo , Laurent Vivier , virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, jasowang@redhat.com, Yongji Xie , Maxime Coquelin Subject: [PATCH 5/6] vduse: add vq group asid support Date: Tue, 26 Aug 2025 13:27:08 +0200 Message-ID: <20250826112709.1051172-6-eperezma@redhat.com> In-Reply-To: <20250826112709.1051172-1-eperezma@redhat.com> References: <20250826112709.1051172-1-eperezma@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Add support for assigning Address Space Identifiers (ASIDs) to each VQ group. This enables mapping each group into a distinct memory space. Now that the driver can change ASID in the middle of operation, the domain that each vq address point is also protected by domain_lock. Signed-off-by: Eugenio P=C3=A9rez --- v3: * Increase VDUSE_MAX_VQ_GROUPS to 0xffff (Jason). It was set to a lower value to reduce memory consumption, but vqs are already limited to that value and userspace VDUSE is able to allocate that many vqs. * Remove TODO about merging VDUSE_IOTLB_GET_FD ioctl with VDUSE_IOTLB_GET_INFO. * Use of array_index_nospec in VDUSE device ioctls. * Embed vduse_iotlb_entry into vduse_iotlb_entry_v2. * Move the umem mutex to asid struct so there is no contention between ASIDs. v2: * Make iotlb entry the last one of vduse_iotlb_entry_v2 so the first part of the struct is the same. --- drivers/vdpa/vdpa_user/vduse_dev.c | 290 +++++++++++++++++++++-------- include/uapi/linux/vduse.h | 52 +++++- 2 files changed, 259 insertions(+), 83 deletions(-) diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vd= use_dev.c index 7d2a3ed77b1e..2fb227713972 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -92,6 +92,7 @@ struct vduse_as { }; =20 struct vduse_vq_group_int { + struct vduse_iova_domain *domain; struct vduse_dev *dev; }; =20 @@ -99,7 +100,7 @@ struct vduse_dev { struct vduse_vdpa *vdev; struct device *dev; struct vduse_virtqueue **vqs; - struct vduse_as as; + struct vduse_as *as; char *name; struct mutex lock; spinlock_t msg_lock; @@ -127,6 +128,7 @@ struct vduse_dev { u32 vq_num; u32 vq_align; u32 ngroups; + u32 nas; struct vduse_vq_group_int *groups; unsigned int bounce_size; struct mutex domain_lock; @@ -317,7 +319,7 @@ static int vduse_dev_set_status(struct vduse_dev *dev, = u8 status) return vduse_dev_msg_sync(dev, &msg); } =20 -static int vduse_dev_update_iotlb(struct vduse_dev *dev, +static int vduse_dev_update_iotlb(struct vduse_dev *dev, u32 asid, u64 start, u64 last) { struct vduse_dev_msg msg =3D { 0 }; @@ -326,8 +328,14 @@ static int vduse_dev_update_iotlb(struct vduse_dev *de= v, return -EINVAL; =20 msg.req.type =3D VDUSE_UPDATE_IOTLB; - msg.req.iova.start =3D start; - msg.req.iova.last =3D last; + if (dev->api_version < VDUSE_API_VERSION_1) { + msg.req.iova.start =3D start; + msg.req.iova.last =3D last; + } else { + msg.req.iova_v2.start =3D start; + msg.req.iova_v2.last =3D last; + msg.req.iova_v2.asid =3D asid; + } =20 return vduse_dev_msg_sync(dev, &msg); } @@ -439,14 +447,28 @@ static __poll_t vduse_dev_poll(struct file *file, pol= l_table *wait) return mask; } =20 +/* Force set the asid to a vq group without a message to the VDUSE device = */ +static void vduse_set_group_asid_nomsg(struct vduse_dev *dev, + unsigned int group, unsigned int asid) +{ + guard(mutex)(&dev->domain_lock); + dev->groups[group].domain =3D dev->as[asid].domain; +} + static void vduse_dev_reset(struct vduse_dev *dev) { int i; - struct vduse_iova_domain *domain =3D dev->as.domain; =20 /* The coherent mappings are handled in vduse_dev_free_coherent() */ - if (domain && domain->bounce_map) - vduse_domain_reset_bounce_map(domain); + for (i =3D 0; i < dev->nas; i++) { + struct vduse_iova_domain *domain =3D dev->as[i].domain; + + if (domain && domain->bounce_map) + vduse_domain_reset_bounce_map(domain); + } + + for (i =3D 0; i < dev->ngroups; i++) + vduse_set_group_asid_nomsg(dev, i, 0); =20 down_write(&dev->rwsem); =20 @@ -620,6 +642,29 @@ static union virtio_map vduse_get_vq_map(struct vdpa_d= evice *vdpa, u16 idx) return ret; } =20 +static int vduse_set_group_asid(struct vdpa_device *vdpa, unsigned int gro= up, + unsigned int asid) +{ + struct vduse_dev *dev =3D vdpa_to_vduse(vdpa); + struct vduse_dev_msg msg =3D { 0 }; + int r; + + if (dev->api_version < VDUSE_API_VERSION_1 || + group >=3D dev->ngroups || asid >=3D dev->nas) + return -EINVAL; + + msg.req.type =3D VDUSE_SET_VQ_GROUP_ASID; + msg.req.vq_group_asid.group =3D group; + msg.req.vq_group_asid.asid =3D asid; + + r =3D vduse_dev_msg_sync(dev, &msg); + if (r < 0) + return r; + + vduse_set_group_asid_nomsg(dev, group, asid); + return 0; +} + static int vduse_vdpa_get_vq_state(struct vdpa_device *vdpa, u16 idx, struct vdpa_vq_state *state) { @@ -818,13 +863,13 @@ static int vduse_vdpa_set_map(struct vdpa_device *vdp= a, struct vduse_dev *dev =3D vdpa_to_vduse(vdpa); int ret; =20 - ret =3D vduse_domain_set_map(dev->as.domain, iotlb); + ret =3D vduse_domain_set_map(dev->as[asid].domain, iotlb); if (ret) return ret; =20 - ret =3D vduse_dev_update_iotlb(dev, 0ULL, ULLONG_MAX); + ret =3D vduse_dev_update_iotlb(dev, asid, 0ULL, ULLONG_MAX); if (ret) { - vduse_domain_clear_map(dev->as.domain, iotlb); + vduse_domain_clear_map(dev->as[asid].domain, iotlb); return ret; } =20 @@ -867,6 +912,7 @@ static const struct vdpa_config_ops vduse_vdpa_config_o= ps =3D { .get_vq_affinity =3D vduse_vdpa_get_vq_affinity, .reset =3D vduse_vdpa_reset, .set_map =3D vduse_vdpa_set_map, + .set_group_asid =3D vduse_set_group_asid, .get_vq_map =3D vduse_get_vq_map, .free =3D vduse_vdpa_free, }; @@ -876,8 +922,10 @@ static void vduse_dev_sync_single_for_device(union vir= tio_map token, enum dma_data_direction dir) { struct vduse_dev *vdev =3D token.group->dev; - struct vduse_iova_domain *domain =3D vdev->as.domain; + struct vduse_iova_domain *domain; =20 + guard(mutex)(&vdev->domain_lock); + domain =3D token.group->domain; vduse_domain_sync_single_for_device(domain, dma_addr, size, dir); } =20 @@ -886,8 +934,10 @@ static void vduse_dev_sync_single_for_cpu(union virtio= _map token, enum dma_data_direction dir) { struct vduse_dev *vdev =3D token.group->dev; - struct vduse_iova_domain *domain =3D vdev->as.domain; + struct vduse_iova_domain *domain; =20 + guard(mutex)(&vdev->domain_lock); + domain =3D token.group->domain; vduse_domain_sync_single_for_cpu(domain, dma_addr, size, dir); } =20 @@ -897,8 +947,10 @@ static dma_addr_t vduse_dev_map_page(union virtio_map = token, struct page *page, unsigned long attrs) { struct vduse_dev *vdev =3D token.group->dev; - struct vduse_iova_domain *domain =3D vdev->as.domain; + struct vduse_iova_domain *domain; =20 + guard(mutex)(&vdev->domain_lock); + domain =3D token.group->domain; return vduse_domain_map_page(domain, page, offset, size, dir, attrs); } =20 @@ -907,8 +959,10 @@ static void vduse_dev_unmap_page(union virtio_map toke= n, dma_addr_t dma_addr, unsigned long attrs) { struct vduse_dev *vdev =3D token.group->dev; - struct vduse_iova_domain *domain =3D vdev->as.domain; + struct vduse_iova_domain *domain; =20 + guard(mutex)(&vdev->domain_lock); + domain =3D token.group->domain; return vduse_domain_unmap_page(domain, dma_addr, size, dir, attrs); } =20 @@ -916,11 +970,13 @@ static void *vduse_dev_alloc_coherent(union virtio_ma= p token, size_t size, dma_addr_t *dma_addr, gfp_t flag) { struct vduse_dev *vdev =3D token.group->dev; - struct vduse_iova_domain *domain =3D vdev->as.domain; + struct vduse_iova_domain *domain; unsigned long iova; void *addr; =20 *dma_addr =3D DMA_MAPPING_ERROR; + guard(mutex)(&vdev->domain_lock); + domain =3D token.group->domain; addr =3D vduse_domain_alloc_coherent(domain, size, (dma_addr_t *)&iova, flag); if (!addr) @@ -936,16 +992,20 @@ static void vduse_dev_free_coherent(union virtio_map = token, size_t size, unsigned long attrs) { struct vduse_dev *vdev =3D token.group->dev; - struct vduse_iova_domain *domain =3D vdev->as.domain; + struct vduse_iova_domain *domain; =20 + guard(mutex)(&vdev->domain_lock); + domain =3D token.group->domain; vduse_domain_free_coherent(domain, size, vaddr, dma_addr, attrs); } =20 static bool vduse_dev_need_sync(union virtio_map token, dma_addr_t dma_add= r) { struct vduse_dev *vdev =3D token.group->dev; - struct vduse_iova_domain *domain =3D vdev->as.domain; + struct vduse_iova_domain *domain; =20 + guard(mutex)(&vdev->domain_lock); + domain =3D token.group->domain; return dma_addr < domain->bounce_size; } =20 @@ -959,8 +1019,10 @@ static int vduse_dev_mapping_error(union virtio_map t= oken, dma_addr_t dma_addr) static size_t vduse_dev_max_mapping_size(union virtio_map token) { struct vduse_dev *vdev =3D token.group->dev; - struct vduse_iova_domain *domain =3D vdev->as.domain; + struct vduse_iova_domain *domain; =20 + guard(mutex)(&vdev->domain_lock); + domain =3D token.group->domain; return domain->bounce_size; } =20 @@ -1101,39 +1163,40 @@ static int vduse_dev_queue_irq_work(struct vduse_de= v *dev, return ret; } =20 -static int vduse_dev_dereg_umem(struct vduse_dev *dev, +static int vduse_dev_dereg_umem(struct vduse_dev *dev, u32 asid, u64 iova, u64 size) { int ret; =20 - mutex_lock(&dev->as.mem_lock); + mutex_lock(&dev->as[asid].mem_lock); ret =3D -ENOENT; - if (!dev->as.umem) + if (!dev->as[asid].umem) goto unlock; =20 ret =3D -EINVAL; - if (!dev->as.domain) + if (!dev->as[asid].domain) goto unlock; =20 - if (dev->as.umem->iova !=3D iova || size !=3D dev->as.domain->bounce_size) + if (dev->as[asid].umem->iova !=3D iova || + size !=3D dev->as[asid].domain->bounce_size) goto unlock; =20 - vduse_domain_remove_user_bounce_pages(dev->as.domain); - unpin_user_pages_dirty_lock(dev->as.umem->pages, - dev->as.umem->npages, true); - atomic64_sub(dev->as.umem->npages, &dev->as.umem->mm->pinned_vm); - mmdrop(dev->as.umem->mm); - vfree(dev->as.umem->pages); - kfree(dev->as.umem); - dev->as.umem =3D NULL; + vduse_domain_remove_user_bounce_pages(dev->as[asid].domain); + unpin_user_pages_dirty_lock(dev->as[asid].umem->pages, + dev->as[asid].umem->npages, true); + atomic64_sub(dev->as[asid].umem->npages, &dev->as[asid].umem->mm->pinned_= vm); + mmdrop(dev->as[asid].umem->mm); + vfree(dev->as[asid].umem->pages); + kfree(dev->as[asid].umem); + dev->as[asid].umem =3D NULL; ret =3D 0; unlock: - mutex_unlock(&dev->as.mem_lock); + mutex_unlock(&dev->as[asid].mem_lock); return ret; } =20 static int vduse_dev_reg_umem(struct vduse_dev *dev, - u64 iova, u64 uaddr, u64 size) + u32 asid, u64 iova, u64 uaddr, u64 size) { struct page **page_list =3D NULL; struct vduse_umem *umem =3D NULL; @@ -1141,14 +1204,14 @@ static int vduse_dev_reg_umem(struct vduse_dev *dev, unsigned long npages, lock_limit; int ret; =20 - if (!dev->as.domain || !dev->as.domain->bounce_map || - size !=3D dev->as.domain->bounce_size || + if (!dev->as[asid].domain || !dev->as[asid].domain->bounce_map || + size !=3D dev->as[asid].domain->bounce_size || iova !=3D 0 || uaddr & ~PAGE_MASK) return -EINVAL; =20 - mutex_lock(&dev->as.mem_lock); + mutex_lock(&dev->as[asid].mem_lock); ret =3D -EEXIST; - if (dev->as.umem) + if (dev->as[asid].umem) goto unlock; =20 ret =3D -ENOMEM; @@ -1172,7 +1235,7 @@ static int vduse_dev_reg_umem(struct vduse_dev *dev, goto out; } =20 - ret =3D vduse_domain_add_user_bounce_pages(dev->as.domain, + ret =3D vduse_domain_add_user_bounce_pages(dev->as[asid].domain, page_list, pinned); if (ret) goto out; @@ -1185,7 +1248,7 @@ static int vduse_dev_reg_umem(struct vduse_dev *dev, umem->mm =3D current->mm; mmgrab(current->mm); =20 - dev->as.umem =3D umem; + dev->as[asid].umem =3D umem; out: if (ret && pinned > 0) unpin_user_pages(page_list, pinned); @@ -1196,7 +1259,7 @@ static int vduse_dev_reg_umem(struct vduse_dev *dev, vfree(page_list); kfree(umem); } - mutex_unlock(&dev->as.mem_lock); + mutex_unlock(&dev->as[asid].mem_lock); return ret; } =20 @@ -1228,47 +1291,66 @@ static long vduse_dev_ioctl(struct file *file, unsi= gned int cmd, =20 switch (cmd) { case VDUSE_IOTLB_GET_FD: { - struct vduse_iotlb_entry entry; + struct vduse_iotlb_entry_v2 entry; struct vhost_iotlb_map *map; struct vdpa_map_file *map_file; struct file *f =3D NULL; + u32 asid; =20 ret =3D -EFAULT; - if (copy_from_user(&entry, argp, sizeof(entry))) - break; + if (dev->api_version >=3D VDUSE_API_VERSION_1) { + if (copy_from_user(&entry, argp, sizeof(entry))) + break; + } else { + entry.asid =3D 0; + if (copy_from_user(&entry.v1, argp, + sizeof(entry.v1))) + break; + } =20 ret =3D -EINVAL; - if (entry.start > entry.last) + if (entry.v1.start > entry.v1.last) + break; + + if (entry.asid >=3D dev->nas) break; =20 mutex_lock(&dev->domain_lock); - if (!dev->as.domain) { + asid =3D array_index_nospec(entry.asid, dev->nas); + if (!dev->as[asid].domain) { mutex_unlock(&dev->domain_lock); break; } - spin_lock(&dev->as.domain->iotlb_lock); - map =3D vhost_iotlb_itree_first(dev->as.domain->iotlb, - entry.start, entry.last); + spin_lock(&dev->as[asid].domain->iotlb_lock); + map =3D vhost_iotlb_itree_first(dev->as[asid].domain->iotlb, + entry.v1.start, entry.v1.last); if (map) { map_file =3D (struct vdpa_map_file *)map->opaque; f =3D get_file(map_file->file); - entry.offset =3D map_file->offset; - entry.start =3D map->start; - entry.last =3D map->last; - entry.perm =3D map->perm; + entry.v1.offset =3D map_file->offset; + entry.v1.start =3D map->start; + entry.v1.last =3D map->last; + entry.v1.perm =3D map->perm; } - spin_unlock(&dev->as.domain->iotlb_lock); + spin_unlock(&dev->as[asid].domain->iotlb_lock); mutex_unlock(&dev->domain_lock); ret =3D -EINVAL; if (!f) break; =20 ret =3D -EFAULT; - if (copy_to_user(argp, &entry, sizeof(entry))) { + if (dev->api_version >=3D VDUSE_API_VERSION_1) + ret =3D copy_to_user(argp, &entry, + sizeof(entry)); + else + ret =3D copy_to_user(argp, &entry.v1, + sizeof(entry.v1)); + + if (ret) { fput(f); break; } - ret =3D receive_fd(f, NULL, perm_to_file_flags(entry.perm)); + ret =3D receive_fd(f, NULL, perm_to_file_flags(entry.v1.perm)); fput(f); break; } @@ -1401,6 +1483,7 @@ static long vduse_dev_ioctl(struct file *file, unsign= ed int cmd, } case VDUSE_IOTLB_REG_UMEM: { struct vduse_iova_umem umem; + u32 asid; =20 ret =3D -EFAULT; if (copy_from_user(&umem, argp, sizeof(umem))) @@ -1408,17 +1491,21 @@ static long vduse_dev_ioctl(struct file *file, unsi= gned int cmd, =20 ret =3D -EINVAL; if (!is_mem_zero((const char *)umem.reserved, - sizeof(umem.reserved))) + sizeof(umem.reserved)) || + (dev->api_version < VDUSE_API_VERSION_1 && + umem.asid !=3D 0) || umem.asid >=3D dev->nas) break; =20 mutex_lock(&dev->domain_lock); - ret =3D vduse_dev_reg_umem(dev, umem.iova, + asid =3D array_index_nospec(umem.asid, dev->nas); + ret =3D vduse_dev_reg_umem(dev, asid, umem.iova, umem.uaddr, umem.size); mutex_unlock(&dev->domain_lock); break; } case VDUSE_IOTLB_DEREG_UMEM: { struct vduse_iova_umem umem; + u32 asid; =20 ret =3D -EFAULT; if (copy_from_user(&umem, argp, sizeof(umem))) @@ -1426,10 +1513,15 @@ static long vduse_dev_ioctl(struct file *file, unsi= gned int cmd, =20 ret =3D -EINVAL; if (!is_mem_zero((const char *)umem.reserved, - sizeof(umem.reserved))) + sizeof(umem.reserved)) || + (dev->api_version < VDUSE_API_VERSION_1 && + umem.asid !=3D 0) || + umem.asid >=3D dev->nas) break; + mutex_lock(&dev->domain_lock); - ret =3D vduse_dev_dereg_umem(dev, umem.iova, + asid =3D array_index_nospec(umem.asid, dev->nas); + ret =3D vduse_dev_dereg_umem(dev, asid, umem.iova, umem.size); mutex_unlock(&dev->domain_lock); break; @@ -1437,6 +1529,7 @@ static long vduse_dev_ioctl(struct file *file, unsign= ed int cmd, case VDUSE_IOTLB_GET_INFO: { struct vduse_iova_info info; struct vhost_iotlb_map *map; + u32 asid; =20 ret =3D -EFAULT; if (copy_from_user(&info, argp, sizeof(info))) @@ -1450,23 +1543,31 @@ static long vduse_dev_ioctl(struct file *file, unsi= gned int cmd, sizeof(info.reserved))) break; =20 + if (dev->api_version < VDUSE_API_VERSION_1) { + if (info.asid) + break; + } else if (info.asid >=3D dev->nas) + break; + mutex_lock(&dev->domain_lock); - if (!dev->as.domain) { + asid =3D array_index_nospec(info.asid, dev->nas); + if (!dev->as[asid].domain) { mutex_unlock(&dev->domain_lock); break; } - spin_lock(&dev->as.domain->iotlb_lock); - map =3D vhost_iotlb_itree_first(dev->as.domain->iotlb, + spin_lock(&dev->as[asid].domain->iotlb_lock); + map =3D vhost_iotlb_itree_first(dev->as[asid].domain->iotlb, info.start, info.last); if (map) { info.start =3D map->start; info.last =3D map->last; info.capability =3D 0; - if (dev->as.domain->bounce_map && map->start =3D=3D 0 && - map->last =3D=3D dev->as.domain->bounce_size - 1) + if (dev->as[asid].domain->bounce_map && + map->start =3D=3D 0 && + map->last =3D=3D dev->as[asid].domain->bounce_size - 1) info.capability |=3D VDUSE_IOVA_CAP_UMEM; } - spin_unlock(&dev->as.domain->iotlb_lock); + spin_unlock(&dev->as[asid].domain->iotlb_lock); mutex_unlock(&dev->domain_lock); if (!map) break; @@ -1491,8 +1592,10 @@ static int vduse_dev_release(struct inode *inode, st= ruct file *file) struct vduse_dev *dev =3D file->private_data; =20 mutex_lock(&dev->domain_lock); - if (dev->as.domain) - vduse_dev_dereg_umem(dev, 0, dev->as.domain->bounce_size); + for (int i =3D 0; i < dev->nas; i++) + if (dev->as[i].domain) + vduse_dev_dereg_umem(dev, i, 0, + dev->as[i].domain->bounce_size); mutex_unlock(&dev->domain_lock); spin_lock(&dev->msg_lock); /* Make sure the inflight messages can processed after reconncection */ @@ -1711,7 +1814,6 @@ static struct vduse_dev *vduse_dev_create(void) return NULL; =20 mutex_init(&dev->lock); - mutex_init(&dev->as.mem_lock); mutex_init(&dev->domain_lock); spin_lock_init(&dev->msg_lock); INIT_LIST_HEAD(&dev->send_list); @@ -1762,8 +1864,11 @@ static int vduse_destroy_dev(char *name) idr_remove(&vduse_idr, dev->minor); kvfree(dev->config); vduse_dev_deinit_vqs(dev); - if (dev->as.domain) - vduse_domain_destroy(dev->as.domain); + for (int i =3D 0; i < dev->nas; i++) { + if (dev->as[i].domain) + vduse_domain_destroy(dev->as[i].domain); + } + kfree(dev->as); kfree(dev->name); kfree(dev->groups); vduse_dev_destroy(dev); @@ -1810,12 +1915,16 @@ static bool vduse_validate_config(struct vduse_dev_= config *config, sizeof(config->reserved))) return false; =20 - if (api_version < VDUSE_API_VERSION_1 && config->ngroups) + if (api_version < VDUSE_API_VERSION_1 && + (config->ngroups || config->nas)) return false; =20 if (api_version >=3D VDUSE_API_VERSION_1 && config->ngroups > 0xffff) return false; =20 + if (api_version >=3D VDUSE_API_VERSION_1 && config->nas > 0xffff) + return false; + if (config->vq_align > PAGE_SIZE) return false; =20 @@ -1879,7 +1988,8 @@ static ssize_t bounce_size_store(struct device *devic= e, =20 ret =3D -EPERM; mutex_lock(&dev->domain_lock); - if (dev->as.domain) + /* Assuming that if the first domain is allocated, all are allocated */ + if (dev->as[0].domain) goto unlock; =20 ret =3D kstrtouint(buf, 10, &bounce_size); @@ -1940,6 +2050,13 @@ static int vduse_create_dev(struct vduse_dev_config = *config, for (u32 i =3D 0; i < dev->ngroups; ++i) dev->groups[i].dev =3D dev; =20 + dev->nas =3D (dev->api_version < 1) ? 1 : (config->nas ?: 1); + dev->as =3D kcalloc(dev->nas, sizeof(dev->as[0]), GFP_KERNEL); + if (!dev->as) + goto err_as; + for (int i =3D 0; i < dev->nas; i++) + mutex_init(&dev->as[i].mem_lock); + dev->name =3D kstrdup(config->name, GFP_KERNEL); if (!dev->name) goto err_str; @@ -1976,6 +2093,8 @@ static int vduse_create_dev(struct vduse_dev_config *= config, err_idr: kfree(dev->name); err_str: + kfree(dev->as); +err_as: kfree(dev->groups); err_vq_groups: vduse_dev_destroy(dev); @@ -2101,7 +2220,7 @@ static int vduse_dev_init_vdpa(struct vduse_dev *dev,= const char *name) =20 vdev =3D vdpa_alloc_device(struct vduse_vdpa, vdpa, dev->dev, &vduse_vdpa_config_ops, &vduse_map_ops, - dev->ngroups, 1, name, true); + dev->ngroups, dev->nas, name, true); if (IS_ERR(vdev)) return PTR_ERR(vdev); =20 @@ -2130,11 +2249,20 @@ static int vdpa_dev_add(struct vdpa_mgmt_dev *mdev,= const char *name, return ret; =20 mutex_lock(&dev->domain_lock); - if (!dev->as.domain) - dev->as.domain =3D vduse_domain_create(VDUSE_IOVA_SIZE - 1, - dev->bounce_size); + ret =3D 0; + + for (int i =3D 0; i < dev->nas; ++i) { + dev->as[i].domain =3D vduse_domain_create(VDUSE_IOVA_SIZE - 1, + dev->bounce_size); + if (!dev->as[i].domain) { + ret =3D -ENOMEM; + for (int j =3D 0; j < i; ++j) + vduse_domain_destroy(dev->as[j].domain); + } + } + mutex_unlock(&dev->domain_lock); - if (!dev->as.domain) { + if (ret =3D=3D -ENOMEM) { put_device(&dev->vdev->vdpa.dev); return -ENOMEM; } @@ -2143,8 +2271,12 @@ static int vdpa_dev_add(struct vdpa_mgmt_dev *mdev, = const char *name, if (ret) { put_device(&dev->vdev->vdpa.dev); mutex_lock(&dev->domain_lock); - vduse_domain_destroy(dev->as.domain); - dev->as.domain =3D NULL; + for (int i =3D 0; i < dev->nas; i++) { + if (dev->as[i].domain) { + vduse_domain_destroy(dev->as[i].domain); + dev->as[i].domain =3D NULL; + } + } mutex_unlock(&dev->domain_lock); return ret; } diff --git a/include/uapi/linux/vduse.h b/include/uapi/linux/vduse.h index b1c0e47d71fb..54da965a65dc 100644 --- a/include/uapi/linux/vduse.h +++ b/include/uapi/linux/vduse.h @@ -47,7 +47,8 @@ struct vduse_dev_config { __u32 vq_num; __u32 vq_align; __u32 ngroups; /* if VDUSE_API_VERSION >=3D 1 */ - __u32 reserved[12]; + __u32 nas; /* if VDUSE_API_VERSION >=3D 1 */ + __u32 reserved[11]; __u32 config_size; __u8 config[]; }; @@ -82,6 +83,18 @@ struct vduse_iotlb_entry { __u8 perm; }; =20 +/** + * struct vduse_iotlb_entry_v2 - entry of IOTLB to describe one IOVA regio= n in an ASID + * @v1: the original vduse_iotlb_entry + * @asid: address space ID of the IOVA region + * + * Structure used by VDUSE_IOTLB_GET_FD ioctl to find an overlapped IOVA r= egion. + */ +struct vduse_iotlb_entry_v2 { + struct vduse_iotlb_entry v1; + __u32 asid; +}; + /* * Find the first IOVA region that overlaps with the range [start, last] * and return the corresponding file descriptor. Return -EINVAL means the @@ -172,6 +185,16 @@ struct vduse_vq_group { __u32 group; }; =20 +/** + * struct vduse_vq_group - virtqueue group + @ @group: Index of the virtqueue group + * @asid: Address space ID of the group + */ +struct vduse_vq_group_asid { + __u32 group; + __u32 asid; +}; + /** * struct vduse_vq_info - information of a virtqueue * @index: virtqueue index @@ -231,6 +254,7 @@ struct vduse_vq_eventfd { * @uaddr: start address of userspace memory, it must be aligned to page s= ize * @iova: start of the IOVA region * @size: size of the IOVA region + * @asid: Address space ID of the IOVA region * @reserved: for future use, needs to be initialized to zero * * Structure used by VDUSE_IOTLB_REG_UMEM and VDUSE_IOTLB_DEREG_UMEM @@ -240,7 +264,8 @@ struct vduse_iova_umem { __u64 uaddr; __u64 iova; __u64 size; - __u64 reserved[3]; + __u32 asid; + __u32 reserved[5]; }; =20 /* Register userspace memory for IOVA regions */ @@ -254,6 +279,7 @@ struct vduse_iova_umem { * @start: start of the IOVA region * @last: last of the IOVA region * @capability: capability of the IOVA regsion + * @asid: Address space ID of the IOVA region, only if device API version = >=3D 1 * @reserved: for future use, needs to be initialized to zero * * Structure used by VDUSE_IOTLB_GET_INFO ioctl to get information of @@ -264,7 +290,8 @@ struct vduse_iova_info { __u64 last; #define VDUSE_IOVA_CAP_UMEM (1 << 0) __u64 capability; - __u64 reserved[3]; + __u32 asid; /* Only if device API version >=3D 1 */ + __u32 reserved[5]; }; =20 /* @@ -287,6 +314,7 @@ enum vduse_req_type { VDUSE_SET_STATUS, VDUSE_UPDATE_IOTLB, VDUSE_GET_VQ_GROUP, + VDUSE_SET_VQ_GROUP_ASID, }; =20 /** @@ -321,6 +349,18 @@ struct vduse_iova_range { __u64 last; }; =20 +/** + * struct vduse_iova_range - IOVA range [start, last] if API_VERSION >=3D 1 + * @start: start of the IOVA range + * @last: last of the IOVA range + * @asid: address space ID of the IOVA range + */ +struct vduse_iova_range_v2 { + __u64 start; + __u64 last; + __u32 asid; +}; + /** * struct vduse_dev_request - control request * @type: request type @@ -330,6 +370,8 @@ struct vduse_iova_range { * @s: device status * @iova: IOVA range for updating * @vq_group: virtqueue group of a virtqueue + * @iova_v2: IOVA range for updating if API_VERSION >=3D 1 + * @vq_group_asid: ASID of a virtqueue group * @padding: padding * * Structure used by read(2) on /dev/vduse/$NAME. @@ -342,8 +384,10 @@ struct vduse_dev_request { struct vduse_vq_state vq_state; struct vduse_dev_status s; struct vduse_iova_range iova; - /* Only if vduse api version >=3D 1 */; + /* Following members only if vduse api version >=3D 1 */; struct vduse_vq_group vq_group; + struct vduse_iova_range_v2 iova_v2; + struct vduse_vq_group_asid vq_group_asid; __u32 padding[32]; }; }; --=20 2.51.0 From nobody Wed Sep 24 15:20:54 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4EC6A31987F for ; Tue, 26 Aug 2025 11:27:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756207672; cv=none; b=Die+hpbYEawMj8O0AmOx/Iiftw584ezKJCeH6+ouzvccFnZ/qZDw2v4bNvhc0dYIC0ZObOlHnYOfWCoI038Eje7w4j7m2VRQIkN/E2ZWMwgKMfaOFvS138oJb17Mi/nxHbvS5TUW/ryLJ1k41mKbw3fkdzOjcLea4KePbGKuI9g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756207672; c=relaxed/simple; bh=AK0T2lgXsW3PML7OI8mwLqomjHmP20f2IdEa9WL6nQA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=o5TOAtkivFwLLtkieJcDkGGDWAT/F5ULdPLdOCjnPNbpTxD7N7yYur1nFOc3E4eiDwx4NEr6hla48Jd+Axf/YOKgevakmJM5195dEzbMZE3a8nyeqks6lwTm129X95q3QzanWea7d34fUiCqx6JmCyYkKM9wdC9yONiV8sDoXYg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=feaCFlz3; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="feaCFlz3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1756207668; 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=a2itpLVm6hA9DzIDQs63bIiz4BfirhpwV7xdbFxqInw=; b=feaCFlz3LckPqh3dhNj4nyp3TTFOTPyZw9dOvIOcQdbuJdbVEaXhyLt7ZFVren0e0nMXr0 Rd7mY23AynV4IpPfYwvIsKjHevC+KknXvPQ4UafFzH7aa4aWj8RGnQBx66Y/7grJZsFTVl O+3bxH+C3sCHYBoPTw6PuZdRq0nxt3k= 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-689-Ug8pOwnrNreS8oVD53FqMg-1; Tue, 26 Aug 2025 07:27:45 -0400 X-MC-Unique: Ug8pOwnrNreS8oVD53FqMg-1 X-Mimecast-MFC-AGG-ID: Ug8pOwnrNreS8oVD53FqMg_1756207664 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 75C2E180034F; Tue, 26 Aug 2025 11:27:44 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.224.67]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 84B89180028B; Tue, 26 Aug 2025 11:27:39 +0000 (UTC) From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: "Michael S . Tsirkin " Cc: =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Cindy Lu , Stefano Garzarella , Xuan Zhuo , Laurent Vivier , virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, jasowang@redhat.com, Yongji Xie , Maxime Coquelin Subject: [PATCH 6/6] vduse: bump version number Date: Tue, 26 Aug 2025 13:27:09 +0200 Message-ID: <20250826112709.1051172-7-eperezma@redhat.com> In-Reply-To: <20250826112709.1051172-1-eperezma@redhat.com> References: <20250826112709.1051172-1-eperezma@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Finalize the series by advertising VDUSE API v1 support to userspace. Now that all required infrastructure for v1 (ASIDs, VQ groups, update_iotlb_v2) is in place, VDUSE devices can opt in to the new features. Signed-off-by: Eugenio P=C3=A9rez --- drivers/vdpa/vdpa_user/vduse_dev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vd= use_dev.c index 2fb227713972..e37e0352447e 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -2122,7 +2122,7 @@ static long vduse_ioctl(struct file *file, unsigned i= nt cmd, break; =20 ret =3D -EINVAL; - if (api_version > VDUSE_API_VERSION) + if (api_version > VDUSE_API_VERSION_1) break; =20 ret =3D 0; @@ -2189,7 +2189,7 @@ static int vduse_open(struct inode *inode, struct fil= e *file) if (!control) return -ENOMEM; =20 - control->api_version =3D VDUSE_API_VERSION; + control->api_version =3D VDUSE_API_VERSION_1; file->private_data =3D control; =20 return 0; --=20 2.51.0