Return the internal struct that represents the vq group as virtqueue map
token, instead of the device. This allows the DMA 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érez <eperezma@redhat.com>
---
drivers/vdpa/vdpa_user/vduse_dev.c | 44 ++++++++++++++++++++----------
1 file changed, 30 insertions(+), 14 deletions(-)
diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vduse_dev.c
index d1f6d00a9c71..a7a2749f5818 100644
--- a/drivers/vdpa/vdpa_user/vduse_dev.c
+++ b/drivers/vdpa/vdpa_user/vduse_dev.c
@@ -90,6 +90,10 @@ struct vduse_umem {
struct mm_struct *mm;
};
+struct vduse_vq_group_int {
+ struct vduse_dev *dev;
+};
+
struct vduse_dev {
struct vduse_vdpa *vdev;
struct device *dev;
@@ -123,6 +127,7 @@ struct vduse_dev {
u32 vq_align;
u32 ngroups;
struct vduse_umem *umem;
+ struct vduse_vq_group_int groups[VDUSE_MAX_VQ_GROUPS];
struct mutex mem_lock;
unsigned int bounce_size;
struct mutex domain_lock;
@@ -614,6 +619,14 @@ static u32 vduse_get_vq_desc_group(struct vdpa_device *vdpa, u16 idx)
return dev->vqs[idx]->vq_desc_group;
}
+static void *vduse_get_vq_map_token(struct vdpa_device *vdpa, u16 idx)
+{
+ struct vduse_dev *dev = vdpa_to_vduse(vdpa);
+ u32 vq_group = dev->vqs[idx]->vq_group;
+
+ return &dev->groups[vq_group];
+}
+
static int vduse_vdpa_get_vq_state(struct vdpa_device *vdpa, u16 idx,
struct vdpa_vq_state *state)
{
@@ -870,6 +883,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,
+ .get_vq_map_token = vduse_get_vq_map_token,
.free = vduse_vdpa_free,
};
@@ -877,8 +891,8 @@ static void vduse_dev_sync_single_for_device(void *token,
dma_addr_t dma_addr, size_t size,
enum dma_data_direction dir)
{
- struct device *dev = token;
- struct vduse_dev *vdev = dev_to_vduse(dev);
+ struct vduse_vq_group_int *group = token;
+ struct vduse_dev *vdev = group->dev;
struct vduse_iova_domain *domain = vdev->domain;
vduse_domain_sync_single_for_device(domain, dma_addr, size, dir);
@@ -888,8 +902,8 @@ static void vduse_dev_sync_single_for_cpu(void *token,
dma_addr_t dma_addr, size_t size,
enum dma_data_direction dir)
{
- struct device *dev = token;
- struct vduse_dev *vdev = dev_to_vduse(dev);
+ struct vduse_vq_group_int *group = token;
+ struct vduse_dev *vdev = group->dev;
struct vduse_iova_domain *domain = vdev->domain;
vduse_domain_sync_single_for_cpu(domain, dma_addr, size, dir);
@@ -900,8 +914,8 @@ static dma_addr_t vduse_dev_map_page(void *token, struct page *page,
enum dma_data_direction dir,
unsigned long attrs)
{
- struct device *dev = token;
- struct vduse_dev *vdev = dev_to_vduse(dev);
+ struct vduse_vq_group_int *group = token;
+ struct vduse_dev *vdev = group->dev;
struct vduse_iova_domain *domain = vdev->domain;
return vduse_domain_map_page(domain, page, offset, size, dir, attrs);
@@ -911,8 +925,8 @@ static void vduse_dev_unmap_page(void *token, dma_addr_t dma_addr,
size_t size, enum dma_data_direction dir,
unsigned long attrs)
{
- struct device *dev = token;
- struct vduse_dev *vdev = dev_to_vduse(dev);
+ struct vduse_vq_group_int *group = token;
+ struct vduse_dev *vdev = group->dev;
struct vduse_iova_domain *domain = vdev->domain;
return vduse_domain_unmap_page(domain, dma_addr, size, dir, attrs);
@@ -921,8 +935,8 @@ static void vduse_dev_unmap_page(void *token, dma_addr_t dma_addr,
static void *vduse_dev_alloc_coherent(void *token, size_t size,
dma_addr_t *dma_addr, gfp_t flag)
{
- struct device *dev = token;
- struct vduse_dev *vdev = dev_to_vduse(dev);
+ struct vduse_vq_group_int *group = token;
+ struct vduse_dev *vdev = group->dev;
struct vduse_iova_domain *domain = vdev->domain;
unsigned long iova;
void *addr;
@@ -942,8 +956,8 @@ static void vduse_dev_free_coherent(void *token, size_t size,
void *vaddr, dma_addr_t dma_addr,
unsigned long attrs)
{
- struct device *dev = token;
- struct vduse_dev *vdev = dev_to_vduse(dev);
+ struct vduse_vq_group_int *group = token;
+ struct vduse_dev *vdev = group->dev;
struct vduse_iova_domain *domain = vdev->domain;
vduse_domain_free_coherent(domain, size, vaddr, dma_addr, attrs);
@@ -951,8 +965,8 @@ static void vduse_dev_free_coherent(void *token, size_t size,
static size_t vduse_dev_max_mapping_size(void *token)
{
- struct device *dev = token;
- struct vduse_dev *vdev = dev_to_vduse(dev);
+ struct vduse_vq_group_int *group = token;
+ struct vduse_dev *vdev = group->dev;
struct vduse_iova_domain *domain = vdev->domain;
return domain->bounce_size;
@@ -1925,6 +1939,8 @@ static int vduse_create_dev(struct vduse_dev_config *config,
} else {
dev->ngroups = 1;
}
+ for (u32 i = 0; i < dev->ngroups; ++i)
+ dev->groups[i].dev = dev;
dev->name = kstrdup(config->name, GFP_KERNEL);
if (!dev->name)
goto err_str;
--
2.50.1
On Thu, Aug 7, 2025 at 7:58 PM Eugenio Pérez <eperezma@redhat.com> wrote: > > Return the internal struct that represents the vq group as virtqueue map > token, instead of the device. Note that Michael prefers to use the iova domain. This indeed seems to be better. > This allows the DMA functions to access s/DMA/map/ > 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érez <eperezma@redhat.com> Thanks
On Mon, Aug 11, 2025 at 5:11 AM Jason Wang <jasowang@redhat.com> wrote: > > On Thu, Aug 7, 2025 at 7:58 PM Eugenio Pérez <eperezma@redhat.com> wrote: > > > > Return the internal struct that represents the vq group as virtqueue map > > token, instead of the device. > > Note that Michael prefers to use the iova domain. This indeed seems to > be better. > Well iova domain would delete an indirection in the pointer chase, but it would be problematic to store the token in the caller. And we need to add some way to protect that the ASID of a vq group is not changed in the middle of the operation by an ioctl. IOW, the vq_group_internal struct pointer is constant for all the lifetime of the device, while iova_domain is not. > > This allows the DMA functions to access > > s/DMA/map/ > Ouch, thanks for the catch! > > 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érez <eperezma@redhat.com> > > Thanks >
On Mon, Aug 11, 2025 at 7:04 PM Eugenio Perez Martin <eperezma@redhat.com> wrote: > > On Mon, Aug 11, 2025 at 5:11 AM Jason Wang <jasowang@redhat.com> wrote: > > > > On Thu, Aug 7, 2025 at 7:58 PM Eugenio Pérez <eperezma@redhat.com> wrote: > > > > > > Return the internal struct that represents the vq group as virtqueue map > > > token, instead of the device. > > > > Note that Michael prefers to use the iova domain. This indeed seems to > > be better. > > > > Well iova domain would delete an indirection in the pointer chase, but > it would be problematic to store the token in the caller. > > And we need to add some way to protect that the ASID of a vq group is > not changed in the middle of the operation by an ioctl. IOW, the > vq_group_internal struct pointer is constant for all the lifetime of > the device, while iova_domain is not. I will post a new version of DMA rework and switch to using the iova domain there. Let's see if it works then. > > > > This allows the DMA functions to access > > > > s/DMA/map/ > > > > Ouch, thanks for the catch! > > > > 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érez <eperezma@redhat.com> > > > > Thanks > > > Thanks
© 2016 - 2025 Red Hat, Inc.