Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b867132 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Michael S. Tsirkin
Browse files

vhost: split structs into a separate header file 



vhost structs are shared by vhost-kernel and vhost-user.  Split them
into a separate file to ease copying them into programs that implement
either the server or the client side of vhost-user.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent e8d26f29

include/uapi/linux/vhost.h

+2 −111
Original line number Diff line number Diff line
@@ -11,94 +11,9 @@ 
 * device configuration.

 */



#include <linux/vhost_types.h>

#include <linux/types.h>

#include <linux/compiler.h>

#include <linux/ioctl.h>

#include <linux/virtio_config.h>

#include <linux/virtio_ring.h>



struct vhost_vring_state {

	unsigned int index;

	unsigned int num;

};



struct vhost_vring_file {

	unsigned int index;

	int fd; /* Pass -1 to unbind from file. */



};



struct vhost_vring_addr {

	unsigned int index;

	/* Option flags. */

	unsigned int flags;

	/* Flag values: */

	/* Whether log address is valid. If set enables logging. */

#define VHOST_VRING_F_LOG 0



	/* Start of array of descriptors (virtually contiguous) */

	__u64 desc_user_addr;

	/* Used structure address. Must be 32 bit aligned */

	__u64 used_user_addr;

	/* Available structure address. Must be 16 bit aligned */

	__u64 avail_user_addr;

	/* Logging support. */

	/* Log writes to used structure, at offset calculated from specified

	 * address. Address must be 32 bit aligned. */

	__u64 log_guest_addr;

};



/* no alignment requirement */

struct vhost_iotlb_msg {

	__u64 iova;

	__u64 size;

	__u64 uaddr;

#define VHOST_ACCESS_RO      0x1

#define VHOST_ACCESS_WO      0x2

#define VHOST_ACCESS_RW      0x3

	__u8 perm;

#define VHOST_IOTLB_MISS           1

#define VHOST_IOTLB_UPDATE         2

#define VHOST_IOTLB_INVALIDATE     3

#define VHOST_IOTLB_ACCESS_FAIL    4

	__u8 type;

};



#define VHOST_IOTLB_MSG 0x1

#define VHOST_IOTLB_MSG_V2 0x2



struct vhost_msg {

	int type;

	union {

		struct vhost_iotlb_msg iotlb;

		__u8 padding[64];

	};

};



struct vhost_msg_v2 {

	__u32 type;

	__u32 reserved;

	union {

		struct vhost_iotlb_msg iotlb;

		__u8 padding[64];

	};

};



struct vhost_memory_region {

	__u64 guest_phys_addr;

	__u64 memory_size; /* bytes */

	__u64 userspace_addr;

	__u64 flags_padding; /* No flags are currently specified. */

};



/* All region addresses and sizes must be 4K aligned. */

#define VHOST_PAGE_SIZE 0x1000



struct vhost_memory {

	__u32 nregions;

	__u32 padding;

	struct vhost_memory_region regions[0];

};



