History

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

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

Linus Torvalds committed 6 years ago

Commit c2dc4c02 parents 53760f9 0c86d776 files · +157 −82Browse files

Showing the changes to include/uapi/linux (2 of 6 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/vhost.h +4 −0
  2. include/uapi/linux/vhost_types.h +9 −0
include/uapi/linux/vhost.h+4−0
@@ -146,4 +146,8 @@ · 145 unmodified lines
146146
147147 /* Set event fd for config interrupt*/
148148 #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)
149153 #endif
include/uapi/linux/vhost_types.h+9−0
@@ -138,6 +138,15 @@ struct vhost_vdpa_config { · 137 unmodified lines
138138 __u8 buf[0];
139139 };
140140
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+
141150 /* Feature bits */
142151 /* Log all write descriptors. Can be changed while device is active. */
143152 #define VHOST_F_LOG_ALL 26

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t