diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-08 10:51:53 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-08 10:51:53 -0700 |
commit | 9bb715260ed4cef6948cb2e05cf670462367da71 (patch) | |
tree | 520de5dd3eb6cd8372cc61759754d1cf2744a8c8 /include/uapi/linux/vhost_types.h | |
parent | ae46d2aa6a7fbe8ca0946f24b061b6ccdc6c3f25 (diff) | |
parent | 835a6a649d0dd1b1f46759eb60fff2f63ed253a7 (diff) | |
download | linux-stable-9bb715260ed4cef6948cb2e05cf670462367da71.tar.gz linux-stable-9bb715260ed4cef6948cb2e05cf670462367da71.tar.bz2 linux-stable-9bb715260ed4cef6948cb2e05cf670462367da71.zip |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio updates from Michael Tsirkin:
- Some bug fixes
- The new vdpa subsystem with two first drivers
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
virtio-balloon: Revert "virtio-balloon: Switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM"
vdpa: move to drivers/vdpa
virtio: Intel IFC VF driver for VDPA
vdpasim: vDPA device simulator
vhost: introduce vDPA-based backend
virtio: introduce a vDPA based transport
vDPA: introduce vDPA bus
vringh: IOTLB support
vhost: factor out IOTLB
vhost: allow per device message handler
vhost: refine vhost and vringh kconfig
virtio-balloon: Switch back to OOM handler for VIRTIO_BALLOON_F_DEFLATE_ON_OOM
virtio-net: Introduce hash report feature
virtio-net: Introduce RSS receive steering feature
virtio-net: Introduce extended RSC feature
tools/virtio: option to build an out of tree module
Diffstat (limited to 'include/uapi/linux/vhost_types.h')
-rw-r--r-- | include/uapi/linux/vhost_types.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/uapi/linux/vhost_types.h b/include/uapi/linux/vhost_types.h index c907290ff065..669457ce5c48 100644 --- a/include/uapi/linux/vhost_types.h +++ b/include/uapi/linux/vhost_types.h @@ -119,6 +119,14 @@ struct vhost_scsi_target { unsigned short reserved; }; +/* VHOST_VDPA specific definitions */ + +struct vhost_vdpa_config { + __u32 off; + __u32 len; + __u8 buf[0]; +}; + /* Feature bits */ /* Log all write descriptors. Can be changed while device is active. */ #define VHOST_F_LOG_ALL 26 |