| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CACGkMEsZiX-M-PNGX8W7GprBJmiGi9Gz1=ayE=iMaP3WO3vr2Q@mail.gmail.com>
Date: Wed, 3 Sep 2025 11:56:46 +0800
From: Jason Wang <jasowang@...hat.com>
To: Eugenio Perez Martin <eperezma@...hat.com>
Cc: "Michael S . Tsirkin" <mst@...hat.com>, Cindy Lu <lulu@...hat.com>,
Stefano Garzarella <sgarzare@...hat.com>, Xuan Zhuo <xuanzhuo@...ux.alibaba.com>,
Laurent Vivier <lvivier@...hat.com>, virtualization@...ts.linux.dev,
linux-kernel@...r.kernel.org, Yongji Xie <xieyongji@...edance.com>,
Maxime Coquelin <mcoqueli@...hat.com>
Subject: Re: [PATCH 5/6] vduse: add vq group asid support
On Mon, Sep 1, 2025 at 5:12 PM Eugenio Perez Martin <eperezma@...hat.com> wrote:
>
> On Mon, Sep 1, 2025 at 4:46 AM Jason Wang <jasowang@...hat.com> wrote:
> >
> > On Tue, Aug 26, 2025 at 7:27 PM Eugenio Pérez <eperezma@...hat.com> wrote:
> > >
> > > 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érez <eperezma@...hat.com>
> > > ---
> > > 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/vduse_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 {
> > > };
> > >
> > > struct vduse_vq_group_int {
> > > + struct vduse_iova_domain *domain;
> >
> > I'd expect this should be vduse_as. Anything I miss?
> >
>
> It just saves a memory indirection step, as the rest of members of
> vduse_as are not used in vduse_map_ops callbacks. I can use vduse_as
> if you prefer it.
I think it's better to use that to follow the abstraction of a group
to address space indirection.
>
> > > struct vduse_dev *dev;
> > > };
> > >
> > > @@ -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);
> > > }
> > >
> > > -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 = { 0 };
> > > @@ -326,8 +328,14 @@ static int vduse_dev_update_iotlb(struct vduse_dev *dev,
> > > return -EINVAL;
> > >
> > > msg.req.type = VDUSE_UPDATE_IOTLB;
> > > - msg.req.iova.start = start;
> > > - msg.req.iova.last = last;
> > > + if (dev->api_version < VDUSE_API_VERSION_1) {
> > > + msg.req.iova.start = start;
> > > + msg.req.iova.last = last;
> > > + } else {
> > > + msg.req.iova_v2.start = start;
> > > + msg.req.iova_v2.last = last;
> > > + msg.req.iova_v2.asid = asid;
> > > + }
> > >
> > > return vduse_dev_msg_sync(dev, &msg);
> > > }
> > > @@ -439,14 +447,28 @@ static __poll_t vduse_dev_poll(struct file *file, poll_table *wait)
> > > return mask;
> > > }
> > >
> > > +/* 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 = dev->as[asid].domain;
> > > +}
> > > +
> > > static void vduse_dev_reset(struct vduse_dev *dev)
> > > {
> > > int i;
> > > - struct vduse_iova_domain *domain = dev->as.domain;
> > >
> > > /* The coherent mappings are handled in vduse_dev_free_coherent() */
> > > - if (domain && domain->bounce_map)
> > > - vduse_domain_reset_bounce_map(domain);
> > > + for (i = 0; i < dev->nas; i++) {
> > > + struct vduse_iova_domain *domain = dev->as[i].domain;
> > > +
> > > + if (domain && domain->bounce_map)
> > > + vduse_domain_reset_bounce_map(domain);
> > > + }
> > > +
> > > + for (i = 0; i < dev->ngroups; i++)
> > > + vduse_set_group_asid_nomsg(dev, i, 0);
> > >
> > > down_write(&dev->rwsem);
> > >
> > > @@ -620,6 +642,29 @@ static union virtio_map vduse_get_vq_map(struct vdpa_device *vdpa, u16 idx)
> > > return ret;
> > > }
> > >
> > > +static int vduse_set_group_asid(struct vdpa_device *vdpa, unsigned int group,
> > > + unsigned int asid)
> > > +{
> > > + struct vduse_dev *dev = vdpa_to_vduse(vdpa);
> > > + struct vduse_dev_msg msg = { 0 };
> > > + int r;
> > > +
> > > + if (dev->api_version < VDUSE_API_VERSION_1 ||
> > > + group >= dev->ngroups || asid >= dev->nas)
> > > + return -EINVAL;
> > > +
> > > + msg.req.type = VDUSE_SET_VQ_GROUP_ASID;
> > > + msg.req.vq_group_asid.group = group;
> > > + msg.req.vq_group_asid.asid = asid;
> > > +
> > > + r = 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 *vdpa,
> > > struct vduse_dev *dev = vdpa_to_vduse(vdpa);
> > > int ret;
> > >
> > > - ret = vduse_domain_set_map(dev->as.domain, iotlb);
> > > + ret = vduse_domain_set_map(dev->as[asid].domain, iotlb);
> > > if (ret)
> > > return ret;
> > >
> > > - ret = vduse_dev_update_iotlb(dev, 0ULL, ULLONG_MAX);
> > > + ret = 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;
> > > }
> > >
> > > @@ -867,6 +912,7 @@ static const struct vdpa_config_ops vduse_vdpa_config_ops = {
> > > .get_vq_affinity = vduse_vdpa_get_vq_affinity,
> > > .reset = vduse_vdpa_reset,
> > > .set_map = vduse_vdpa_set_map,
> > > + .set_group_asid = vduse_set_group_asid,
> > > .get_vq_map = vduse_get_vq_map,
> > > .free = vduse_vdpa_free,
> > > };
> > > @@ -876,8 +922,10 @@ static void vduse_dev_sync_single_for_device(union virtio_map token,
> > > enum dma_data_direction dir)
> > > {
> > > struct vduse_dev *vdev = token.group->dev;
> > > - struct vduse_iova_domain *domain = vdev->as.domain;
> > > + struct vduse_iova_domain *domain;
> > >
> > > + guard(mutex)(&vdev->domain_lock);
> >
> > Is this correct? I mean each AS should have its own lock instead of
> > having a BQL.
> >
>
> That would not protect the pointer if vduse_dev_sync_single_for_device
> (or equivalent function that uses the domain) is called at the same
> time as vduse_set_group_asid.
>
> > > + domain = token.group->domain;
> > > vduse_domain_sync_single_for_device(domain, dma_addr, size, dir);
> > > }
> > >
> > > @@ -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 = token.group->dev;
> > > - struct vduse_iova_domain *domain = vdev->as.domain;
> > > + struct vduse_iova_domain *domain;
> > >
> > > + guard(mutex)(&vdev->domain_lock);
> > > + domain = token.group->domain;
> > > vduse_domain_sync_single_for_cpu(domain, dma_addr, size, dir);
> > > }
> > >
> > > @@ -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 = token.group->dev;
> > > - struct vduse_iova_domain *domain = vdev->as.domain;
> > > + struct vduse_iova_domain *domain;
> > >
> > > + guard(mutex)(&vdev->domain_lock);
> > > + domain = token.group->domain;
> > > return vduse_domain_map_page(domain, page, offset, size, dir, attrs);
> > > }
> > >
> > > @@ -907,8 +959,10 @@ static void vduse_dev_unmap_page(union virtio_map token, dma_addr_t dma_addr,
> > > unsigned long attrs)
> > > {
> > > struct vduse_dev *vdev = token.group->dev;
> > > - struct vduse_iova_domain *domain = vdev->as.domain;
> > > + struct vduse_iova_domain *domain;
> > >
> > > + guard(mutex)(&vdev->domain_lock);
> > > + domain = token.group->domain;
> > > return vduse_domain_unmap_page(domain, dma_addr, size, dir, attrs);
> > > }
> > >
> > > @@ -916,11 +970,13 @@ 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 = token.group->dev;
> > > - struct vduse_iova_domain *domain = vdev->as.domain;
> > > + struct vduse_iova_domain *domain;
> > > unsigned long iova;
> > > void *addr;
> > >
> > > *dma_addr = DMA_MAPPING_ERROR;
> > > + guard(mutex)(&vdev->domain_lock);
> > > + domain = token.group->domain;
> > > addr = 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 = token.group->dev;
> > > - struct vduse_iova_domain *domain = vdev->as.domain;
> > > + struct vduse_iova_domain *domain;
> > >
> > > + guard(mutex)(&vdev->domain_lock);
> > > + domain = token.group->domain;
> > > vduse_domain_free_coherent(domain, size, vaddr, dma_addr, attrs);
> > > }
> > >
> > > static bool vduse_dev_need_sync(union virtio_map token, dma_addr_t dma_addr)
> > > {
> > > struct vduse_dev *vdev = token.group->dev;
> > > - struct vduse_iova_domain *domain = vdev->as.domain;
> > > + struct vduse_iova_domain *domain;
> > >
> > > + guard(mutex)(&vdev->domain_lock);
> > > + domain = token.group->domain;
> > > return dma_addr < domain->bounce_size;
> > > }
> > >
> > > @@ -959,8 +1019,10 @@ static int vduse_dev_mapping_error(union virtio_map token, dma_addr_t dma_addr)
> > > static size_t vduse_dev_max_mapping_size(union virtio_map token)
> > > {
> > > struct vduse_dev *vdev = token.group->dev;
> > > - struct vduse_iova_domain *domain = vdev->as.domain;
> > > + struct vduse_iova_domain *domain;
> > >
> > > + guard(mutex)(&vdev->domain_lock);
> > > + domain = token.group->domain;
> > > return domain->bounce_size;
> > > }
> > >
> > > @@ -1101,39 +1163,40 @@ static int vduse_dev_queue_irq_work(struct vduse_dev *dev,
> > > return ret;
> > > }
> > >
> > > -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;
> > >
> > > - mutex_lock(&dev->as.mem_lock);
> > > + mutex_lock(&dev->as[asid].mem_lock);
> > > ret = -ENOENT;
> > > - if (!dev->as.umem)
> > > + if (!dev->as[asid].umem)
> > > goto unlock;
> > >
> > > ret = -EINVAL;
> > > - if (!dev->as.domain)
> > > + if (!dev->as[asid].domain)
> > > goto unlock;
> > >
> > > - if (dev->as.umem->iova != iova || size != dev->as.domain->bounce_size)
> > > + if (dev->as[asid].umem->iova != iova ||
> > > + size != dev->as[asid].domain->bounce_size)
> > > goto unlock;
> > >
> > > - 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 = 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 = NULL;
> > > ret = 0;
> > > unlock:
> > > - mutex_unlock(&dev->as.mem_lock);
> > > + mutex_unlock(&dev->as[asid].mem_lock);
> > > return ret;
> > > }
> > >
> > > 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 = NULL;
> > > struct vduse_umem *umem = NULL;
> > > @@ -1141,14 +1204,14 @@ static int vduse_dev_reg_umem(struct vduse_dev *dev,
> > > unsigned long npages, lock_limit;
> > > int ret;
> > >
> > > - if (!dev->as.domain || !dev->as.domain->bounce_map ||
> > > - size != dev->as.domain->bounce_size ||
> > > + if (!dev->as[asid].domain || !dev->as[asid].domain->bounce_map ||
> > > + size != dev->as[asid].domain->bounce_size ||
> > > iova != 0 || uaddr & ~PAGE_MASK)
> > > return -EINVAL;
> > >
> > > - mutex_lock(&dev->as.mem_lock);
> > > + mutex_lock(&dev->as[asid].mem_lock);
> > > ret = -EEXIST;
> > > - if (dev->as.umem)
> > > + if (dev->as[asid].umem)
> > > goto unlock;
> > >
> > > ret = -ENOMEM;
> > > @@ -1172,7 +1235,7 @@ static int vduse_dev_reg_umem(struct vduse_dev *dev,
> > > goto out;
> > > }
> > >
> > > - ret = vduse_domain_add_user_bounce_pages(dev->as.domain,
> > > + ret = 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 = current->mm;
> > > mmgrab(current->mm);
> > >
> > > - dev->as.umem = umem;
> > > + dev->as[asid].umem = 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;
> > > }
> > >
> > > @@ -1228,47 +1291,66 @@ static long vduse_dev_ioctl(struct file *file, unsigned int cmd,
> > >
> > > 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 = NULL;
> > > + u32 asid;
> > >
> > > ret = -EFAULT;
> > > - if (copy_from_user(&entry, argp, sizeof(entry)))
> > > - break;
> > > + if (dev->api_version >= VDUSE_API_VERSION_1) {
> > > + if (copy_from_user(&entry, argp, sizeof(entry)))
> > > + break;
> > > + } else {
> > > + entry.asid = 0;
> > > + if (copy_from_user(&entry.v1, argp,
> > > + sizeof(entry.v1)))
> > > + break;
> > > + }
> > >
> > > ret = -EINVAL;
> > > - if (entry.start > entry.last)
> > > + if (entry.v1.start > entry.v1.last)
> > > + break;
> > > +
> > > + if (entry.asid >= dev->nas)
> > > break;
> > >
> > > mutex_lock(&dev->domain_lock);
> > > - if (!dev->as.domain) {
> > > + asid = 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 = vhost_iotlb_itree_first(dev->as.domain->iotlb,
> > > - entry.start, entry.last);
> > > + spin_lock(&dev->as[asid].domain->iotlb_lock);
> > > + map = vhost_iotlb_itree_first(dev->as[asid].domain->iotlb,
> > > + entry.v1.start, entry.v1.last);
> > > if (map) {
> > > map_file = (struct vdpa_map_file *)map->opaque;
> > > f = get_file(map_file->file);
> > > - entry.offset = map_file->offset;
> > > - entry.start = map->start;
> > > - entry.last = map->last;
> > > - entry.perm = map->perm;
> > > + entry.v1.offset = map_file->offset;
> > > + entry.v1.start = map->start;
> > > + entry.v1.last = map->last;
> > > + entry.v1.perm = map->perm;
> > > }
> > > - spin_unlock(&dev->as.domain->iotlb_lock);
> > > + spin_unlock(&dev->as[asid].domain->iotlb_lock);
> > > mutex_unlock(&dev->domain_lock);
> > > ret = -EINVAL;
> > > if (!f)
> > > break;
> > >
> > > ret = -EFAULT;
> > > - if (copy_to_user(argp, &entry, sizeof(entry))) {
> > > + if (dev->api_version >= VDUSE_API_VERSION_1)
> > > + ret = copy_to_user(argp, &entry,
> > > + sizeof(entry));
> > > + else
> > > + ret = copy_to_user(argp, &entry.v1,
> > > + sizeof(entry.v1));
> > > +
> > > + if (ret) {
> > > fput(f);
> > > break;
> > > }
> > > - ret = receive_fd(f, NULL, perm_to_file_flags(entry.perm));
> > > + ret = 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, unsigned int cmd,
> > > }
> > > case VDUSE_IOTLB_REG_UMEM: {
> > > struct vduse_iova_umem umem;
> > > + u32 asid;
> > >
> > > ret = -EFAULT;
> > > if (copy_from_user(&umem, argp, sizeof(umem)))
> > > @@ -1408,17 +1491,21 @@ static long vduse_dev_ioctl(struct file *file, unsigned int cmd,
> > >
> > > ret = -EINVAL;
> > > if (!is_mem_zero((const char *)umem.reserved,
> > > - sizeof(umem.reserved)))
> > > + sizeof(umem.reserved)) ||
> > > + (dev->api_version < VDUSE_API_VERSION_1 &&
> > > + umem.asid != 0) || umem.asid >= dev->nas)
> > > break;
> >
> > Does this mean umem is only supported for asid == 0? This looks like a bug.
> >
>
> No, that conditional means that:
> * If dev->api_version < V1 (In other words, if it is 0), umem.asid
> must be 0. Previous versions already return -EINVAL if the reserved
> members are 0 so we must keep this behavior.
> * If the version is 1 or bigger, the asid must be smaller than the
> device number of ASID (dev->nas).
Ok I see, I misread it as
+ (dev->api_version < VDUSE_API_VERSION_1 &&
+ (umem.asid != 0) || umem.asid >= dev->nas))
>
> > >
> > > mutex_lock(&dev->domain_lock);
> > > - ret = vduse_dev_reg_umem(dev, umem.iova,
> > > + asid = array_index_nospec(umem.asid, dev->nas);
> > > + ret = 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;
> > >
> > > ret = -EFAULT;
> > > if (copy_from_user(&umem, argp, sizeof(umem)))
> > > @@ -1426,10 +1513,15 @@ static long vduse_dev_ioctl(struct file *file, unsigned int cmd,
> > >
> > > ret = -EINVAL;
> > > if (!is_mem_zero((const char *)umem.reserved,
> > > - sizeof(umem.reserved)))
> > > + sizeof(umem.reserved)) ||
> > > + (dev->api_version < VDUSE_API_VERSION_1 &&
> > > + umem.asid != 0) ||
> > > + umem.asid >= dev->nas)
> > > break;
> > > +
> > > mutex_lock(&dev->domain_lock);
> > > - ret = vduse_dev_dereg_umem(dev, umem.iova,
> > > + asid = array_index_nospec(umem.asid, dev->nas);
> > > + ret = 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, unsigned int cmd,
> > > case VDUSE_IOTLB_GET_INFO: {
> > > struct vduse_iova_info info;
> > > struct vhost_iotlb_map *map;
> > > + u32 asid;
> > >
> > > ret = -EFAULT;
> > > if (copy_from_user(&info, argp, sizeof(info)))
> > > @@ -1450,23 +1543,31 @@ static long vduse_dev_ioctl(struct file *file, unsigned int cmd,
> > > sizeof(info.reserved)))
> > > break;
> > >
> > > + if (dev->api_version < VDUSE_API_VERSION_1) {
> > > + if (info.asid)
> > > + break;
> > > + } else if (info.asid >= dev->nas)
> >
> > It would be simpler if we mandate dev->nas == 1 VERSION 0.
> >
>
> That's done later in this patch, in the change of the
> vduse_validate_config function.
>
> > > + break;
> > > +
> > > mutex_lock(&dev->domain_lock);
> > > - if (!dev->as.domain) {
> > > + asid = 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 = vhost_iotlb_itree_first(dev->as.domain->iotlb,
> > > + spin_lock(&dev->as[asid].domain->iotlb_lock);
> > > + map = vhost_iotlb_itree_first(dev->as[asid].domain->iotlb,
> > > info.start, info.last);
> > > if (map) {
> > > info.start = map->start;
> > > info.last = map->last;
> > > info.capability = 0;
> > > - if (dev->as.domain->bounce_map && map->start == 0 &&
> > > - map->last == dev->as.domain->bounce_size - 1)
> > > + if (dev->as[asid].domain->bounce_map &&
> > > + map->start == 0 &&
> > > + map->last == dev->as[asid].domain->bounce_size - 1)
> > > info.capability |= 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, struct file *file)
> > > struct vduse_dev *dev = file->private_data;
> > >
> > > mutex_lock(&dev->domain_lock);
> > > - if (dev->as.domain)
> > > - vduse_dev_dereg_umem(dev, 0, dev->as.domain->bounce_size);
> > > + for (int i = 0; i < dev->nas; i++)
> > > + if (dev->as[i].domain)
> >
> > Not related to this patch, but I wonder which case could we get domain
> > == NULL here?
> >
>
> I never tried myself but the domain is set at vdpa_dev_add. If a VDUSE
> device is created by the VDUSE_CREATE_DEV ioctl and then destroyed
> with VDUSE_DESTROY_DEV without calling "vdpa dev add" the
> vduse_dev_release function will find dev->as[i].domain == NULL.
>
Ok, but I didn't see a similar if(dev->domain) check in
VDUSE_IOTLB_DEREG_UMEM. Is this a bug? If it is, maybe it's better to
move the as check inside vduse_dev_dereg_umem.
> > > + 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;
> > >
> > > 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 = 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;
> > >
> > > - if (api_version < VDUSE_API_VERSION_1 && config->ngroups)
> > > + if (api_version < VDUSE_API_VERSION_1 &&
> > > + (config->ngroups || config->nas))
> > > return false;
> > >
> > > if (api_version >= VDUSE_API_VERSION_1 && config->ngroups > 0xffff)
> > > return false;
> > >
> > > + if (api_version >= VDUSE_API_VERSION_1 && config->nas > 0xffff)
> > > + return false;
> >
> > Using macro instead of magic number please.
> >
> > > +
> > > if (config->vq_align > PAGE_SIZE)
> > > return false;
> > >
> > > @@ -1879,7 +1988,8 @@ static ssize_t bounce_size_store(struct device *device,
> > >
> >
> > So the real size of the bounce should be bounce_size * nas? Should we
> > be conservative to adjust per as bounce size to bounce_size / nas?
> >
>
> I think that's a bad idea in net devices in particular, as I expect
> the dataplane will need way more memory than CVQ.
Ok, I just want to note that the bounce might consume more than what
the user set here.
> bounce_size per
> device seems more correct to me. But I can divide per nas for sure.
Or make bounce_size to be the total size of all virtqueues, so
management will increase it when it knows there's a multiqueue device.
>
> > > ret = -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;
> > >
> > > ret = kstrtouint(buf, 10, &bounce_size);
> > > @@ -1940,6 +2050,13 @@ static int vduse_create_dev(struct vduse_dev_config *config,
> > > for (u32 i = 0; i < dev->ngroups; ++i)
> > > dev->groups[i].dev = dev;
> > >
> > > + dev->nas = (dev->api_version < 1) ? 1 : (config->nas ?: 1);
> > > + dev->as = kcalloc(dev->nas, sizeof(dev->as[0]), GFP_KERNEL);
> > > + if (!dev->as)
> > > + goto err_as;
> > > + for (int i = 0; i < dev->nas; i++)
> > > + mutex_init(&dev->as[i].mem_lock);
> > > +
> > > dev->name = 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)
> > >
> > > vdev = 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);
> > >
> > > @@ -2130,11 +2249,20 @@ static int vdpa_dev_add(struct vdpa_mgmt_dev *mdev, const char *name,
> > > return ret;
> > >
> > > mutex_lock(&dev->domain_lock);
> > > - if (!dev->as.domain)
> > > - dev->as.domain = vduse_domain_create(VDUSE_IOVA_SIZE - 1,
> > > - dev->bounce_size);
> > > + ret = 0;
> > > +
> > > + for (int i = 0; i < dev->nas; ++i) {
> > > + dev->as[i].domain = vduse_domain_create(VDUSE_IOVA_SIZE - 1,
> > > + dev->bounce_size);
> > > + if (!dev->as[i].domain) {
> > > + ret = -ENOMEM;
> > > + for (int j = 0; j < i; ++j)
> > > + vduse_domain_destroy(dev->as[j].domain);
> > > + }
> > > + }
> > > +
> > > mutex_unlock(&dev->domain_lock);
> > > - if (!dev->as.domain) {
> > > + if (ret == -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 = NULL;
> > > + for (int i = 0; i < dev->nas; i++) {
> > > + if (dev->as[i].domain) {
> > > + vduse_domain_destroy(dev->as[i].domain);
> > > + dev->as[i].domain = NULL;
> > > + }
> >
> > This is a little bit duplicated with the error handling above, should
> > we consider to switch to use err labels?
> >
>
> Sure, I can change it.
>
> > > + }
> > > 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 >= 1 */
> > > - __u32 reserved[12];
> > > + __u32 nas; /* if VDUSE_API_VERSION >= 1 */
> > > + __u32 reserved[11];
> > > __u32 config_size;
> > > __u8 config[];
> > > };
> > > @@ -82,6 +83,18 @@ struct vduse_iotlb_entry {
> > > __u8 perm;
> > > };
> > >
> > > +/**
> > > + * struct vduse_iotlb_entry_v2 - entry of IOTLB to describe one IOVA region 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 region.
> > > + */
> > > +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;
> > > };
> > >
> > > +/**
> > > + * 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 size
> > > * @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];
> > > };
> > >
> > > /* 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 >= 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 >= 1 */
> > > + __u32 reserved[5];
> > > };
> > >
> > > /*
> > > @@ -287,6 +314,7 @@ enum vduse_req_type {
> > > VDUSE_SET_STATUS,
> > > VDUSE_UPDATE_IOTLB,
> > > VDUSE_GET_VQ_GROUP,
> > > + VDUSE_SET_VQ_GROUP_ASID,
> > > };
> > >
> > > /**
> > > @@ -321,6 +349,18 @@ struct vduse_iova_range {
> > > __u64 last;
> > > };
> > >
> > > +/**
> > > + * struct vduse_iova_range - IOVA range [start, last] if API_VERSION >= 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 >= 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 >= 1 */;
> > > + /* Following members only if vduse api version >= 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];
> >
> > This seems to break the uAPI for the userspace that tries to use
> > sizeof(struct vduse_dev_request)?
> >
>
> No, I'm adding a member to the union that is smaller than u32[32]:
>
> https://patchew.org/linux/20250606115012.1331551-1-eperezma@redhat.com/20250606115012.1331551-4-eperezma@redhat.com/#CACGkMEvT._5F1ngR9Cs1A6ghNhZtyXiAb7qZq-Xj=7NWOzO9o5C=w@mail.gmail.com
>
You are right.
Thanks
Powered by blists - more mailing lists