Pull vhost fixes from Michael Tsirkin: "Fixes all over the place. A new UAPI is borderline: can also be considered a new feature but also seems to be the only way we could come up with to fix addressing for userspace - and it seems important to switch to it now before userspace making assumptions about addressing ability of devices is set in stone" * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: vdpasim: allow to assign a MAC address vdpasim: fix MAC address configuration vdpa: handle irq bypass register failure case vdpa_sim: Fix DMA mask Revert "vhost-vdpa: fix page pinning leakage in error path" vdpa/mlx5: Fix error return in map_direct_mr() vhost_vdpa: Return -EFAULT if copy_from_user() fails vdpa_sim: implement get_iova_range() vhost: vdpa: report iova range vdpa: introduce config op to get valid iova range
Showing the changes to include/uapi/linux (2 of 6 files). Show all
Unified · Split
| @@ -146,4 +146,8 @@ · 145 unmodified lines | |||
| 146 | 146 | ||
| 147 | /* Set event fd for config interrupt*/ | 147 | /* Set event fd for config interrupt*/ |
| 148 | #define VHOST_VDPA_SET_CONFIG_CALL _IOW(VHOST_VIRTIO, 0x77, int) | 148 | #define VHOST_VDPA_SET_CONFIG_CALL _IOW(VHOST_VIRTIO, 0x77, int) |
| 149 | |||
| 150 | /* Get the valid iova range */ | ||
| 151 | #define VHOST_VDPA_GET_IOVA_RANGE _IOR(VHOST_VIRTIO, 0x78, \ | ||
| 152 | struct vhost_vdpa_iova_range) | ||
| 149 | #endif | 153 | #endif |
| @@ -138,6 +138,15 @@ struct vhost_vdpa_config { · 137 unmodified lines | |||
| 138 | __u8 buf[0]; | 138 | __u8 buf[0]; |
| 139 | }; | 139 | }; |
| 140 | 140 | ||
| 141 | /* vhost vdpa IOVA range | ||
| 142 | * @first: First address that can be mapped by vhost-vDPA | ||
| 143 | * @last: Last address that can be mapped by vhost-vDPA | ||
| 144 | */ | ||
| 145 | struct vhost_vdpa_iova_range { | ||
| 146 | __u64 first; | ||
| 147 | __u64 last; | ||
| 148 | }; | ||
| 149 | |||
| 141 | /* Feature bits */ | 150 | /* Feature bits */ |
| 142 | /* Log all write descriptors. Can be changed while device is active. */ | 151 | /* Log all write descriptors. Can be changed while device is active. */ |
| 143 | #define VHOST_F_LOG_ALL 26 | 152 | #define VHOST_F_LOG_ALL 26 |