Re: [PATCH RFC 06/12] vdpa_sim: add struct vdpasim_device to store device properties
On Tue, Nov 17, 2020 at 11:23:05AM +, Stefan Hajnoczi wrote:
On Fri, Nov 13, 2020 at 02:47:06PM +0100, Stefano Garzarella wrote:
Move device properties used during the entire life cycle in a new
structure to simplify the copy of these fields during the vdpasim
initialization.
Signed-off-by: Stefano Garzarella
---
drivers/vdpa/vdpa_sim/vdpa_sim.h | 17 --
drivers/vdpa/vdpa_sim/vdpa_sim.c | 33 ++--
drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 8 +--
drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 9 +---
4 files changed, 38 insertions(+), 29 deletions(-)
diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.h b/drivers/vdpa/vdpa_sim/vdpa_sim.h
index 6a1267c40d5e..76e642042eb0 100644
--- a/drivers/vdpa/vdpa_sim/vdpa_sim.h
+++ b/drivers/vdpa/vdpa_sim/vdpa_sim.h
@@ -40,12 +40,17 @@ struct vdpasim_virtqueue {
irqreturn_t (*cb)(void *data);
};
+struct vdpasim_device {
+ u64 supported_features;
+ u32 id;
+ int nvqs;
+};
+
struct vdpasim_init_attr {
- u32 device_id;
- u64 features;
+ struct vdpasim_device device;
It's unclear to me what the exact purpose of struct vdpasim_device is.
At least the name reminds me of struct device, which this is not.
Should this be called just struct vdpasim_attr or struct
vdpasim_dev_attr? In other words, the attributes that are needed even
after intialization?
Yes, they are attributes that are needed even after intialization,
so I think vdpasim_dev_attr should be better.
I'll change it and I'll try to write a better commit message.
Thanks,
Stefano
Re: [PATCH RFC 06/12] vdpa_sim: add struct vdpasim_device to store device properties
On Fri, Nov 13, 2020 at 02:47:06PM +0100, Stefano Garzarella wrote:
> Move device properties used during the entire life cycle in a new
> structure to simplify the copy of these fields during the vdpasim
> initialization.
>
> Signed-off-by: Stefano Garzarella
> ---
> drivers/vdpa/vdpa_sim/vdpa_sim.h | 17 --
> drivers/vdpa/vdpa_sim/vdpa_sim.c | 33 ++--
> drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 8 +--
> drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 9 +---
> 4 files changed, 38 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.h
> b/drivers/vdpa/vdpa_sim/vdpa_sim.h
> index 6a1267c40d5e..76e642042eb0 100644
> --- a/drivers/vdpa/vdpa_sim/vdpa_sim.h
> +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.h
> @@ -40,12 +40,17 @@ struct vdpasim_virtqueue {
> irqreturn_t (*cb)(void *data);
> };
>
> +struct vdpasim_device {
> + u64 supported_features;
> + u32 id;
> + int nvqs;
> +};
> +
> struct vdpasim_init_attr {
> - u32 device_id;
> - u64 features;
> + struct vdpasim_device device;
It's unclear to me what the exact purpose of struct vdpasim_device is.
At least the name reminds me of struct device, which this is not.
Should this be called just struct vdpasim_attr or struct
vdpasim_dev_attr? In other words, the attributes that are needed even
after intialization?
signature.asc
Description: PGP signature
Re: [PATCH RFC 06/12] vdpa_sim: add struct vdpasim_device to store device properties
On Mon, Nov 16, 2020 at 12:14:31PM +0800, Jason Wang wrote:
On 2020/11/13 下午9:47, Stefano Garzarella wrote:
Move device properties used during the entire life cycle in a new
structure to simplify the copy of these fields during the vdpasim
initialization.
Signed-off-by: Stefano Garzarella
It would be better to do it before patch 2.
Okay, I'll move this patch.
---
drivers/vdpa/vdpa_sim/vdpa_sim.h | 17 --
drivers/vdpa/vdpa_sim/vdpa_sim.c | 33 ++--
drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 8 +--
drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 9 +---
4 files changed, 38 insertions(+), 29 deletions(-)
diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.h b/drivers/vdpa/vdpa_sim/vdpa_sim.h
index 6a1267c40d5e..76e642042eb0 100644
--- a/drivers/vdpa/vdpa_sim/vdpa_sim.h
+++ b/drivers/vdpa/vdpa_sim/vdpa_sim.h
@@ -40,12 +40,17 @@ struct vdpasim_virtqueue {
irqreturn_t (*cb)(void *data);
};
+struct vdpasim_device {
+ u64 supported_features;
+ u32 id;
+ int nvqs;
+};
+
struct vdpasim_init_attr {
- u32 device_id;
- u64 features;
+ struct vdpasim_device device;
+ int batch_mapping;
+
work_func_t work_fn;
- int batch_mapping;
- int nvqs;
};
/* State of each vdpasim device */
@@ -53,18 +58,16 @@ struct vdpasim {
struct vdpa_device vdpa;
struct vdpasim_virtqueue *vqs;
struct work_struct work;
+ struct vdpasim_device device;
/* spinlock to synchronize virtqueue state */
spinlock_t lock;
/* virtio config according to device type */
void *config;
struct vhost_iotlb *iommu;
void *buffer;
- u32 device_id;
u32 status;
u32 generation;
u64 features;
- u64 supported_features;
- int nvqs;
/* spinlock to synchronize iommu table */
spinlock_t iommu_lock;
};
diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c
index 9c9717441bbe..d053bd14b3f8 100644
--- a/drivers/vdpa/vdpa_sim/vdpa_sim.c
+++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c
@@ -28,7 +28,7 @@ static void vdpasim_queue_ready(struct vdpasim *vdpasim,
unsigned int idx)
{
struct vdpasim_virtqueue *vq = >vqs[idx];
- vringh_init_iotlb(>vring, vdpasim->supported_features,
+ vringh_init_iotlb(>vring, vdpasim->device.supported_features,
VDPASIM_QUEUE_MAX, false,
(struct vring_desc *)(uintptr_t)vq->desc_addr,
(struct vring_avail *)
@@ -46,7 +46,7 @@ static void vdpasim_vq_reset(struct vdpasim *vdpasim,
vq->device_addr = 0;
vq->cb = NULL;
vq->private = NULL;
- vringh_init_iotlb(>vring, vdpasim->supported_features,
+ vringh_init_iotlb(>vring, vdpasim->device.supported_features,
VDPASIM_QUEUE_MAX, false, NULL, NULL, NULL);
}
@@ -54,7 +54,7 @@ static void vdpasim_reset(struct vdpasim *vdpasim)
{
int i;
- for (i = 0; i < vdpasim->nvqs; i++)
+ for (i = 0; i < vdpasim->device.nvqs; i++)
vdpasim_vq_reset(vdpasim, >vqs[i]);
spin_lock(>iommu_lock);
@@ -189,7 +189,7 @@ struct vdpasim *vdpasim_create(struct vdpasim_init_attr
*attr)
struct device *dev;
int i, size, ret = -ENOMEM;
- device_id = attr->device_id;
+ device_id = attr->device.id;
/* Currently, we only accept the network and block devices. */
if (device_id != VIRTIO_ID_NET && device_id != VIRTIO_ID_BLOCK)
return ERR_PTR(-EOPNOTSUPP);
@@ -200,10 +200,12 @@ struct vdpasim *vdpasim_create(struct vdpasim_init_attr
*attr)
ops = _config_ops;
vdpasim = vdpa_alloc_device(struct vdpasim, vdpa, NULL, ops,
- attr->nvqs);
+ attr->device.nvqs);
if (!vdpasim)
goto err_alloc;
+ vdpasim->device = attr->device;
+
if (device_id == VIRTIO_ID_NET)
size = sizeof(struct virtio_net_config);
else
@@ -212,14 +214,11 @@ struct vdpasim *vdpasim_create(struct vdpasim_init_attr
*attr)
if (!vdpasim->config)
goto err_iommu;
- vdpasim->vqs = kcalloc(attr->nvqs, sizeof(struct vdpasim_virtqueue),
- GFP_KERNEL);
+ vdpasim->vqs = kcalloc(vdpasim->device.nvqs,
+ sizeof(struct vdpasim_virtqueue), GFP_KERNEL);
if (!vdpasim->vqs)
goto err_iommu;
- vdpasim->device_id = device_id;
- vdpasim->supported_features = attr->features;
- vdpasim->nvqs = attr->nvqs;
INIT_WORK(>work, attr->work_fn);
spin_lock_init(>lock);
spin_lock_init(>iommu_lock);
@@ -238,7 +237,7 @@ struct vdpasim *vdpasim_create(struct vdpasim_init_attr
*attr)
if (!vdpasim->buffer)
goto
Re: [PATCH RFC 06/12] vdpa_sim: add struct vdpasim_device to store device properties
On 2020/11/13 下午9:47, Stefano Garzarella wrote:
Move device properties used during the entire life cycle in a new
structure to simplify the copy of these fields during the vdpasim
initialization.
Signed-off-by: Stefano Garzarella
It would be better to do it before patch 2.
---
drivers/vdpa/vdpa_sim/vdpa_sim.h | 17 --
drivers/vdpa/vdpa_sim/vdpa_sim.c | 33 ++--
drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 8 +--
drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 9 +---
4 files changed, 38 insertions(+), 29 deletions(-)
diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.h b/drivers/vdpa/vdpa_sim/vdpa_sim.h
index 6a1267c40d5e..76e642042eb0 100644
--- a/drivers/vdpa/vdpa_sim/vdpa_sim.h
+++ b/drivers/vdpa/vdpa_sim/vdpa_sim.h
@@ -40,12 +40,17 @@ struct vdpasim_virtqueue {
irqreturn_t (*cb)(void *data);
};
+struct vdpasim_device {
+ u64 supported_features;
+ u32 id;
+ int nvqs;
+};
+
struct vdpasim_init_attr {
- u32 device_id;
- u64 features;
+ struct vdpasim_device device;
+ int batch_mapping;
+
work_func_t work_fn;
- int batch_mapping;
- int nvqs;
};
/* State of each vdpasim device */
@@ -53,18 +58,16 @@ struct vdpasim {
struct vdpa_device vdpa;
struct vdpasim_virtqueue *vqs;
struct work_struct work;
+ struct vdpasim_device device;
/* spinlock to synchronize virtqueue state */
spinlock_t lock;
/* virtio config according to device type */
void *config;
struct vhost_iotlb *iommu;
void *buffer;
- u32 device_id;
u32 status;
u32 generation;
u64 features;
- u64 supported_features;
- int nvqs;
/* spinlock to synchronize iommu table */
spinlock_t iommu_lock;
};
diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c
index 9c9717441bbe..d053bd14b3f8 100644
--- a/drivers/vdpa/vdpa_sim/vdpa_sim.c
+++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c
@@ -28,7 +28,7 @@ static void vdpasim_queue_ready(struct vdpasim *vdpasim,
unsigned int idx)
{
struct vdpasim_virtqueue *vq = >vqs[idx];
- vringh_init_iotlb(>vring, vdpasim->supported_features,
+ vringh_init_iotlb(>vring, vdpasim->device.supported_features,
VDPASIM_QUEUE_MAX, false,
(struct vring_desc *)(uintptr_t)vq->desc_addr,
(struct vring_avail *)
@@ -46,7 +46,7 @@ static void vdpasim_vq_reset(struct vdpasim *vdpasim,
vq->device_addr = 0;
vq->cb = NULL;
vq->private = NULL;
- vringh_init_iotlb(>vring, vdpasim->supported_features,
+ vringh_init_iotlb(>vring, vdpasim->device.supported_features,
VDPASIM_QUEUE_MAX, false, NULL, NULL, NULL);
}
@@ -54,7 +54,7 @@ static void vdpasim_reset(struct vdpasim *vdpasim)
{
int i;
- for (i = 0; i < vdpasim->nvqs; i++)
+ for (i = 0; i < vdpasim->device.nvqs; i++)
vdpasim_vq_reset(vdpasim, >vqs[i]);
spin_lock(>iommu_lock);
@@ -189,7 +189,7 @@ struct vdpasim *vdpasim_create(struct vdpasim_init_attr
*attr)
struct device *dev;
int i, size, ret = -ENOMEM;
- device_id = attr->device_id;
+ device_id = attr->device.id;
/* Currently, we only accept the network and block devices. */
if (device_id != VIRTIO_ID_NET && device_id != VIRTIO_ID_BLOCK)
return ERR_PTR(-EOPNOTSUPP);
@@ -200,10 +200,12 @@ struct vdpasim *vdpasim_create(struct vdpasim_init_attr
*attr)
ops = _config_ops;
vdpasim = vdpa_alloc_device(struct vdpasim, vdpa, NULL, ops,
- attr->nvqs);
+ attr->device.nvqs);
if (!vdpasim)
goto err_alloc;
+ vdpasim->device = attr->device;
+
if (device_id == VIRTIO_ID_NET)
size = sizeof(struct virtio_net_config);
else
@@ -212,14 +214,11 @@ struct vdpasim *vdpasim_create(struct vdpasim_init_attr
*attr)
if (!vdpasim->config)
goto err_iommu;
- vdpasim->vqs = kcalloc(attr->nvqs, sizeof(struct vdpasim_virtqueue),
- GFP_KERNEL);
+ vdpasim->vqs = kcalloc(vdpasim->device.nvqs,
+ sizeof(struct vdpasim_virtqueue), GFP_KERNEL);
if (!vdpasim->vqs)
goto err_iommu;
- vdpasim->device_id = device_id;
- vdpasim->supported_features = attr->features;
- vdpasim->nvqs = attr->nvqs;
INIT_WORK(>work, attr->work_fn);
spin_lock_init(>lock);
spin_lock_init(>iommu_lock);
@@ -238,7 +237,7 @@ struct vdpasim *vdpasim_create(struct vdpasim_init_attr
*attr)
if (!vdpasim->buffer)
goto err_iommu;
- for (i = 0; i < vdpasim->nvqs; i++)
+ for (i = 0; i <
[PATCH RFC 06/12] vdpa_sim: add struct vdpasim_device to store device properties
Move device properties used during the entire life cycle in a new
structure to simplify the copy of these fields during the vdpasim
initialization.
Signed-off-by: Stefano Garzarella
---
drivers/vdpa/vdpa_sim/vdpa_sim.h | 17 --
drivers/vdpa/vdpa_sim/vdpa_sim.c | 33 ++--
drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 8 +--
drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 9 +---
4 files changed, 38 insertions(+), 29 deletions(-)
diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.h b/drivers/vdpa/vdpa_sim/vdpa_sim.h
index 6a1267c40d5e..76e642042eb0 100644
--- a/drivers/vdpa/vdpa_sim/vdpa_sim.h
+++ b/drivers/vdpa/vdpa_sim/vdpa_sim.h
@@ -40,12 +40,17 @@ struct vdpasim_virtqueue {
irqreturn_t (*cb)(void *data);
};
+struct vdpasim_device {
+ u64 supported_features;
+ u32 id;
+ int nvqs;
+};
+
struct vdpasim_init_attr {
- u32 device_id;
- u64 features;
+ struct vdpasim_device device;
+ int batch_mapping;
+
work_func_t work_fn;
- int batch_mapping;
- int nvqs;
};
/* State of each vdpasim device */
@@ -53,18 +58,16 @@ struct vdpasim {
struct vdpa_device vdpa;
struct vdpasim_virtqueue *vqs;
struct work_struct work;
+ struct vdpasim_device device;
/* spinlock to synchronize virtqueue state */
spinlock_t lock;
/* virtio config according to device type */
void *config;
struct vhost_iotlb *iommu;
void *buffer;
- u32 device_id;
u32 status;
u32 generation;
u64 features;
- u64 supported_features;
- int nvqs;
/* spinlock to synchronize iommu table */
spinlock_t iommu_lock;
};
diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c
index 9c9717441bbe..d053bd14b3f8 100644
--- a/drivers/vdpa/vdpa_sim/vdpa_sim.c
+++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c
@@ -28,7 +28,7 @@ static void vdpasim_queue_ready(struct vdpasim *vdpasim,
unsigned int idx)
{
struct vdpasim_virtqueue *vq = >vqs[idx];
- vringh_init_iotlb(>vring, vdpasim->supported_features,
+ vringh_init_iotlb(>vring, vdpasim->device.supported_features,
VDPASIM_QUEUE_MAX, false,
(struct vring_desc *)(uintptr_t)vq->desc_addr,
(struct vring_avail *)
@@ -46,7 +46,7 @@ static void vdpasim_vq_reset(struct vdpasim *vdpasim,
vq->device_addr = 0;
vq->cb = NULL;
vq->private = NULL;
- vringh_init_iotlb(>vring, vdpasim->supported_features,
+ vringh_init_iotlb(>vring, vdpasim->device.supported_features,
VDPASIM_QUEUE_MAX, false, NULL, NULL, NULL);
}
@@ -54,7 +54,7 @@ static void vdpasim_reset(struct vdpasim *vdpasim)
{
int i;
- for (i = 0; i < vdpasim->nvqs; i++)
+ for (i = 0; i < vdpasim->device.nvqs; i++)
vdpasim_vq_reset(vdpasim, >vqs[i]);
spin_lock(>iommu_lock);
@@ -189,7 +189,7 @@ struct vdpasim *vdpasim_create(struct vdpasim_init_attr
*attr)
struct device *dev;
int i, size, ret = -ENOMEM;
- device_id = attr->device_id;
+ device_id = attr->device.id;
/* Currently, we only accept the network and block devices. */
if (device_id != VIRTIO_ID_NET && device_id != VIRTIO_ID_BLOCK)
return ERR_PTR(-EOPNOTSUPP);
@@ -200,10 +200,12 @@ struct vdpasim *vdpasim_create(struct vdpasim_init_attr
*attr)
ops = _config_ops;
vdpasim = vdpa_alloc_device(struct vdpasim, vdpa, NULL, ops,
- attr->nvqs);
+ attr->device.nvqs);
if (!vdpasim)
goto err_alloc;
+ vdpasim->device = attr->device;
+
if (device_id == VIRTIO_ID_NET)
size = sizeof(struct virtio_net_config);
else
@@ -212,14 +214,11 @@ struct vdpasim *vdpasim_create(struct vdpasim_init_attr
*attr)
if (!vdpasim->config)
goto err_iommu;
- vdpasim->vqs = kcalloc(attr->nvqs, sizeof(struct vdpasim_virtqueue),
- GFP_KERNEL);
+ vdpasim->vqs = kcalloc(vdpasim->device.nvqs,
+ sizeof(struct vdpasim_virtqueue), GFP_KERNEL);
if (!vdpasim->vqs)
goto err_iommu;
- vdpasim->device_id = device_id;
- vdpasim->supported_features = attr->features;
- vdpasim->nvqs = attr->nvqs;
INIT_WORK(>work, attr->work_fn);
spin_lock_init(>lock);
spin_lock_init(>iommu_lock);
@@ -238,7 +237,7 @@ struct vdpasim *vdpasim_create(struct vdpasim_init_attr
*attr)
if (!vdpasim->buffer)
goto err_iommu;
- for (i = 0; i < vdpasim->nvqs; i++)
+ for (i = 0; i < vdpasim->device.nvqs; i++)
vringh_set_iotlb(>vqs[i].vring, vdpasim->iommu);