/* ioctls */
@@ -186,31 +101,7 @@ struct vhost_memory { 
 * device.  This can be used to stop the ring (e.g. for migration). */

#define VHOST_NET_SET_BACKEND _IOW(VHOST_VIRTIO, 0x30, struct vhost_vring_file)



/* Feature bits */

/* Log all write descriptors. Can be changed while device is active. */

#define VHOST_F_LOG_ALL 26

/* vhost-net should add virtio_net_hdr for RX, and strip for TX packets. */

#define VHOST_NET_F_VIRTIO_NET_HDR 27



/* VHOST_SCSI specific definitions */



/*

 * Used by QEMU userspace to ensure a consistent vhost-scsi ABI.

 *

 * ABI Rev 0: July 2012 version starting point for v3.6-rc merge candidate +

 *            RFC-v2 vhost-scsi userspace.  Add GET_ABI_VERSION ioctl usage

 * ABI Rev 1: January 2013. Ignore vhost_tpgt filed in struct vhost_scsi_target.

 *            All the targets under vhost_wwpn can be seen and used by guset.

 */



#define VHOST_SCSI_ABI_VERSION	1



struct vhost_scsi_target {

	int abi_version;

	char vhost_wwpn[224]; /* TRANSPORT_IQN_LEN */

	unsigned short vhost_tpgt;

	unsigned short reserved;

};

/* VHOST_SCSI specific defines */



#define VHOST_SCSI_SET_ENDPOINT _IOW(VHOST_VIRTIO, 0x40, struct vhost_scsi_target)

#define VHOST_SCSI_CLEAR_ENDPOINT _IOW(VHOST_VIRTIO, 0x41, struct vhost_scsi_target)

include/uapi/linux/vhost_types.h

0 → 100644
+128 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

#ifndef _LINUX_VHOST_TYPES_H

#define _LINUX_VHOST_TYPES_H

/* Userspace interface for in-kernel virtio accelerators. */



/* vhost is used to reduce the number of system calls involved in virtio.

 *

 * Existing virtio net code is used in the guest without modification.

 *

 * This header includes interface used by userspace hypervisor for

 * device configuration.

 */



#include <linux/types.h>

#include <linux/compiler.h>

#include <linux/virtio_config.h>

#include <linux/virtio_ring.h>



struct vhost_vring_state {

	unsigned int index;

	unsigned int num;

};



struct vhost_vring_file {

	unsigned int index;

	int fd; /* Pass -1 to unbind from file. */



};



struct vhost_vring_addr {

	unsigned int index;

	/* Option flags. */

	unsigned int flags;

	/* Flag values: */

	/* Whether log address is valid. If set enables logging. */

#define VHOST_VRING_F_LOG 0



	/* Start of array of descriptors (virtually contiguous) */

	__u64 desc_user_addr;

	/* Used structure address. Must be 32 bit aligned */

	__u64 used_user_addr;

	/* Available structure address. Must be 16 bit aligned */

	__u64 avail_user_addr;

	/* Logging support. */

	/* Log writes to used structure, at offset calculated from specified

	 * address. Address must be 32 bit aligned. */

	__u64 log_guest_addr;

};



/* no alignment requirement */

struct vhost_iotlb_msg {

	__u64 iova;

	__u64 size;

	__u64 uaddr;

#define VHOST_ACCESS_RO      0x1

#define VHOST_ACCESS_WO      0x2

#define VHOST_ACCESS_RW      0x3

	__u8 perm;

#define VHOST_IOTLB_MISS           1

#define VHOST_IOTLB_UPDATE         2

#define VHOST_IOTLB_INVALIDATE     3

#define VHOST_IOTLB_ACCESS_FAIL    4

	__u8 type;

};



#define VHOST_IOTLB_MSG 0x1

#define VHOST_IOTLB_MSG_V2 0x2



struct vhost_msg {

	int type;

	union {

		struct vhost_iotlb_msg iotlb;

		__u8 padding[64];

	};

};



struct vhost_msg_v2 {

	__u32 type;

	__u32 reserved;

	union {

		struct vhost_iotlb_msg iotlb;

		__u8 padding[64];

	};

};



struct vhost_memory_region {

	__u64 guest_phys_addr;

	__u64 memory_size; /* bytes */

	__u64 userspace_addr;

	__u64 flags_padding; /* No flags are currently specified. */

};



/* All region addresses and sizes must be 4K aligned. */

#define VHOST_PAGE_SIZE 0x1000



struct vhost_memory {

	__u32 nregions;

	__u32 padding;

	struct vhost_memory_region regions[0];

};



/* VHOST_SCSI specific definitions */



/*

 * Used by QEMU userspace to ensure a consistent vhost-scsi ABI.

 *

 * ABI Rev 0: July 2012 version starting point for v3.6-rc merge candidate +

 *            RFC-v2 vhost-scsi userspace.  Add GET_ABI_VERSION ioctl usage

 * ABI Rev 1: January 2013. Ignore vhost_tpgt field in struct vhost_scsi_target.

 *            All the targets under vhost_wwpn can be seen and used by guset.

 */



#define VHOST_SCSI_ABI_VERSION	1



struct vhost_scsi_target {

	int abi_version;

	char vhost_wwpn[224]; /* TRANSPORT_IQN_LEN */

	unsigned short vhost_tpgt;

	unsigned short reserved;

};



/* Feature bits */

/* Log all write descriptors. Can be changed while device is active. */

#define VHOST_F_LOG_ALL 26

/* vhost-net should add virtio_net_hdr for RX, and strip for TX packets. */

#define VHOST_NET_F_VIRTIO_NET_HDR 27



#endif