vDPA: API for reporting IOVA range
Subsystems (2)
v4 cover vDPA: API for reporting IOVA range
Hi All:
This series introduces API for reporing IOVA range. This is a must for userspace to work correclty:
- for the process that uses vhost-vDPA directly, the IOVA must be allocated from this range.
- for VM(qemu), when vIOMMU is not enabled, fail early if GPA is out of range
- for VM(qemu), when vIOMMU is enabled, determine a valid guest address width and then guest IOVA allocator can behave correctly.
Please review.
Changes from V3:
- really silent build warnings
Changes from V2:
- silent build warnings
Changes from V1:
- do not mandate get_iova_range() for device with its own DMA translation logic and assume a [0, ULLONG_MAX] range
- mandate IOVA range only for IOMMU that forcing aperture
- forbid the map which is out of the IOVA range in vhost-vDPA
Jason Wang (3):
vdpa: introduce config op to get valid iova range
vhost: vdpa: report iova range
vdpa_sim: implement get_iova_range()
drivers/vdpa/vdpa_sim/vdpa_sim.c | 12 ++++++++++ drivers/vhost/vdpa.c | 41 ++++++++++++++++++++++++++++++++ include/linux/vdpa.h | 15 ++++++++++++ include/uapi/linux/vhost.h | 4 ++++ include/uapi/linux/vhost_types.h | 9 +++++++ 5 files changed, 81 insertions(+)
Signature · 1 line
2.20.1
PATCH v4 1/3 vdpa: introduce config op to get valid iova range
This patch introduce a config op to get valid iova range from the vDPA device.
--- include/linux/vdpa.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
include/linux/vdpa.h +15 -0
@@ -52,6 +52,16 @@ struct vdpa_device {int nvqs; }; +/** +* vDPA IOVA range - the IOVA range support by the device +* @first: start of the IOVA range +* @last: end of the IOVA range +*/ +struct vdpa_iova_range { +u64 first; +u64 last; +}; +/** * vDPA_config_ops - operations for configuring a vDPA device. * Note: vDPA device drivers are required to implement all of the
@@ -151,6 +161,10 @@ struct vdpa_device {* @get_generation: Get device config generation (optional) * @vdev: vdpa device * Returns u32: device generation +* @get_iova_range: Get supported iova range (optional) +* @vdev: vdpa device +* Returns the iova range supported by +* the device. * @set_map: Set device memory mapping (optional) * Needed for device that using device * specific DMA translation (on-chip IOMMU)
@@ -216,6 +230,7 @@ struct vdpa_config_ops {void (*set_config)(struct vdpa_device *vdev,unsigned int offset,const void *buf,unsigned int len);u32 (*get_generation)(struct vdpa_device *vdev); +struct vdpa_iova_range (*get_iova_range)(struct vdpa_device *vdev);/* DMA ops */ int (*set_map)(struct vdpa_device *vdev,struct vhost_iotlb *iotlb);
Signature · 1 line
2.20.1
Re: [PATCH V4 1/3] vdpa: introduce config op to get valid iova range
Quoted 4 lines · Jason Wang
This patch introduce a config op to get valid iova range from the vDPA device.
Signed-off-by Jason Wang <[email protected]>
Quoted 47 lines
--- include/linux/vdpa.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+)include/linux/vdpa.h +15
-0@@ -52,6 +52,16 @@ struct vdpa_device {int nvqs; }; +/** +* vDPA IOVA range - the IOVA range support by the device +* @first: start of the IOVA range +* @last: end of the IOVA range +*/ +struct vdpa_iova_range { +u64 first; +u64 last; +}; +/** * vDPA_config_ops - operations for configuring a vDPA device. * Note: vDPA device drivers are required to implement all of the @@ -151,6 +161,10 @@ struct vdpa_device {* @get_generation: Get device config generation (optional) * @vdev: vdpa device * Returns u32: device generation +* @get_iova_range: Get supported iova range (optional) +* @vdev: vdpa device +* Returns the iova range supported by +* the device. * @set_map: Set device memory mapping (optional) * Needed for device that using device * specific DMA translation (on-chip IOMMU) @@ -216,6 +230,7 @@ struct vdpa_config_ops {void (*set_config)(struct vdpa_device *vdev,unsigned int offset,const void *buf,unsigned int len);u32 (*get_generation)(struct vdpa_device *vdev); +struct vdpa_iova_range (*get_iova_range)(struct vdpa_device *vdev);/* DMA ops */ int (*set_map)(struct vdpa_device *vdev,struct vhost_iotlb *iotlb);Signature · 1 line
2.20.1
PATCH v4 2/3 vhost: vdpa: report iova range
In reply to Jason WangThis patch introduces a new ioctl for vhost-vdpa device that can report the iova range by the device.
For device that implements get_iova_range() method, we fetch it from the vDPA device. If device doesn't implement get_iova_range() but depends on platform IOMMU, we will query via DOMAIN_ATTR_GEOMETRY, otherwise [0, ULLONG_MAX] is assumed.
For safety, this patch also rules out the map request which is not in the valid range.
--- drivers/vhost/vdpa.c | 41 ++++++++++++++++++++++++++++++++ include/uapi/linux/vhost.h | 4 ++++ include/uapi/linux/vhost_types.h | 9 +++++++ 3 files changed, 54 insertions(+)
drivers/vhost/vdpa.c +41 -0
@@ -47,6 +47,7 @@ struct vhost_vdpa {int minor;struct eventfd_ctx *config_ctx;int in_batch; +struct vdpa_iova_range range; };static DEFINE_IDA (vhost_vdpa_ida);
@@ -337,6 +338,16 @@ static long vhost_vdpa_set_config_call(struct vhost_vdpa *v, u32 __user *argp)return 0 ; } +static long vhost_vdpa_get_iova_range (struct vhost_vdpa *v,u32 __user *argp) +{ +struct vhost_vdpa_iova_range range = { + .first = v->range.first, + .last = v->range.last, + }; + +return copy_to_user (argp, &range,sizeof (range)); +} +static long vhost_vdpa_vring_ioctl (struct vhost_vdpa *v,unsigned int cmd,void __user *argp) {
@@ -471,6 +482,9 @@ static long vhost_vdpa_unlocked_ioctl(struct file *filep, features =VHOST_VDPA_BACKEND_FEATURES ; r =copy_to_user (featurep, &features,sizeof (features));break ; +case VHOST_VDPA_GET_IOVA_RANGE : + r =vhost_vdpa_get_iova_range (v, argp); +break ;default : r =vhost_dev_ioctl (&v->vdev, cmd, argp);if (r == -ENOIOCTLCMD )
@@ -597,6 +611,10 @@ static int vhost_vdpa_process_iotlb_update(struct vhost_vdpa *v,long pinned;int ret =0 ; +if (msg->iova < v->range.first || + msg->iova + msg->size -1 > v->range.last) +return -EINVAL ; +if (vhost_iotlb_itree_first (iotlb, msg->iova, msg->iova + msg->size -1 ))return -EEXIST ;
@@ -783,6 +801,27 @@ static void vhost_vdpa_free_domain(struct vhost_vdpa *v) v->domain =NULL ; } +static void vhost_vdpa_set_iova_range (struct vhost_vdpa *v) +{ +struct vdpa_iova_range *range = &v->range; +struct iommu_domain_geometry geo; +struct vdpa_device *vdpa = v->vdpa; +const struct vdpa_config_ops *ops = vdpa->config; + +if (ops->get_iova_range) { + *range = ops->get_iova_range (vdpa); + }else if (v->domain && + !iommu_domain_get_attr (v->domain, +DOMAIN_ATTR_GEOMETRY , &geo) && + geo.force_aperture) { + range->first = geo.aperture_start; + range->last = geo.aperture_end; + }else { + range->first =0 ; + range->last =ULLONG_MAX ; + } +} +static int vhost_vdpa_open (struct inode *inode,struct file *filep) {struct vhost_vdpa *v;
@@ -823,6 +862,8 @@ static int vhost_vdpa_open(struct inode *inode, struct file *filep)if (r) goto err_init_iotlb; +vhost_vdpa_set_iova_range (v); + filep->private_data = v;return 0 ;
include/uapi/linux/vhost.h +4 -0
@@ -146,4 +146,8 @@/* Set event fd for config interrupt*/ #define VHOST_VDPA_SET_CONFIG_CALL _IOW(VHOST_VIRTIO, 0x77, int) + +/* Get the valid iova range */ +#define VHOST_VDPA_GET_IOVA_RANGE _IOR(VHOST_VIRTIO, 0x78, \ + struct vhost_vdpa_iova_range)#endif
include/uapi/linux/vhost_types.h +9 -0
@@ -138,6 +138,15 @@ struct vhost_vdpa_config {__u8 buf[0 ]; }; +/* vhost vdpa IOVA range +* @first: First address that can be mapped by vhost-vDPA +* @last: Last address that can be mapped by vhost-vDPA +*/ +struct vhost_vdpa_iova_range { +__u64 first; +__u64 last; +}; +/* Feature bits */ /* Log all write descriptors. Can be changed while device is active. */ #define VHOST_F_LOG_ALL 26
Signature · 1 line
2.20.1
PATCH v4 3/3 vdpa_sim: implement get_iova_range()
In reply to Jason WangThis implements a sample get_iova_range() for the simulator which advertise [0, ULLONG_MAX] as the valid range.
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/vdpa/vdpa_sim/vdpa_sim.c +12 -0
@@ -574,6 +574,16 @@ static u32 vdpasim_get_generation(struct vdpa_device *vdpa)return vdpasim->generation; } +static struct vdpa_iova_range vdpasim_get_iova_range (struct vdpa_device *vdpa) +{ +struct vdpa_iova_range range = { + .first =0ULL , + .last =ULLONG_MAX , + }; + +return range; +} +static int vdpasim_set_map (struct vdpa_device *vdpa,struct vhost_iotlb *iotlb) {
@@ -657,6 +667,7 @@ static const struct vdpa_config_ops vdpasim_net_config_ops = { .get_config = vdpasim_get_config, .set_config = vdpasim_set_config, .get_generation = vdpasim_get_generation, + .get_iova_range = vdpasim_get_iova_range, .dma_map = vdpasim_dma_map, .dma_unmap = vdpasim_dma_unmap, .free = vdpasim_free,
@@ -683,6 +694,7 @@ static const struct vdpa_config_ops vdpasim_net_batch_config_ops = { .get_config = vdpasim_get_config, .set_config = vdpasim_set_config, .get_generation = vdpasim_get_generation, + .get_iova_range = vdpasim_get_iova_range, .set_map = vdpasim_set_map, .free = vdpasim_free, };
Signature · 1 line
2.20.1
Re: [PATCH V4 3/3] vdpa_sim: implement get_iova_range()
Quoted 4 lines · Jason Wang
This implements a sample
get_iova_range()for the simulator which advertise [0,ULLONG_MAX] as the valid range.Signed-off-by Jason Wang <[email protected]>
Quoted 44 lines
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)drivers/vdpa/vdpa_sim/vdpa_sim.c +12
-0@@ -574,6 +574,16 @@ static u32 vdpasim_get_generation(struct vdpa_device *vdpa)return vdpasim->generation; } +static struct vdpa_iova_range vdpasim_get_iova_range (struct vdpa_device *vdpa) +{ +struct vdpa_iova_range range = { + .first =0ULL , + .last =ULLONG_MAX , + }; + +return range; +} +static int vdpasim_set_map (struct vdpa_device *vdpa,struct vhost_iotlb *iotlb) {@@ -657,6 +667,7 @@ static const struct vdpa_config_ops vdpasim_net_config_ops = { .get_config = vdpasim_get_config, .set_config = vdpasim_set_config, .get_generation = vdpasim_get_generation, + .get_iova_range = vdpasim_get_iova_range, .dma_map = vdpasim_dma_map, .dma_unmap = vdpasim_dma_unmap, .free = vdpasim_free,@@ -683,6 +694,7 @@ static const struct vdpa_config_ops vdpasim_net_batch_config_ops = { .get_config = vdpasim_get_config, .set_config = vdpasim_set_config, .get_generation = vdpasim_get_generation, + .get_iova_range = vdpasim_get_iova_range, .set_map = vdpasim_set_map, .free = vdpasim_free, };Signature · 1 line
2.20.1