vdpa: generalize vdpa simulator
v4 cover vdpa: generalize vdpa simulator
This series moves the network device simulator in a new module (vdpa_sim_net) and leaves the generic functions in the vdpa_sim core module, allowing the possibility to add new vDPA device simulators.
For now I removed the vdpa-blk simulator patches, since I'm still working on them and debugging the iotlb issues.
Thanks to Max that started this work! I took his patches and extended a bit.
v1: https://lists.linuxfoundation.org/pipermail/virtualization/2020-November/050677.html
v2: https://lists.linuxfoundation.org/pipermail/virtualization/2020-November/051036.html
v3: https://lists.linuxfoundation.org/pipermail/virtualization/2020-December/051195.html
v4:
- rebased on Linux v5.10
- checked better which headers are not directly used [Randy]
- removed patches that set unlimited iotlb and added a module parameter [Jason]
- explained in the commit message that .get_config stuff moving is safe [Jason]
- fixed typo in Kconfig (s/loop/loops) [Randy]
Max Gurtovoy (2):
vdpa_sim: remove hard-coded virtq count
vdpa: split vdpasim to core and net modules
Stefano Garzarella (16):
vdpa: remove unnecessary 'default n' in Kconfig entries
vdpa_sim: remove unnecessary headers inclusion
vdpa_sim: make IOTLB entries limit configurable
vdpa_sim: rename vdpasim_config_ops variables
vdpa_sim: add struct vdpasim_dev_attr for device attributes
vdpa_sim: add device id field in vdpasim_dev_attr
vdpa_sim: add supported_features field in vdpasim_dev_attr
vdpa_sim: add work_fn in vdpasim_dev_attr
vdpa_sim: store parsed MAC address in a buffer
vdpa_sim: make 'config' generic and usable for any device type
vdpa_sim: add get_config callback in vdpasim_dev_attr
vdpa_sim: add set_config callback in vdpasim_dev_attr
vdpa_sim: set vringh notify callback
vdpa_sim: use kvmalloc to allocate vdpasim->buffer
vdpa_sim: make vdpasim->buffer size configurable
vdpa_sim: split vdpasim_virtqueue's iov field in out_iov and in_iov
drivers/vdpa/vdpa_sim/vdpa_sim.h | 105 ++++++++++ drivers/vdpa/vdpa_sim/vdpa_sim.c | 298 ++++++++------------------- drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 177 ++++++++++++++++ drivers/vdpa/Kconfig | 16 +- drivers/vdpa/vdpa_sim/Makefile | 1 + 5 files changed, 374 insertions(+), 223 deletions(-) create mode 100644 drivers/vdpa/vdpa_sim/vdpa_sim.h create mode 100644 drivers/vdpa/vdpa_sim/vdpa_sim_net.c
Signature · 6 lines
2.26.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH v4 1/18 vdpa: remove unnecessary 'default n' in Kconfig entries
'default n' is not necessary since it is already the default when nothing is specified.
--- drivers/vdpa/Kconfig | 3 --- 1 file changed, 3 deletions(-)
drivers/vdpa/Kconfig +0 -3
@@ -14,7 +14,6 @@ config VDPA_SIM select DMA_OPS select VHOST_RING select GENERIC_NET_UTILS - default n help vDPA networking device simulator which loop TX traffic back to RX. This device is used for testing, prototyping and
@@ -23,7 +22,6 @@ config VDPA_SIM config IFCVF tristate "Intel IFC VF vDPA driver" depends on PCI_MSI - default n help This kernel module can drive Intel IFC VF NIC to offload virtio dataplane traffic to hardware.
@@ -42,7 +40,6 @@ config MLX5_VDPA_NET tristate "vDPA driver for ConnectX devices" select MLX5_VDPA depends on MLX5_CORE - default n help VDPA network driver for ConnectX6 and newer. Provides offloading of virtio net datapath such that descriptors put on the ring will
Signature · 6 lines
2.26.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH v4 2/18 vdpa_sim: remove unnecessary headers inclusion
In reply to Stefano GarzarellaSome headers are not necessary, so let's remove them to do some cleaning.
---
v4:
- checked better which headers are not directly used [Randy]
v3:
- avoided to remove some headers with structures and functions directly used (device.h, slab.h, virtio_byteorder.h)[Jason]
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/vdpa/vdpa_sim/vdpa_sim.c +0 -7
@@ -11,16 +11,9 @@#include <linux/module.h> #include <linux/device.h> #include <linux/kernel.h> -#include <linux/fs.h> -#include <linux/poll.h> #include <linux/slab.h> #include <linux/sched.h> -#include <linux/wait.h> -#include <linux/uuid.h> -#include <linux/iommu.h> #include <linux/dma-map-ops.h> -#include <linux/sysfs.h> -#include <linux/file.h> #include <linux/etherdevice.h> #include <linux/vringh.h> #include <linux/vdpa.h>
Signature · 6 lines
2.26.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH v4 3/18 vdpa_sim: remove hard-coded virtq count
In reply to Stefano GarzarellaFrom: Max Gurtovoy <[email protected]>
Add a new attribute that will define the number of virt queues to be created for the vdpasim device.
---
v1:
- use kcalloc() instead of kmalloc_array() since some function expects variables initialized to zero
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/vdpa/vdpa_sim/vdpa_sim.c +13 -5
@@ -63,7 +63,7 @@ static u64 vdpasim_features = (1ULL << VIRTIO_F_ANY_LAYOUT) |/* State of each vdpasim device */ struct vdpasim {struct vdpa_device vdpa; -struct vdpasim_virtqueue vqs[VDPASIM_VQ_NUM ]; +struct vdpasim_virtqueue *vqs;struct work_struct work;/* spinlock to synchronize virtqueue state */ spinlock_t lock;
@@ -73,6 +73,7 @@ struct vdpasim {u32 status;u32 generation;u64 features; +int nvqs;/* spinlock to synchronize iommu table */ spinlock_t iommu_lock; };
@@ -137,7 +138,7 @@ static void vdpasim_reset(struct vdpasim *vdpasim) {int i; -for (i =0 ; i <VDPASIM_VQ_NUM ; i++) +for (i =0 ; i < vdpasim->nvqs; i++)vdpasim_vq_reset (&vdpasim->vqs[i]);spin_lock (&vdpasim->iommu_lock);
@@ -343,7 +344,7 @@ static struct vdpasim *vdpasim_create(void)const struct vdpa_config_ops *ops;struct vdpasim *vdpasim;struct device *dev; -int ret = -ENOMEM ; +int i, ret = -ENOMEM ;if (batch_mapping) ops = &vdpasim_net_batch_config_ops;
@@ -354,6 +355,7 @@ static struct vdpasim *vdpasim_create(void)if (!vdpasim) goto err_alloc; + vdpasim->nvqs =VDPASIM_VQ_NUM ;INIT_WORK (&vdpasim->work, vdpasim_work);spin_lock_init (&vdpasim->lock);spin_lock_init (&vdpasim->iommu_lock);
@@ -364,6 +366,11 @@ static struct vdpasim *vdpasim_create(void) goto err_iommu;set_dma_ops (dev, &vdpasim_dma_ops); + vdpasim->vqs =kcalloc (vdpasim->nvqs,sizeof (struct vdpasim_virtqueue ), +GFP_KERNEL ); +if (!vdpasim->vqs) + goto err_iommu; + vdpasim->iommu =vhost_iotlb_alloc (2048 ,0 );if (!vdpasim->iommu) goto err_iommu;
@@ -382,8 +389,8 @@ static struct vdpasim *vdpasim_create(void)eth_random_addr (vdpasim->config.mac); } -vringh_set_iotlb (&vdpasim->vqs[0 ].vring, vdpasim->iommu); -vringh_set_iotlb (&vdpasim->vqs[1 ].vring, vdpasim->iommu); +for (i =0 ; i < vdpasim->nvqs; i++) +vringh_set_iotlb (&vdpasim->vqs[i].vring, vdpasim->iommu); vdpasim->vdpa.dma_dev = dev; ret =vdpa_register_device (&vdpasim->vdpa);
@@ -652,6 +659,7 @@ static void vdpasim_free(struct vdpa_device *vdpa)kfree (vdpasim->buffer);if (vdpasim->iommu)vhost_iotlb_free (vdpasim->iommu); +kfree (vdpasim->vqs); }static const struct vdpa_config_ops vdpasim_net_config_ops = {
Signature · 6 lines
2.26.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH v4 4/18 vdpa_sim: make IOTLB entries limit configurable
In reply to Stefano GarzarellaSome devices may require a higher limit for the number of IOTLB entries, so let's make it configurable through a module parameter.
By default, it's initialized with the current limit (2048).
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/vdpa/vdpa_sim/vdpa_sim.c +6 -1
@@ -31,6 +31,11 @@ static int batch_mapping = 1;module_param (batch_mapping, int,0444 );MODULE_PARM_DESC (batch_mapping,"Batched mapping 1 -Enable; 0 - Disable" ); +static int max_iotlb_entries =2048 ; +module_param (max_iotlb_entries, int,0444 ); +MODULE_PARM_DESC (max_iotlb_entries, +"Maximum number of iotlb entries. 0 means unlimited. (default: 2048)" ); +static char *macaddr;module_param (macaddr, charp,0 );MODULE_PARM_DESC (macaddr,"Ethernet MAC address" );
@@ -371,7 +376,7 @@ static struct vdpasim *vdpasim_create(void)if (!vdpasim->vqs) goto err_iommu; - vdpasim->iommu =vhost_iotlb_alloc (2048 ,0 ); + vdpasim->iommu =vhost_iotlb_alloc (max_iotlb_entries,0 );if (!vdpasim->iommu) goto err_iommu;
Signature · 6 lines
2.26.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH v4 04/18] vdpa_sim: make IOTLB entries limit configurable
Quoted 7 lines · Stefano Garzarella
Some devices may require a higher limit for the number of IOTLB entries, so let's make it configurable through a module parameter.
By default, it's initialized with the current limit (2048).
Suggested-by Jason Wang <[email protected]>Signed-off-by Stefano Garzarella <[email protected]>
Quoted 21 lines
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/vdpa/vdpa_sim/vdpa_sim.c +5
-0@@ -31,6 +31,11 @@ static int batch_mapping = 1;module_param (batch_mapping, int,0444 );MODULE_PARM_DESC (batch_mapping,"Batched mapping 1 -Enable; 0 - Disable" ); +static int max_iotlb_entries =2048 ; +module_param (max_iotlb_entries, int,0444 ); +MODULE_PARM_DESC (max_iotlb_entries, +"Maximum number of iotlb entries. 0 means unlimited. (default: 2048)" ); +static char *macaddr;module_param (macaddr, charp,0 );MODULE_PARM_DESC (macaddr,"Ethernet MAC address" );
drivers/vdpa/vdpa_sim/vdpa_sim.c static struct vdpasim *vdpasim_create(void) · line 382
Quoted 8 lines
drivers/vdpa/vdpa_sim/vdpa_sim.c +1
-1@@ -371,7 +376,7 @@ static struct vdpasim *vdpasim_create(void)if (!vdpasim->vqs) goto err_iommu; - vdpasim->iommu =vhost_iotlb_alloc (2048 ,0 ); + vdpasim->iommu =vhost_iotlb_alloc (max_iotlb_entries,0 );if (!vdpasim->iommu) goto err_iommu;
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH v4 5/18 vdpa_sim: rename vdpasim_config_ops variables
In reply to Stefano GarzarellaThese variables store generic callbacks used by the vDPA simulator core, so we can remove the 'net' word in their names.
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/vdpa/vdpa_sim/vdpa_sim.c +6 -6
@@ -341,8 +341,8 @@ static const struct dma_map_ops vdpasim_dma_ops = { .free = vdpasim_free_coherent, }; -static const struct vdpa_config_ops vdpasim_net_config_ops; -static const struct vdpa_config_ops vdpasim_net_batch_config_ops; +static const struct vdpa_config_ops vdpasim_config_ops; +static const struct vdpa_config_ops vdpasim_batch_config_ops;static struct vdpasim *vdpasim_create (void ) {
@@ -352,9 +352,9 @@ static struct vdpasim *vdpasim_create(void)int i, ret = -ENOMEM ;if (batch_mapping) - ops = &vdpasim_net_batch_config_ops; + ops = &vdpasim_batch_config_ops;else - ops = &vdpasim_net_config_ops; + ops = &vdpasim_config_ops; vdpasim = vdpa_alloc_device(struct vdpasim, vdpa, NULL, ops, VDPASIM_VQ_NUM);if (!vdpasim)
@@ -667,7 +667,7 @@ static void vdpasim_free(struct vdpa_device *vdpa)kfree (vdpasim->vqs); } -static const struct vdpa_config_ops vdpasim_net_config_ops = { +static const struct vdpa_config_ops vdpasim_config_ops = { .set_vq_address = vdpasim_set_vq_address, .set_vq_num = vdpasim_set_vq_num, .kick_vq = vdpasim_kick_vq,
@@ -694,7 +694,7 @@ static const struct vdpa_config_ops vdpasim_net_config_ops = { .free = vdpasim_free, }; -static const struct vdpa_config_ops vdpasim_net_batch_config_ops = { +static const struct vdpa_config_ops vdpasim_batch_config_ops = { .set_vq_address = vdpasim_set_vq_address, .set_vq_num = vdpasim_set_vq_num, .kick_vq = vdpasim_kick_vq,
Signature · 6 lines
2.26.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH v4 6/18 vdpa_sim: add struct vdpasim_dev_attr for device attributes
In reply to Stefano Garzarellavdpasim_dev_attr will contain device specific attributes. We starting moving the number of virtqueues (i.e. nvqs) to vdpasim_dev_attr.
vdpasim_create() creates a new vDPA simulator following the device attributes defined in the vdpasim_dev_attr parameter.
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-)
drivers/vdpa/vdpa_sim/vdpa_sim.c +17 -8
@@ -65,11 +65,16 @@ static u64 vdpasim_features = (1ULL << VIRTIO_F_ANY_LAYOUT) | (1ULL <<VIRTIO_F_ACCESS_PLATFORM ) | (1ULL <<VIRTIO_NET_F_MAC ); +struct vdpasim_dev_attr { +int nvqs; +}; +/* State of each vdpasim device */ struct vdpasim {struct vdpa_device vdpa;struct vdpasim_virtqueue *vqs;struct work_struct work; +struct vdpasim_dev_attr dev_attr;/* spinlock to synchronize virtqueue state */ spinlock_t lock;struct virtio_net_config config;
@@ -78,7 +83,6 @@ struct vdpasim {u32 status;u32 generation;u64 features; -int nvqs;/* spinlock to synchronize iommu table */ spinlock_t iommu_lock; };
@@ -143,7 +147,7 @@ static void vdpasim_reset(struct vdpasim *vdpasim) {int i; -for (i =0 ; i < vdpasim->nvqs; i++) +for (i =0 ; i < vdpasim->dev_attr.nvqs; i++)vdpasim_vq_reset (&vdpasim->vqs[i]);spin_lock (&vdpasim->iommu_lock);
@@ -344,7 +348,7 @@ static const struct dma_map_ops vdpasim_dma_ops = {static const struct vdpa_config_ops vdpasim_config_ops;static const struct vdpa_config_ops vdpasim_batch_config_ops; -static struct vdpasim *vdpasim_create (void ) +static struct vdpasim *vdpasim_create (struct vdpasim_dev_attr *dev_attr) {const struct vdpa_config_ops *ops;struct vdpasim *vdpasim;
@@ -356,11 +360,12 @@ static struct vdpasim *vdpasim_create(void)else ops = &vdpasim_config_ops; - vdpasim = vdpa_alloc_device(struct vdpasim, vdpa, NULL, ops, VDPASIM_VQ_NUM); + vdpasim = vdpa_alloc_device(struct vdpasim, vdpa, NULL, ops, + dev_attr->nvqs);if (!vdpasim) goto err_alloc; - vdpasim->nvqs =VDPASIM_VQ_NUM ; + vdpasim->dev_attr = *dev_attr;INIT_WORK (&vdpasim->work, vdpasim_work);spin_lock_init (&vdpasim->lock);spin_lock_init (&vdpasim->iommu_lock);
@@ -371,7 +376,7 @@ static struct vdpasim *vdpasim_create(void) goto err_iommu;set_dma_ops (dev, &vdpasim_dma_ops); - vdpasim->vqs =kcalloc (vdpasim->nvqs,sizeof (struct vdpasim_virtqueue ), + vdpasim->vqs =kcalloc (dev_attr->nvqs,sizeof (struct vdpasim_virtqueue ),GFP_KERNEL );if (!vdpasim->vqs) goto err_iommu;
@@ -394,7 +399,7 @@ static struct vdpasim *vdpasim_create(void)eth_random_addr (vdpasim->config.mac); } -for (i =0 ; i < vdpasim->nvqs; i++) +for (i =0 ; i < dev_attr->nvqs; i++)vringh_set_iotlb (&vdpasim->vqs[i].vring, vdpasim->iommu); vdpasim->vdpa.dma_dev = dev;
@@ -722,7 +727,11 @@ static const struct vdpa_config_ops vdpasim_batch_config_ops = {static int __init vdpasim_dev_init (void ) { - vdpasim_dev =vdpasim_create (); +struct vdpasim_dev_attr dev_attr = {}; + + dev_attr.nvqs =VDPASIM_VQ_NUM ; + + vdpasim_dev =vdpasim_create (&dev_attr);if (!IS_ERR (vdpasim_dev))return 0 ;
Signature · 6 lines
2.26.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH v4 7/18 vdpa_sim: add device id field in vdpasim_dev_attr
In reply to Stefano GarzarellaRemove VDPASIM_DEVICE_ID macro and add 'id' field in vdpasim_dev_attr, that will be returned by vdpasim_get_device_id().
Use VIRTIO_ID_NET for vDPA-net simulator device id.
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/vdpa/vdpa_sim/vdpa_sim.c +5 -2
@@ -55,7 +55,6 @@ struct vdpasim_virtqueue {#define VDPASIM_QUEUE_ALIGN PAGE_SIZE#define VDPASIM_QUEUE_MAX 256 -#define VDPASIM_DEVICE_ID 0x1#define VDPASIM_VENDOR_ID 0#define VDPASIM_VQ_NUM 0x2#define VDPASIM_NAME "vdpasim-netdev"
@@ -67,6 +66,7 @@ static u64 vdpasim_features = (1ULL << VIRTIO_F_ANY_LAYOUT) |struct vdpasim_dev_attr {int nvqs; +u32 id; };/* State of each vdpasim device */
@@ -546,7 +546,9 @@ static u16 vdpasim_get_vq_num_max(struct vdpa_device *vdpa)static u32 vdpasim_get_device_id (struct vdpa_device *vdpa) { -return VDPASIM_DEVICE_ID ; +struct vdpasim *vdpasim =vdpa_to_sim (vdpa); + +return vdpasim->dev_attr.id; }static u32 vdpasim_get_vendor_id (struct vdpa_device *vdpa)
@@ -729,6 +731,7 @@ static int __init vdpasim_dev_init(void) {struct vdpasim_dev_attr dev_attr = {}; + dev_attr.id =VIRTIO_ID_NET ; dev_attr.nvqs =VDPASIM_VQ_NUM ; vdpasim_dev =vdpasim_create (&dev_attr);
Signature · 6 lines
2.26.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH v4 8/18 vdpa_sim: add supported_features field in vdpasim_dev_attr
In reply to Stefano GarzarellaIntroduce a new VDPASIM_FEATURES macro with the generic features supported by the vDPA simulator, and VDPASIM_NET_FEATURES macro with vDPA-net features.
Add 'supported_features' field in vdpasim_dev_attr, to allow devices to specify their features.
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-)
drivers/vdpa/vdpa_sim/vdpa_sim.c +18 -11
@@ -59,12 +59,15 @@ struct vdpasim_virtqueue {#define VDPASIM_VQ_NUM 0x2#define VDPASIM_NAME "vdpasim-netdev" -static u64 vdpasim_features = (1ULL <<VIRTIO_F_ANY_LAYOUT ) | - (1ULL <<VIRTIO_F_VERSION_1 ) | - (1ULL <<VIRTIO_F_ACCESS_PLATFORM ) | - (1ULL <<VIRTIO_NET_F_MAC ); +#define VDPASIM_FEATURES ((1ULL << VIRTIO_F_ANY_LAYOUT) | \ + (1ULL << VIRTIO_F_VERSION_1) | \ + (1ULL << VIRTIO_F_ACCESS_PLATFORM)) + +#define VDPASIM_NET_FEATURES (VDPASIM_FEATURES | \ + (1ULL << VIRTIO_NET_F_MAC))struct vdpasim_dev_attr { +u64 supported_features;int nvqs;u32 id; };
@@ -122,7 +125,7 @@ static void vdpasim_queue_ready(struct vdpasim *vdpasim, unsigned int idx) {struct vdpasim_virtqueue *vq = &vdpasim->vqs[idx]; - vringh_init_iotlb(&vq->vring, vdpasim_features, + vringh_init_iotlb(&vq->vring, vdpasim->dev_attr.supported_features, VDPASIM_QUEUE_MAX, false, (struct vring_desc *)(uintptr_t)vq->desc_addr, (struct vring_avail *)
@@ -131,7 +134,8 @@ static void vdpasim_queue_ready(struct vdpasim *vdpasim, unsigned int idx) (uintptr_t)vq->device_addr); } -static void vdpasim_vq_reset (struct vdpasim_virtqueue *vq) +static void vdpasim_vq_reset (struct vdpasim *vdpasim, +struct vdpasim_virtqueue *vq) { vq->ready = false; vq->desc_addr =0 ;
@@ -139,8 +143,8 @@ static void vdpasim_vq_reset(struct vdpasim_virtqueue *vq) vq->device_addr =0 ; vq->cb =NULL ; vq->private =NULL ; -vringh_init_iotlb (&vq->vring, vdpasim_features,VDPASIM_QUEUE_MAX , - false,NULL ,NULL ,NULL ); +vringh_init_iotlb (&vq->vring, vdpasim->dev_attr.supported_features, +VDPASIM_QUEUE_MAX , false,NULL ,NULL ,NULL ); }static void vdpasim_reset (struct vdpasim *vdpasim)
@@ -148,7 +152,7 @@ static void vdpasim_reset(struct vdpasim *vdpasim)int i;for (i =0 ; i < vdpasim->dev_attr.nvqs; i++) -vdpasim_vq_reset (&vdpasim->vqs[i]); +vdpasim_vq_reset (vdpasim, &vdpasim->vqs[i]);spin_lock (&vdpasim->iommu_lock);vhost_iotlb_reset (vdpasim->iommu);
@@ -508,7 +512,9 @@ static u32 vdpasim_get_vq_align(struct vdpa_device *vdpa)static u64 vdpasim_get_features (struct vdpa_device *vdpa) { -return vdpasim_features; +struct vdpasim *vdpasim =vdpa_to_sim (vdpa); + +return vdpasim->dev_attr.supported_features; }static int vdpasim_set_features (struct vdpa_device *vdpa,u64 features)
@@ -520,7 +526,7 @@ static int vdpasim_set_features(struct vdpa_device *vdpa, u64 features)if (!(features & (1ULL <<VIRTIO_F_ACCESS_PLATFORM )))return -EINVAL ; - vdpasim->features = features & vdpasim_features; + vdpasim->features = features & vdpasim->dev_attr.supported_features;/* We generally only know whether guest is using the legacy interface * here, so generally that's the earliest we can set config fields.
@@ -732,6 +738,7 @@ static int __init vdpasim_dev_init(void)struct vdpasim_dev_attr dev_attr = {}; dev_attr.id =VIRTIO_ID_NET ; + dev_attr.supported_features =VDPASIM_NET_FEATURES ; dev_attr.nvqs =VDPASIM_VQ_NUM ; vdpasim_dev =vdpasim_create (&dev_attr);
Signature · 6 lines
2.26.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH v4 9/18 vdpa_sim: add work_fn in vdpasim_dev_attr
In reply to Stefano GarzarellaRename vdpasim_work() in vdpasim_net_work() and add it to the vdpasim_dev_attr structure.
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/vdpa/vdpa_sim/vdpa_sim.c +5 -2
@@ -70,6 +70,8 @@ struct vdpasim_dev_attr {u64 supported_features;int nvqs;u32 id; + +work_func_t work_fn; };/* State of each vdpasim device */
@@ -163,7 +165,7 @@ static void vdpasim_reset(struct vdpasim *vdpasim) ++vdpasim->generation; } -static void vdpasim_work (struct work_struct *work) +static void vdpasim_net_work (struct work_struct *work) { struct vdpasim *vdpasim = container_of(work, struct vdpasim, work);
@@ -370,7 +372,7 @@ static struct vdpasim *vdpasim_create(struct vdpasim_dev_attr *dev_attr) goto err_alloc; vdpasim->dev_attr = *dev_attr; -INIT_WORK (&vdpasim->work, vdpasim_work); +INIT_WORK (&vdpasim->work, dev_attr->work_fn);spin_lock_init (&vdpasim->lock);spin_lock_init (&vdpasim->iommu_lock);
@@ -740,6 +742,7 @@ static int __init vdpasim_dev_init(void) dev_attr.id =VIRTIO_ID_NET ; dev_attr.supported_features =VDPASIM_NET_FEATURES ; dev_attr.nvqs =VDPASIM_VQ_NUM ; + dev_attr.work_fn = vdpasim_net_work; vdpasim_dev =vdpasim_create (&dev_attr);
Signature · 6 lines
2.26.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH v4 10/18 vdpa_sim: store parsed MAC address in a buffer
In reply to Stefano GarzarellaAs preparation for the next patches, we store the MAC address, parsed during the vdpasim_create(), in a buffer that will be used to fill 'config' together with other configurations.
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/vdpa/vdpa_sim/vdpa_sim.c +7 -3
@@ -40,6 +40,8 @@ static char *macaddr;module_param (macaddr, charp,0 );MODULE_PARM_DESC (macaddr,"Ethernet MAC address" ); +u8 macaddr_buf[ETH_ALEN ]; +struct vdpasim_virtqueue {struct vringh vring;struct vringh_kiov iov;
@@ -396,13 +398,13 @@ static struct vdpasim *vdpasim_create(struct vdpasim_dev_attr *dev_attr) goto err_iommu;if (macaddr) { -mac_pton (macaddr, vdpasim->config.mac); -if (!is_valid_ether_addr (vdpasim->config.mac)) { +mac_pton (macaddr, macaddr_buf); +if (!is_valid_ether_addr (macaddr_buf)) { ret = -EADDRNOTAVAIL ; goto err_iommu; } }else { -eth_random_addr (vdpasim->config.mac); +eth_random_addr (macaddr_buf); }for (i =0 ; i < dev_attr->nvqs; i++)
@@ -538,6 +540,8 @@ static int vdpasim_set_features(struct vdpa_device *vdpa, u64 features) config->mtu =cpu_to_vdpasim16 (vdpasim,1500 ); config->status =cpu_to_vdpasim16 (vdpasim,VIRTIO_NET_S_LINK_UP ); +memcpy (config->mac, macaddr_buf,ETH_ALEN ); +return 0 ; }
Signature · 6 lines
2.26.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH v4 11/18 vdpa_sim: make 'config' generic and usable for any device type
In reply to Stefano GarzarellaAdd new 'config_size' attribute in 'vdpasim_dev_attr' and allocates 'config' dynamically to support any device types.
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/vdpa/vdpa_sim/vdpa_sim.c +13 -4
@@ -70,6 +70,7 @@ struct vdpasim_virtqueue {struct vdpasim_dev_attr {u64 supported_features; +size_t config_size;int nvqs;u32 id;
@@ -84,7 +85,8 @@ struct vdpasim {struct vdpasim_dev_attr dev_attr;/* spinlock to synchronize virtqueue state */ spinlock_t lock; -struct virtio_net_config config; +/* virtio config according to device type */ +void *config;struct vhost_iotlb *iommu;void *buffer;u32 status;
@@ -384,6 +386,10 @@ static struct vdpasim *vdpasim_create(struct vdpasim_dev_attr *dev_attr) goto err_iommu;set_dma_ops (dev, &vdpasim_dma_ops); + vdpasim->config =kzalloc (dev_attr->config_size,GFP_KERNEL ); +if (!vdpasim->config) + goto err_iommu; + vdpasim->vqs =kcalloc (dev_attr->nvqs,sizeof (struct vdpasim_virtqueue ),GFP_KERNEL );if (!vdpasim->vqs)
@@ -524,7 +530,8 @@ static u64 vdpasim_get_features(struct vdpa_device *vdpa)static int vdpasim_set_features (struct vdpa_device *vdpa,u64 features) {struct vdpasim *vdpasim =vdpa_to_sim (vdpa); -struct virtio_net_config *config = &vdpasim->config; +struct virtio_net_config *config = + (struct virtio_net_config *)vdpasim->config;/* DMA mapping must be done by driver */ if (!(features & (1ULL <<VIRTIO_F_ACCESS_PLATFORM )))
@@ -596,8 +603,8 @@ static void vdpasim_get_config(struct vdpa_device *vdpa, unsigned int offset, {struct vdpasim *vdpasim =vdpa_to_sim (vdpa); -if (offset + len <sizeof (struct virtio_net_config )) -memcpy (buf, (u8 *)&vdpasim->config + offset, len); +if (offset + len < vdpasim->dev_attr.config_size) +memcpy (buf, vdpasim->config + offset, len); } static void vdpasim_set_config(struct vdpa_device *vdpa, unsigned int offset,
@@ -684,6 +691,7 @@ static void vdpasim_free(struct vdpa_device *vdpa)if (vdpasim->iommu)vhost_iotlb_free (vdpasim->iommu);kfree (vdpasim->vqs); +kfree (vdpasim->config); }static const struct vdpa_config_ops vdpasim_config_ops = {
@@ -746,6 +754,7 @@ static int __init vdpasim_dev_init(void) dev_attr.id =VIRTIO_ID_NET ; dev_attr.supported_features =VDPASIM_NET_FEATURES ; dev_attr.nvqs =VDPASIM_VQ_NUM ; + dev_attr.config_size =sizeof (struct virtio_net_config ); dev_attr.work_fn = vdpasim_net_work; vdpasim_dev =vdpasim_create (&dev_attr);
Signature · 6 lines
2.26.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH v4 12/18 vdpa_sim: add get_config callback in vdpasim_dev_attr
In reply to Stefano GarzarellaThe get_config callback can be used by the device to fill the config structure.
The callback will be invoked in vdpasim_get_config() before copying bytes into caller buffer.
Move vDPA-net config updates from vdpasim_set_features() in the new vdpasim_net_get_config() callback.
This is safe since in vdpa_get_config() we already check that .set_features() callback is called before .get_config().
---
v4:
- explained in the commit message that the moving is safe [Jason]
v3:
- checked if get_config callback is set before call it
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 35 +++++++++++++++++++------------- 1 file changed, 21 insertions(+), 14 deletions(-)
drivers/vdpa/vdpa_sim/vdpa_sim.c +21 -14
@@ -68,6 +68,8 @@ struct vdpasim_virtqueue {#define VDPASIM_NET_FEATURES (VDPASIM_FEATURES | \ (1ULL << VIRTIO_NET_F_MAC)) +struct vdpasim ; +struct vdpasim_dev_attr {u64 supported_features;size_t config_size;
@@ -75,6 +77,7 @@ struct vdpasim_dev_attr {u32 id;work_func_t work_fn; +void (*get_config)(struct vdpasim *vdpasim,void *config); };/* State of each vdpasim device */
@@ -530,8 +533,6 @@ static u64 vdpasim_get_features(struct vdpa_device *vdpa)static int vdpasim_set_features (struct vdpa_device *vdpa,u64 features) {struct vdpasim *vdpasim =vdpa_to_sim (vdpa); -struct virtio_net_config *config = - (struct virtio_net_config *)vdpasim->config;/* DMA mapping must be done by driver */ if (!(features & (1ULL <<VIRTIO_F_ACCESS_PLATFORM )))
@@ -539,16 +540,6 @@ static int vdpasim_set_features(struct vdpa_device *vdpa, u64 features) vdpasim->features = features & vdpasim->dev_attr.supported_features; -/* We generally only know whether guest is using the legacy interface -* here, so generally that's the earliest we can set config fields. -* Note: We actually require VIRTIO_F_ACCESS_PLATFORM above which -* implies VIRTIO_F_VERSION_1, but let's not try to be clever here. -*/ - - config->mtu =cpu_to_vdpasim16 (vdpasim,1500 ); - config->status =cpu_to_vdpasim16 (vdpasim,VIRTIO_NET_S_LINK_UP ); -memcpy (config->mac, macaddr_buf,ETH_ALEN ); -return 0 ; }
@@ -603,8 +594,13 @@ static void vdpasim_get_config(struct vdpa_device *vdpa, unsigned int offset, {struct vdpasim *vdpasim =vdpa_to_sim (vdpa); -if (offset + len < vdpasim->dev_attr.config_size) -memcpy (buf, vdpasim->config + offset, len); +if (offset + len > vdpasim->dev_attr.config_size) +return ; + +if (vdpasim->dev_attr.get_config) + vdpasim->dev_attr.get_config (vdpasim, vdpasim->config); + +memcpy (buf, vdpasim->config + offset, len); } static void vdpasim_set_config(struct vdpa_device *vdpa, unsigned int offset,
@@ -747,6 +743,16 @@ static const struct vdpa_config_ops vdpasim_batch_config_ops = { .free = vdpasim_free, }; +static void vdpasim_net_get_config (struct vdpasim *vdpasim,void *config) +{ +struct virtio_net_config *net_config = + (struct virtio_net_config *)config; + + net_config->mtu =cpu_to_vdpasim16 (vdpasim,1500 ); + net_config->status =cpu_to_vdpasim16 (vdpasim,VIRTIO_NET_S_LINK_UP ); +memcpy (net_config->mac, macaddr_buf,ETH_ALEN ); +} +static int __init vdpasim_dev_init (void ) {struct vdpasim_dev_attr dev_attr = {};
@@ -755,6 +761,7 @@ static int __init vdpasim_dev_init(void) dev_attr.supported_features =VDPASIM_NET_FEATURES ; dev_attr.nvqs =VDPASIM_VQ_NUM ; dev_attr.config_size =sizeof (struct virtio_net_config ); + dev_attr.get_config = vdpasim_net_get_config; dev_attr.work_fn = vdpasim_net_work; vdpasim_dev =vdpasim_create (&dev_attr);
Signature · 6 lines
2.26.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH v4 12/18] vdpa_sim: add get_config callback in vdpasim_dev_attr
Quoted 11 lines · Stefano Garzarella
The
get_configcallback can be used by the device to fill the config structure.
The callback will be invoked invdpasim_get_config()before copying bytes into caller buffer.Move vDPA-net config updates from
vdpasim_set_features()in the newvdpasim_net_get_config()callback.
This is safe since invdpa_get_config()we already check that .set_features() callback is called before .get_config().Signed-off-by Stefano Garzarella <[email protected]>
Quoted 91 lines
---
v4:
- explained in the commit message that the moving is safe [Jason]v3:
- checked ifget_configcallback is set before call it--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 35 +++++++++++++++++++------------- 1 file changed, 21 insertions(+), 14 deletions(-)drivers/vdpa/vdpa_sim/vdpa_sim.c +20
-14@@ -68,6 +68,8 @@ struct vdpasim_virtqueue {#define VDPASIM_NET_FEATURES (VDPASIM_FEATURES | \ (1ULL << VIRTIO_NET_F_MAC)) +struct vdpasim ; +struct vdpasim_dev_attr {u64 supported_features;size_t config_size;@@ -75,6 +77,7 @@ struct vdpasim_dev_attr {u32 id;work_func_t work_fn; +void (*get_config)(struct vdpasim *vdpasim,void *config); };/* State of each vdpasim device */ @@ -530,8 +533,6 @@ static u64 vdpasim_get_features(struct vdpa_device *vdpa)static int vdpasim_set_features (struct vdpa_device *vdpa,u64 features) {struct vdpasim *vdpasim =vdpa_to_sim (vdpa); -struct virtio_net_config *config = - (struct virtio_net_config *)vdpasim->config;/* DMA mapping must be done by driver */ if (!(features & (1ULL <<VIRTIO_F_ACCESS_PLATFORM )))@@ -539,16 +540,6 @@ static int vdpasim_set_features(struct vdpa_device *vdpa, u64 features) vdpasim->features = features & vdpasim->dev_attr.supported_features; -/* We generally only know whether guest is using the legacy interface -* here, so generally that's the earliest we can set config fields. -* Note: We actually require VIRTIO_F_ACCESS_PLATFORM above which -* implies VIRTIO_F_VERSION_1, but let's not try to be clever here. -*/ - - config->mtu =cpu_to_vdpasim16 (vdpasim,1500 ); - config->status =cpu_to_vdpasim16 (vdpasim,VIRTIO_NET_S_LINK_UP ); -memcpy (config->mac, macaddr_buf,ETH_ALEN ); -return 0 ; }@@ -603,8 +594,13 @@ static void vdpasim_get_config(struct vdpa_device *vdpa, unsigned int offset, {struct vdpasim *vdpasim =vdpa_to_sim (vdpa); -if (offset + len < vdpasim->dev_attr.config_size) -memcpy (buf, vdpasim->config + offset, len); +if (offset + len > vdpasim->dev_attr.config_size) +return ; + +if (vdpasim->dev_attr.get_config) + vdpasim->dev_attr.get_config (vdpasim, vdpasim->config); + +memcpy (buf, vdpasim->config + offset, len); } static void vdpasim_set_config(struct vdpa_device *vdpa, unsigned int offset,@@ -747,6 +743,16 @@ static const struct vdpa_config_ops vdpasim_batch_config_ops = { .free = vdpasim_free, }; +static void vdpasim_net_get_config (struct vdpasim *vdpasim,void *config) +{ +struct virtio_net_config *net_config = + (struct virtio_net_config *)config; + + net_config->mtu =cpu_to_vdpasim16 (vdpasim,1500 ); + net_config->status =cpu_to_vdpasim16 (vdpasim,VIRTIO_NET_S_LINK_UP ); +memcpy (net_config->mac, macaddr_buf,ETH_ALEN ); +} +static int __init vdpasim_dev_init (void ) {struct vdpasim_dev_attr dev_attr = {};
drivers/vdpa/vdpa_sim/vdpa_sim.c static int __init vdpasim_dev_init(void) · line 767
Quoted 7 lines
drivers/vdpa/vdpa_sim/vdpa_sim.c +1
-0@@ -755,6 +761,7 @@ static int __init vdpasim_dev_init(void) dev_attr.supported_features =VDPASIM_NET_FEATURES ; dev_attr.nvqs =VDPASIM_VQ_NUM ; dev_attr.config_size =sizeof (struct virtio_net_config ); + dev_attr.get_config = vdpasim_net_get_config; dev_attr.work_fn = vdpasim_net_work; vdpasim_dev =vdpasim_create (&dev_attr);
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH v4 13/18 vdpa_sim: add set_config callback in vdpasim_dev_attr
In reply to Stefano GarzarellaThe set_config callback can be used by the device to parse the config structure modified by the driver.
The callback will be invoked, if set, in vdpasim_set_config() after copying bytes from caller buffer into vdpasim->config buffer.
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/vdpa/vdpa_sim/vdpa_sim.c +10 -1
@@ -78,6 +78,7 @@ struct vdpasim_dev_attr {work_func_t work_fn;void (*get_config)(struct vdpasim *vdpasim,void *config); +void (*set_config)(struct vdpasim *vdpasim,const void *config); };/* State of each vdpasim device */
@@ -606,7 +607,15 @@ static void vdpasim_get_config(struct vdpa_device *vdpa, unsigned int offset,static void vdpasim_set_config (struct vdpa_device *vdpa,unsigned int offset,const void *buf,unsigned int len) { -/* No writable config supportted by vdpasim */ +struct vdpasim *vdpasim =vdpa_to_sim (vdpa); + +if (offset + len > vdpasim->dev_attr.config_size) +return ; + +memcpy (vdpasim->config + offset, buf, len); + +if (vdpasim->dev_attr.set_config) + vdpasim->dev_attr.set_config (vdpasim, vdpasim->config); }static u32 vdpasim_get_generation (struct vdpa_device *vdpa)
Signature · 6 lines
2.26.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH v4 14/18 vdpa_sim: set vringh notify callback
In reply to Stefano GarzarellaInstead of calling the vq callback directly, we can leverage the vringh_notify() function, adding vdpasim_vq_notify() and setting it in the vringh notify callback.
---
v3:
- cleared notify during reset [Jason]
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)
drivers/vdpa/vdpa_sim/vdpa_sim.c +19 -4
@@ -131,6 +131,17 @@ static struct vdpasim *dev_to_sim(struct device *dev)return vdpa_to_sim (vdpa); } +static void vdpasim_vq_notify (struct vringh *vring) +{ +struct vdpasim_virtqueue *vq = + container_of(vring, struct vdpasim_virtqueue, vring); + +if (!vq->cb) +return ; + + vq->cb (vq->private); +} +static void vdpasim_queue_ready (struct vdpasim *vdpasim,unsigned int idx) {struct vdpasim_virtqueue *vq = &vdpasim->vqs[idx];
@@ -142,6 +153,8 @@ static void vdpasim_queue_ready(struct vdpasim *vdpasim, unsigned int idx) (uintptr_t )vq->driver_addr, (struct vring_used *) (uintptr_t)vq->device_addr); + + vq->vring.notify = vdpasim_vq_notify; } static void vdpasim_vq_reset(struct vdpasim *vdpasim,
@@ -155,6 +168,8 @@ static void vdpasim_vq_reset(struct vdpasim *vdpasim, vq->private =NULL ;vringh_init_iotlb (&vq->vring, vdpasim->dev_attr.supported_features,VDPASIM_QUEUE_MAX , false,NULL ,NULL ,NULL ); + + vq->vring.notify =NULL ; }static void vdpasim_reset (struct vdpasim *vdpasim)
@@ -231,10 +246,10 @@ static void vdpasim_net_work(struct work_struct *work)smp_wmb ();local_bh_disable (); -if (txq->cb) - txq->cb (txq->private); -if (rxq->cb) - rxq->cb (rxq->private); +if (vringh_need_notify_iotlb (&txq->vring) >0 ) +vringh_notify (&txq->vring); +if (vringh_need_notify_iotlb (&rxq->vring) >0 ) +vringh_notify (&rxq->vring);local_bh_enable ();if (++pkts >4 ) {
Signature · 6 lines
2.26.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH v4 15/18 vdpa_sim: use kvmalloc to allocate vdpasim->buffer
In reply to Stefano GarzarellaThe next patch will make the buffer size configurable from each device.
Since the buffer could be larger than a page, we use kvmalloc() instead of kmalloc().
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/vdpa/vdpa_sim/vdpa_sim.c +2 -2
@@ -418,7 +418,7 @@ static struct vdpasim *vdpasim_create(struct vdpasim_dev_attr *dev_attr)if (!vdpasim->iommu) goto err_iommu; - vdpasim->buffer =kmalloc (PAGE_SIZE ,GFP_KERNEL ); + vdpasim->buffer =kvmalloc (PAGE_SIZE ,GFP_KERNEL );if (!vdpasim->buffer) goto err_iommu;
@@ -707,7 +707,7 @@ static void vdpasim_free(struct vdpa_device *vdpa)struct vdpasim *vdpasim =vdpa_to_sim (vdpa);cancel_work_sync (&vdpasim->work); -kfree (vdpasim->buffer); +kvfree (vdpasim->buffer);if (vdpasim->iommu)vhost_iotlb_free (vdpasim->iommu);kfree (vdpasim->vqs);
Signature · 6 lines
2.26.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH v4 16/18 vdpa_sim: make vdpasim->buffer size configurable
In reply to Stefano GarzarellaAllow each device to specify the size of the buffer allocated in vdpa_sim.
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/vdpa/vdpa_sim/vdpa_sim.c +3 -1
@@ -73,6 +73,7 @@ struct vdpasim;struct vdpasim_dev_attr {u64 supported_features;size_t config_size; +size_t buffer_size;int nvqs;u32 id;
@@ -418,7 +419,7 @@ static struct vdpasim *vdpasim_create(struct vdpasim_dev_attr *dev_attr)if (!vdpasim->iommu) goto err_iommu; - vdpasim->buffer =kvmalloc (PAGE_SIZE ,GFP_KERNEL ); + vdpasim->buffer =kvmalloc (dev_attr->buffer_size,GFP_KERNEL );if (!vdpasim->buffer) goto err_iommu;
@@ -787,6 +788,7 @@ static int __init vdpasim_dev_init(void) dev_attr.config_size =sizeof (struct virtio_net_config ); dev_attr.get_config = vdpasim_net_get_config; dev_attr.work_fn = vdpasim_net_work; + dev_attr.buffer_size =PAGE_SIZE ; vdpasim_dev =vdpasim_create (&dev_attr);
Signature · 6 lines
2.26.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH v4 17/18 vdpa_sim: split vdpasim_virtqueue's iov field in out_iov and in_iov
In reply to Stefano Garzarellavringh_getdesc_iotlb() manages 2 iovs for writable and readable descriptors. This is very useful for the block device, where for each request we have both types of descriptor.
Let's split the vdpasim_virtqueue's iov field in out_iov and in_iov to use them with vringh_getdesc_iotlb().
We are using VIRTIO terminology for "out" (readable by the device) and "in" (writable by the device) descriptors.
---
v2:
- used VIRTIO terminology [Stefan]
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/vdpa/vdpa_sim/vdpa_sim.c +6 -5
@@ -44,7 +44,8 @@ u8 macaddr_buf[ETH_ALEN];struct vdpasim_virtqueue {struct vringh vring; -struct vringh_kiov iov; +struct vringh_kiov in_iov; +struct vringh_kiov out_iov;unsigned short head;bool ready;u64 desc_addr;
@@ -210,12 +211,12 @@ static void vdpasim_net_work(struct work_struct *work)while (true) { total_write =0 ; - err =vringh_getdesc_iotlb (&txq->vring, &txq->iov,NULL , + err =vringh_getdesc_iotlb (&txq->vring, &txq->out_iov,NULL , &txq->head,GFP_ATOMIC );if (err <=0 )break ; - err =vringh_getdesc_iotlb (&rxq->vring,NULL , &rxq->iov, + err =vringh_getdesc_iotlb (&rxq->vring,NULL , &rxq->in_iov, &rxq->head,GFP_ATOMIC );if (err <=0 ) {vringh_complete_iotlb (&txq->vring, txq->head,0 );
@@ -223,13 +224,13 @@ static void vdpasim_net_work(struct work_struct *work) }while (true) { - read =vringh_iov_pull_iotlb (&txq->vring, &txq->iov, + read =vringh_iov_pull_iotlb (&txq->vring, &txq->out_iov, vdpasim->buffer,PAGE_SIZE );if (read <=0 )break ; - write =vringh_iov_push_iotlb (&rxq->vring, &rxq->iov, + write =vringh_iov_push_iotlb (&rxq->vring, &rxq->in_iov, vdpasim->buffer, read);if (write <=0 )break ;
Signature · 6 lines
2.26.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH v4 18/18 vdpa: split vdpasim to core and net modules
In reply to Stefano GarzarellaFrom: Max Gurtovoy <[email protected]>
Introduce new vdpa_sim_net and vdpa_sim (core) drivers. This is a preparation for adding a vdpa simulator module for block devices.
---
v4:
- Fixed typo (s/loop/loops) [Randy]
- Fixed #include [Randy]
v2:
- Fixed "warning: variable 'dev' is used uninitialized" reported by 'kernel test robot' and Dan Carpenter
- rebased on top of other changes (dev_attr, get_config(), notify(), etc.)
- left batch_mapping module parameter in the core [Jason]
v1:
- Removed unused headers
- Removed empty module_init() module_exit()
- Moved vdpasim_is_little_endian() in vdpa_sim.h
- Moved vdpasim16_to_cpu/cpu_to_vdpasim16() in vdpa_sim.h
- Added vdpasim*_to_cpu/cpu_to_vdpasim*() also for 32 and 64
- Replaced 'select VDPA_SIM' with 'depends on VDPA_SIM' since selected option can not depend on other [Jason]
--- drivers/vdpa/vdpa_sim/vdpa_sim.h | 105 +++++++++++++ drivers/vdpa/vdpa_sim/vdpa_sim.c | 221 +-------------------------- drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 177 +++++++++++++++++++++ drivers/vdpa/Kconfig | 13 +- drivers/vdpa/vdpa_sim/Makefile | 1 + 5 files changed, 298 insertions(+), 219 deletions(-) create mode 100644 drivers/vdpa/vdpa_sim/vdpa_sim.h create mode 100644 drivers/vdpa/vdpa_sim/vdpa_sim_net.c
drivers/vdpa/vdpa_sim/vdpa_sim.h new file +105 -0
@@ -0,0 +1,105 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2020, Red Hat Inc. All rights reserved. +*/ + +#ifndef _VDPA_SIM_H +#define _VDPA_SIM_H + +#include <linux/vringh.h> +#include <linux/vdpa.h> +#include <linux/virtio_byteorder.h> +#include <linux/vhost_iotlb.h> +#include <uapi/linux/virtio_config.h> + +#define VDPASIM_FEATURES ((1ULL << VIRTIO_F_ANY_LAYOUT) | \ + (1ULL << VIRTIO_F_VERSION_1) | \ + (1ULL << VIRTIO_F_ACCESS_PLATFORM)) + +struct vdpasim ; + +struct vdpasim_virtqueue { +struct vringh vring; +struct vringh_kiov in_iov; +struct vringh_kiov out_iov; +unsigned short head; +bool ready; +u64 desc_addr; +u64 device_addr; +u64 driver_addr; +u32 num; +void *private; +irqreturn_t (*cb)(void *data); +}; + +struct vdpasim_dev_attr { +u64 supported_features; +size_t config_size; +size_t buffer_size; +int nvqs; +u32 id; + +work_func_t work_fn; +void (*get_config)(struct vdpasim *vdpasim,void *config); +void (*set_config)(struct vdpasim *vdpasim,const void *config); +}; + +/* State of each vdpasim device */ +struct vdpasim { +struct vdpa_device vdpa; +struct vdpasim_virtqueue *vqs; +struct work_struct work; +struct vdpasim_dev_attr dev_attr; +/* spinlock to synchronize virtqueue state */ +spinlock_t lock; +/* virtio config according to device type */ +void *config; +struct vhost_iotlb *iommu; +void *buffer; +u32 status; +u32 generation; +u64 features; +/* spinlock to synchronize iommu table */ +spinlock_t iommu_lock; +}; + +struct vdpasim *vdpasim_create (struct vdpasim_dev_attr *attr); + +/* TODO: cross-endian support */ +static inline bool vdpasim_is_little_endian (struct vdpasim *vdpasim) +{ +return virtio_legacy_is_little_endian () || + (vdpasim->features & (1ULL <<VIRTIO_F_VERSION_1 )); +} + +static inline u16 vdpasim16_to_cpu (struct vdpasim *vdpasim,__virtio16 val) +{ +return __virtio16_to_cpu (vdpasim_is_little_endian (vdpasim), val); +} + +static inline __virtio16 cpu_to_vdpasim16 (struct vdpasim *vdpasim,u16 val) +{ +return __cpu_to_virtio16 (vdpasim_is_little_endian (vdpasim), val); +} + +static inline u32 vdpasim32_to_cpu (struct vdpasim *vdpasim,__virtio32 val) +{ +return __virtio32_to_cpu (vdpasim_is_little_endian (vdpasim), val); +} + +static inline __virtio32 cpu_to_vdpasim32 (struct vdpasim *vdpasim,u32 val) +{ +return __cpu_to_virtio32 (vdpasim_is_little_endian (vdpasim), val); +} + +static inline u64 vdpasim64_to_cpu (struct vdpasim *vdpasim,__virtio64 val) +{ +return __virtio64_to_cpu (vdpasim_is_little_endian (vdpasim), val); +} + +static inline __virtio64 cpu_to_vdpasim64 (struct vdpasim *vdpasim,u64 val) +{ +return __cpu_to_virtio64 (vdpasim_is_little_endian (vdpasim), val); +} + +#endif
drivers/vdpa/vdpa_sim/vdpa_sim.c +6 -215
281 lines not on this page · raw message
drivers/vdpa/vdpa_sim/vdpa_sim_net.c new file +177 -0
177 lines not on this page · raw message
drivers/vdpa/Kconfig +9 -4
@@ -9,15 +9,20 @@ menuconfig VDPA if VDPA config VDPA_SIM - tristate "vDPA device simulator" + tristate "vDPA device simulator core" depends on RUNTIME_TESTING_MENU && HAS_DMA select DMA_OPS select VHOST_RING + help + Enable this module to support vDPA device simulators. These devices + are used for testing, prototyping and development of vDPA. + +config VDPA_SIM_NET + tristate "vDPA simulator for networking device" + depends on VDPA_SIM select GENERIC_NET_UTILS help - vDPA networking device simulator which loop TX traffic back - to RX. This device is used for testing, prototyping and - development of vDPA. + vDPA networking device simulator which loops TX traffic back to RX. config IFCVF tristate "Intel IFC VF vDPA driver"
drivers/vdpa/vdpa_sim/Makefile +1 -0
@@ -1,2 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_VDPA_SIM) += vdpa_sim.o +obj-$(CONFIG_VDPA_SIM_NET) += vdpa_sim_net.o
Signature · 6 lines
2.26.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization