mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 21:54:34 -04:00
virtio/vhost: new features for 4.8
- New vsock device support in host and guest - Platform IOMMU support in host and guest, including compatibility quirks for legacy systems. - Misc fixes and cleanups. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJXofvbAAoJECgfDbjSjVRpUTIH/iEoK9h636tBayXy0PXkPby0 6fMaRFy6H1HgEttgDhJE8Pqg/ba3qaW9Em0fHyFq7Mp2waFHAZ8hAT8phC6TAK3c CIBnfzyyuI8u3N9SnNOfelPVcwCBfuALuuTsXB/rwKbYQEVv+U5Rdt3Vyx9+lXkj P005klz7PfqxFhQrrnj4Eh7VawtHwmMuLH8YoWpCZpM71dHPo6eL+3ftKwhH2boo qK86uVprwba03Pewpm13vQnotemfVfUUkjXd4EJpG3dx7E0KZosuj0ZG9OV8mPGQ Cl2gBdUhocdJgeUnAHmf6tumYi9KFlYfy6xLy44YMmN7FL3E9nQjaKZp25UKfiM= =ztIm -----END PGP SIGNATURE----- Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost Pull virtio/vhost updates from Michael Tsirkin: - new vsock device support in host and guest - platform IOMMU support in host and guest, including compatibility quirks for legacy systems. - misc fixes and cleanups. * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: VSOCK: Use kvfree() vhost: split out vringh Kconfig vhost: detect 32 bit integer wrap around vhost: new device IOTLB API vhost: drop vringh dependency vhost: convert pre sorted vhost memory array to interval tree vhost: introduce vhost memory accessors VSOCK: Add Makefile and Kconfig VSOCK: Introduce vhost_vsock.ko VSOCK: Introduce virtio_transport.ko VSOCK: Introduce virtio_vsock_common.ko VSOCK: defer sock removal to transports VSOCK: transport-specific vsock_transport functions vhost: drop vringh dependency vop: pull in vhost Kconfig virtio: new feature to detect IOMMU device quirk balloon: check the number of available pages in leak balloon vhost: lockless enqueuing vhost: simplify work flushing
This commit is contained in:
Linus Torvalds
commit
0803e04011
28 changed files with 3765 additions and 201 deletions
|
|
@ -149,6 +149,19 @@ static inline bool virtio_has_feature(const struct virtio_device *vdev,
|
|||
return __virtio_test_bit(vdev, fbit);
|
||||
}
|
||||
|
||||
/**
|
||||
* virtio_has_iommu_quirk - determine whether this device has the iommu quirk
|
||||
* @vdev: the device
|
||||
*/
|
||||
static inline bool virtio_has_iommu_quirk(const struct virtio_device *vdev)
|
||||
{
|
||||
/*
|
||||
* Note the reverse polarity of the quirk feature (compared to most
|
||||
* other features), this is for compatibility with legacy systems.
|
||||
*/
|
||||
return !virtio_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM);
|
||||
}
|
||||
|
||||
static inline
|
||||
struct virtqueue *virtio_find_single_vq(struct virtio_device *vdev,
|
||||
vq_callback_t *c, const char *n)
|
||||
|
|
|
|||
154
include/linux/virtio_vsock.h
Normal file
154
include/linux/virtio_vsock.h
Normal file
|
|
@ -0,0 +1,154 @@
|
|||
#ifndef _LINUX_VIRTIO_VSOCK_H
|
||||
#define _LINUX_VIRTIO_VSOCK_H
|
||||
|
||||
#include <uapi/linux/virtio_vsock.h>
|
||||
#include <linux/socket.h>
|
||||
#include <net/sock.h>
|
||||
#include <net/af_vsock.h>
|
||||
|
||||
#define VIRTIO_VSOCK_DEFAULT_MIN_BUF_SIZE 128
|
||||
#define VIRTIO_VSOCK_DEFAULT_BUF_SIZE (1024 * 256)
|
||||
#define VIRTIO_VSOCK_DEFAULT_MAX_BUF_SIZE (1024 * 256)
|
||||
#define VIRTIO_VSOCK_DEFAULT_RX_BUF_SIZE (1024 * 4)
|
||||
#define VIRTIO_VSOCK_MAX_BUF_SIZE 0xFFFFFFFFUL
|
||||
#define VIRTIO_VSOCK_MAX_PKT_BUF_SIZE (1024 * 64)
|
||||
|
||||
enum {
|
||||
VSOCK_VQ_RX = 0, /* for host to guest data */
|
||||
VSOCK_VQ_TX = 1, /* for guest to host data */
|
||||
VSOCK_VQ_EVENT = 2,
|
||||
VSOCK_VQ_MAX = 3,
|
||||
};
|
||||
|
||||
/* Per-socket state (accessed via vsk->trans) */
|
||||
struct virtio_vsock_sock {
|
||||
struct vsock_sock *vsk;
|
||||
|
||||
/* Protected by lock_sock(sk_vsock(trans->vsk)) */
|
||||
u32 buf_size;
|
||||
u32 buf_size_min;
|
||||
u32 buf_size_max;
|
||||
|
||||
spinlock_t tx_lock;
|
||||
spinlock_t rx_lock;
|
||||
|
||||
/* Protected by tx_lock */
|
||||
u32 tx_cnt;
|
||||
u32 buf_alloc;
|
||||
u32 peer_fwd_cnt;
|
||||
u32 peer_buf_alloc;
|
||||
|
||||
/* Protected by rx_lock */
|
||||
u32 fwd_cnt;
|
||||
u32 rx_bytes;
|
||||
struct list_head rx_queue;
|
||||
};
|
||||
|
||||
struct virtio_vsock_pkt {
|
||||
struct virtio_vsock_hdr hdr;
|
||||
struct work_struct work;
|
||||
struct list_head list;
|
||||
void *buf;
|
||||
u32 len;
|
||||
u32 off;
|
||||
bool reply;
|
||||
};
|
||||
|
||||
struct virtio_vsock_pkt_info {
|
||||
u32 remote_cid, remote_port;
|
||||
struct msghdr *msg;
|
||||
u32 pkt_len;
|
||||
u16 type;
|
||||
u16 op;
|
||||
u32 flags;
|
||||
bool reply;
|
||||
};
|
||||
|
||||
struct virtio_transport {
|
||||
/* This must be the first field */
|
||||
struct vsock_transport transport;
|
||||
|
||||
/* Takes ownership of the packet */
|
||||
int (*send_pkt)(struct virtio_vsock_pkt *pkt);
|
||||
};
|
||||
|
||||
ssize_t
|
||||
virtio_transport_stream_dequeue(struct vsock_sock *vsk,
|
||||
struct msghdr *msg,
|
||||
size_t len,
|
||||
int type);
|
||||
int
|
||||
virtio_transport_dgram_dequeue(struct vsock_sock *vsk,
|
||||
struct msghdr *msg,
|
||||
size_t len, int flags);
|
||||
|
||||
s64 virtio_transport_stream_has_data(struct vsock_sock *vsk);
|
||||
s64 virtio_transport_stream_has_space(struct vsock_sock *vsk);
|
||||
|
||||
int virtio_transport_do_socket_init(struct vsock_sock *vsk,
|
||||
struct vsock_sock *psk);
|
||||
u64 virtio_transport_get_buffer_size(struct vsock_sock *vsk);
|
||||
u64 virtio_transport_get_min_buffer_size(struct vsock_sock *vsk);
|
||||
u64 virtio_transport_get_max_buffer_size(struct vsock_sock *vsk);
|
||||
void virtio_transport_set_buffer_size(struct vsock_sock *vsk, u64 val);
|
||||
void virtio_transport_set_min_buffer_size(struct vsock_sock *vsk, u64 val);
|
||||
void virtio_transport_set_max_buffer_size(struct vsock_sock *vs, u64 val);
|
||||
int
|
||||
virtio_transport_notify_poll_in(struct vsock_sock *vsk,
|
||||
size_t target,
|
||||
bool *data_ready_now);
|
||||
int
|
||||
virtio_transport_notify_poll_out(struct vsock_sock *vsk,
|
||||
size_t target,
|
||||
bool *space_available_now);
|
||||
|
||||
int virtio_transport_notify_recv_init(struct vsock_sock *vsk,
|
||||
size_t target, struct vsock_transport_recv_notify_data *data);
|
||||
int virtio_transport_notify_recv_pre_block(struct vsock_sock *vsk,
|
||||
size_t target, struct vsock_transport_recv_notify_data *data);
|
||||
int virtio_transport_notify_recv_pre_dequeue(struct vsock_sock *vsk,
|
||||
size_t target, struct vsock_transport_recv_notify_data *data);
|
||||
int virtio_transport_notify_recv_post_dequeue(struct vsock_sock *vsk,
|
||||
size_t target, ssize_t copied, bool data_read,
|
||||
struct vsock_transport_recv_notify_data *data);
|
||||
int virtio_transport_notify_send_init(struct vsock_sock *vsk,
|
||||
struct vsock_transport_send_notify_data *data);
|
||||
int virtio_transport_notify_send_pre_block(struct vsock_sock *vsk,
|
||||
struct vsock_transport_send_notify_data *data);
|
||||
int virtio_transport_notify_send_pre_enqueue(struct vsock_sock *vsk,
|
||||
struct vsock_transport_send_notify_data *data);
|
||||
int virtio_transport_notify_send_post_enqueue(struct vsock_sock *vsk,
|
||||
ssize_t written, struct vsock_transport_send_notify_data *data);
|
||||
|
||||
u64 virtio_transport_stream_rcvhiwat(struct vsock_sock *vsk);
|
||||
bool virtio_transport_stream_is_active(struct vsock_sock *vsk);
|
||||
bool virtio_transport_stream_allow(u32 cid, u32 port);
|
||||
int virtio_transport_dgram_bind(struct vsock_sock *vsk,
|
||||
struct sockaddr_vm *addr);
|
||||
bool virtio_transport_dgram_allow(u32 cid, u32 port);
|
||||
|
||||
int virtio_transport_connect(struct vsock_sock *vsk);
|
||||
|
||||
int virtio_transport_shutdown(struct vsock_sock *vsk, int mode);
|
||||
|
||||
void virtio_transport_release(struct vsock_sock *vsk);
|
||||
|
||||
ssize_t
|
||||
virtio_transport_stream_enqueue(struct vsock_sock *vsk,
|
||||
struct msghdr *msg,
|
||||
size_t len);
|
||||
int
|
||||
virtio_transport_dgram_enqueue(struct vsock_sock *vsk,
|
||||
struct sockaddr_vm *remote_addr,
|
||||
struct msghdr *msg,
|
||||
size_t len);
|
||||
|
||||
void virtio_transport_destruct(struct vsock_sock *vsk);
|
||||
|
||||
void virtio_transport_recv_pkt(struct virtio_vsock_pkt *pkt);
|
||||
void virtio_transport_free_pkt(struct virtio_vsock_pkt *pkt);
|
||||
void virtio_transport_inc_tx_pkt(struct virtio_vsock_sock *vvs, struct virtio_vsock_pkt *pkt);
|
||||
u32 virtio_transport_get_credit(struct virtio_vsock_sock *vvs, u32 wanted);
|
||||
void virtio_transport_put_credit(struct virtio_vsock_sock *vvs, u32 credit);
|
||||
|
||||
#endif /* _LINUX_VIRTIO_VSOCK_H */
|
||||
Loading…
Reference in a new issue