vhost-net: upstream integration
Subsystems (2)
v6 cover vhost-net: upstream integration
Here's a patchset with vhost support for upstream qemu, rebased to latest bits, and with all comments I'm aware of addressed.
Please consider for merging.
Changes from v5:
address minor comments by Amit and Juan
Changes from v4:
address amit's style comments: mostly renaming for clarity
Changes from v3:
vhost: vhost net support: use typedef instead of struct name
virtio: add set_status callback: fix up non-PCI bindings
Changes from v2:
Addressed style comments
Detect mapping changes and abort
Unmap ring on cleanup
Changes from v1:
Addressed style comments
Migration fixes.
Gracefully fail with non-tap backends.
Michael S. Tsirkin (11):
tap: add interface to get device fd
kvm: add API to set ioeventfd
notifier: event notifier implementation
virtio: notifier support + APIs for queue fields
virtio: add set_status callback
virtio: move typedef to qemu-common
virtio-pci: fill in notifier support
vhost: vhost net support
tap: add vhost/vhostfd options
tap: add API to retrieve vhost net header
virtio-net: vhost net support
Makefile.target | 3 + configure | 37 +++ hw/event_notifier.c | 62 +++++ hw/event_notifier.h | 16 ++ hw/s390-virtio-bus.c | 2 +- hw/syborg_virtio.c | 2 +- hw/vhost.c | 711 ++++++++++++++++++++++++++++++++++++++++++++++++++ hw/vhost.h | 48 ++++ hw/vhost_net.c | 195 ++++++++++++++ hw/vhost_net.h | 19 ++ hw/virtio-net.c | 71 +++++- hw/virtio-pci.c | 68 +++++- hw/virtio.c | 80 ++++++- hw/virtio.h | 28 ++- kvm-all.c | 22 ++ kvm.h | 16 ++ net.c | 8 + net/tap.c | 43 +++ net/tap.h | 5 + qemu-common.h | 2 + qemu-options.hx | 4 +- 21 files changed, 1432 insertions(+), 10 deletions(-) create mode 100644 hw/event_notifier.c create mode 100644 hw/event_notifier.h create mode 100644 hw/vhost.c create mode 100644 hw/vhost.h create mode 100644 hw/vhost_net.c create mode 100644 hw/vhost_net.h
PATCH v6 1/11 tap: add interface to get device fd
Will be used by vhost to attach/detach to backend.
--- net/tap.c | 7 +++++++ net/tap.h | 2 ++ 2 files changed, 9 insertions(+), 0 deletions(-)
net/tap.c +7 -0
@@ -269,6 +269,13 @@ static void tap_poll(VLANClientState *nc, bool enable)tap_write_poll (s, enable); } +int tap_get_fd (VLANClientState *nc) +{ +TAPState *s =DO_UPCAST (TAPState, nc, nc); +assert (nc->info->type ==NET_CLIENT_TYPE_TAP ); +return s->fd; +} +/* fd support */ static NetClientInfo net_tap_info = {
net/tap.h +2 -0
@@ -48,4 +48,6 @@ int tap_probe_vnet_hdr(int fd);int tap_probe_has_ufo (int fd);void tap_fd_set_offload (int fd,int csum,int tso4,int tso6,int ecn,int ufo); +int tap_get_fd (VLANClientState *vc); +#endif /* QEMU_NET_TAP_H */
Signature · 1 line
1.7.0.18.g0d53a5
PATCH v6 2/11 kvm: add API to set ioeventfd
In reply to Michael S. TsirkinComment on kvm usage: rather than require users to do if (kvm_enabled()) and/or ifdefs, this patch adds an API that, internally, is defined to stub function on non-kvm build, and checks kvm_enabled for non-kvm run.
While rest of qemu code still uses if (kvm_enabled()), I think this approach is cleaner, and we should convert rest of code to it long term.
--- kvm-all.c | 22 ++++++++++++++++++++++ kvm.h | 16 ++++++++++++++++ 2 files changed, 38 insertions(+), 0 deletions(-)
kvm-all.c +22 -0
@@ -1153,3 +1153,25 @@ int kvm_set_signal_mask(CPUState *env, const sigset_t *sigset)return r; } + +#ifdef KVM_IOEVENTFD +int kvm_set_ioeventfd_pio_word (int fd,uint16_t addr,uint16_t val,bool assign) +{ +struct kvm_ioeventfd kick = { + .datamatch = val, + .addr = addr, + .len =2 , + .flags =KVM_IOEVENTFD_FLAG_DATAMATCH |KVM_IOEVENTFD_FLAG_PIO , + .fd = fd, + }; +int r; +if (!kvm_enabled ()) +return -ENOSYS ; +if (!assign) + kick.flags |=KVM_IOEVENTFD_FLAG_DEASSIGN ; + r =kvm_vm_ioctl (kvm_state,KVM_IOEVENTFD , &kick); +if (r <0 ) +return r; +return 0 ; +} +#endif
kvm.h +16 -0
@@ -14,10 +14,16 @@#ifndef QEMU_KVM_H #define QEMU_KVM_H +#include <stdbool.h> +#include <errno.h> #include "config.h" #include "qemu-queue.h" #ifdef CONFIG_KVM +#include <linux/kvm.h> +#endif + +#ifdef CONFIG_KVM extern int kvm_allowed;#define kvm_enabled () (kvm_allowed)
@@ -161,4 +167,14 @@ static inline void cpu_synchronize_post_init(CPUState *env) } } +#if defined(KVM_IOEVENTFD ) && defined(CONFIG_KVM ) +int kvm_set_ioeventfd_pio_word (int fd,uint16_t adr,uint16_t val,bool assign); +#else +static inline +int kvm_set_ioeventfd_pio_word (int fd,uint16_t adr,uint16_t val,bool assign) +{ +return -ENOSYS ; +} +#endif +#endif
Signature · 1 line
1.7.0.18.g0d53a5
PATCH v6 9/11 tap: add vhost/vhostfd options
In reply to Michael S. TsirkinThis adds vhost binary option to tap, to enable vhost net accelerator. Default is off for now, we'll be able to make default on long term when we know it's stable.
vhostfd option can be used by management, to pass in the fd. Assigning vhostfd implies vhost=on.
--- net.c | 8 ++++++++ net/tap.c | 29 +++++++++++++++++++++++++++++ qemu-options.hx | 4 +++- 3 files changed, 40 insertions(+), 1 deletions(-)
net.c +8 -0
@@ -976,6 +976,14 @@ static const struct { .name = "vnet_hdr", .type = QEMU_OPT_BOOL, .help = "enable the IFF_VNET_HDR flag on the tap interface" + }, { + .name = "vhost", + .type = QEMU_OPT_BOOL, + .help = "enable vhost-net network accelerator", + }, { + .name = "vhostfd", + .type = QEMU_OPT_STRING, + .help = "file descriptor of an already opened vhost net device", },#endif /* _WIN32 */ {/* end of list */ }
net/tap.c +29 -0
@@ -41,6 +41,8 @@#include "net/tap-linux.h" +#include "hw/vhost_net.h" +/* Maximum GSO packet size (64k) plus plenty of room for * the ethernet and virtio_net headers */
@@ -57,6 +59,7 @@ typedef struct TAPState { unsigned int has_vnet_hdr : 1; unsigned int using_vnet_hdr : 1; unsigned int has_ufo: 1; +VHostNetState *vhost_net; } TAPState;static int launch_script (const char *setup_script,const char *ifname,int fd);
@@ -252,6 +255,10 @@ static void tap_cleanup(VLANClientState *nc) {TAPState *s =DO_UPCAST (TAPState, nc, nc); +if (s->vhost_net) { +vhost_net_cleanup (s->vhost_net); + } +qemu_purge_queued_packets (nc);if (s->down_script[0 ])
@@ -307,6 +314,7 @@ static TAPState *net_tap_fd_init(VLANState *vlan, s->has_ufo =tap_probe_has_ufo (s->fd);tap_set_offload (&s->nc,0 ,0 ,0 ,0 ,0 );tap_read_poll (s,1 ); + s->vhost_net =NULL ;return s; }
@@ -456,5 +464,26 @@ int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan } } +if (qemu_opt_get_bool (opts,"vhost" , !!qemu_opt_get (opts,"vhostfd" ))) { +int vhostfd, r; +if (qemu_opt_get (opts,"vhostfd" )) { + r =net_handle_fd_param (mon,qemu_opt_get (opts,"vhostfd" )); +if (r ==-1 ) { +return -1 ; + } + vhostfd = r; + }else { + vhostfd =-1 ; + } + s->vhost_net =vhost_net_init (&s->nc, vhostfd); +if (!s->vhost_net) { +qemu_error ("vhost-net requested but could not be initialized\n" ); +return -1 ; + } + }else if (qemu_opt_get (opts,"vhostfd" )) { +qemu_error ("vhostfd= is not valid without vhost\n" ); +return -1 ; + } +return 0 ; }
qemu-options.hx +3 -1
@@ -895,7 +895,7 @@ DEF("net", HAS_ARG, QEMU_OPTION_net, "-net tap[,vlan=n][,name=str],ifname=name\n" " connect the host TAP network interface to VLAN 'n'\n" #else - "-net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile][,sndbuf=nbytes][,vnet_hdr=on|off]\n" + "-net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile][,sndbuf=nbytes][,vnet_hdr=on|off][,vhost=on|off][,vhostfd=h]\n" " connect the host TAP network interface to VLAN 'n' and use the\n" " network scripts 'file' (default=" DEFAULT_NETWORK_SCRIPT ")\n" " and 'dfile' (default=" DEFAULT_NETWORK_DOWN_SCRIPT ")\n"
@@ -905,6 +905,8 @@ DEF("net", HAS_ARG, QEMU_OPTION_net, " default of 'sndbuf=1048576' can be disabled using 'sndbuf=0')\n" " use vnet_hdr=off to avoid enabling the IFF_VNET_HDR tap flag\n" " use vnet_hdr=on to make the lack of IFF_VNET_HDR support an error condition\n" + " use vhost=on to enable experimental in kernel accelerator\n" + " use 'vhostfd=h' to connect to an already opened vhost net device\n" #endif "-net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port]\n" " connect the vlan 'n' to another VLAN using a socket connection\n"
Signature · 1 line
1.7.0.18.g0d53a5
PATCH v6 10/11 tap: add API to retrieve vhost net header
In reply to Michael S. Tsirkinwill be used by virtio-net for vhost net support
--- net/tap.c | 7 +++++++ net/tap.h | 3 +++ 2 files changed, 10 insertions(+), 0 deletions(-)
net/tap.c +7 -0
@@ -487,3 +487,10 @@ int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlanreturn 0 ; } + +VHostNetState *tap_get_vhost_net (VLANClientState *nc) +{ +TAPState *s =DO_UPCAST (TAPState, nc, nc); +assert (nc->info->type ==NET_CLIENT_TYPE_TAP ); +return s->vhost_net; +}
net/tap.h +3 -0
@@ -50,4 +50,7 @@ void tap_fd_set_offload(int fd, int csum, int tso4, int tso6, int ecn, int ufo);int tap_get_fd (VLANClientState *vc); +struct vhost_net ; +struct vhost_net *tap_get_vhost_net (VLANClientState *vc); +#endif /* QEMU_NET_TAP_H */
Signature · 1 line
1.7.0.18.g0d53a5
PATCH v6 11/11 virtio-net: vhost net support
In reply to Michael S. TsirkinThis connects virtio-net to vhost net backend.
The code is structured in a way analogous to what we have with vnet header capability in tap.
We start/stop backend on driver start/stop as
well as on save and vm start (for migration).
--- hw/virtio-net.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 69 insertions(+), 2 deletions(-)
hw/virtio-net.c +69 -2
@@ -17,6 +17,7 @@#include "net/tap.h" #include "qemu-timer.h" #include "virtio-net.h" +#include "vhost_net.h" #define VIRTIO_NET_VM_VERSION 11
@@ -47,6 +48,8 @@ typedef struct VirtIONetuint8_t nomulti;uint8_t nouni;uint8_t nobcast; +uint8_t vhost_started; +VMChangeStateEntry *vmstate;struct {int in_use;int first_multi;
@@ -114,6 +117,10 @@ static void virtio_net_reset(VirtIODevice *vdev) n->nomulti =0 ; n->nouni =0 ; n->nobcast =0 ; +if (n->vhost_started) { +vhost_net_stop (tap_get_vhost_net (n->nic->nc.peer), vdev); + n->vhost_started =0 ; + }/* Flush any MAC and VLAN filter table state */ n->mac_table.in_use =0 ;
@@ -172,7 +179,14 @@ static uint32_t virtio_net_get_features(VirtIODevice *vdev, uint32_t features) features &= ~(0x1 <<VIRTIO_NET_F_HOST_UFO ); } -return features; +if (!n->nic->nc.peer || + n->nic->nc.peer->info->type !=NET_CLIENT_TYPE_TAP ) { +return features; + } +if (!tap_get_vhost_net (n->nic->nc.peer)) { +return features; + } +return vhost_net_get_features (tap_get_vhost_net (n->nic->nc.peer), features); }static uint32_t virtio_net_bad_features (VirtIODevice *vdev)
@@ -698,6 +712,12 @@ static void virtio_net_save(QEMUFile *f, void *opaque) {VirtIONet *n = opaque; +if (n->vhost_started) { +/* TODO: should we really stop the backend? +* If we don't, it might keep writing to memory. */ +vhost_net_stop (tap_get_vhost_net (n->nic->nc.peer), &n->vdev); + n->vhost_started =0 ; + }virtio_save (&n->vdev, f);qemu_put_buffer (f, n->mac,ETH_ALEN );
@@ -810,7 +830,6 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int version_id)qemu_mod_timer (n->tx_timer,qemu_get_clock (vm_clock) +TX_TIMER_INTERVAL ); } -return 0 ; }
@@ -830,6 +849,47 @@ static NetClientInfo net_virtio_info = { .link_status_changed = virtio_net_set_link_status, }; +static void virtio_net_set_status (struct VirtIODevice *vdev,uint8_t status) +{ +VirtIONet *n =to_virtio_net (vdev); +if (!n->nic->nc.peer) { +return ; + } +if (n->nic->nc.peer->info->type !=NET_CLIENT_TYPE_TAP ) { +return ; + } + +if (!tap_get_vhost_net (n->nic->nc.peer)) { +return ; + } +if (!!n->vhost_started == !!(status &VIRTIO_CONFIG_S_DRIVER_OK )) { +return ; + } +if (status &VIRTIO_CONFIG_S_DRIVER_OK ) { +int r =vhost_net_start (tap_get_vhost_net (n->nic->nc.peer), vdev); +if (r <0 ) { +fprintf (stderr,"unable to start vhost net: %d: " +"falling back on userspace virtio\n" , -r); + }else { + n->vhost_started =1 ; + } + }else { +vhost_net_stop (tap_get_vhost_net (n->nic->nc.peer), vdev); + n->vhost_started =0 ; + } +} + +static void virtio_net_vmstate_change (void *opaque,int running,int reason) +{ +VirtIONet *n = opaque; +if (!running) { +return ; + } +/* This is called when vm is started, it will start vhost backend if +* appropriate e.g. after migration. */ +virtio_net_set_status (&n->vdev, n->vdev.status); +} +VirtIODevice *virtio_net_init (DeviceState *dev,NICConf *conf) {VirtIONet *n;
@@ -845,6 +905,7 @@ VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf) n->vdev.set_features = virtio_net_set_features; n->vdev.bad_features = virtio_net_bad_features; n->vdev.reset = virtio_net_reset; + n->vdev.set_status = virtio_net_set_status; n->rx_vq =virtio_add_queue (&n->vdev,256 , virtio_net_handle_rx); n->tx_vq =virtio_add_queue (&n->vdev,256 , virtio_net_handle_tx); n->ctrl_vq =virtio_add_queue (&n->vdev,64 , virtio_net_handle_ctrl);
@@ -867,6 +928,7 @@ VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf)register_savevm ("virtio-net" , virtio_net_id++,VIRTIO_NET_VM_VERSION , virtio_net_save, virtio_net_load, n); + n->vmstate =qemu_add_vm_change_state_handler (virtio_net_vmstate_change, n);return &n->vdev; }
@@ -874,6 +936,11 @@ VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf)void virtio_net_exit (VirtIODevice *vdev) {VirtIONet *n =DO_UPCAST (VirtIONet, vdev, vdev); +qemu_del_vm_change_state_handler (n->vmstate); + +if (n->vhost_started) { +vhost_net_stop (tap_get_vhost_net (n->nic->nc.peer), vdev); + }qemu_purge_queued_packets (&n->nic->nc);
Signature · 1 line
1.7.0.18.g0d53a5
PATCH v6 4/11 virtio: notifier support + APIs for queue fields
In reply to Michael S. Tsirkinvhost needs physical addresses for ring and other queue fields, so add APIs for these. In particular, add binding API to set host/guest notifiers. Will be used by vhost.
--- hw/virtio.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- hw/virtio.h | 18 ++++++++++++- 2 files changed, 96 insertions(+), 2 deletions(-)
hw/virtio.c +79 -1
@@ -73,6 +73,9 @@ struct VirtQueueint inuse;uint16_t vector;void (*handle_output)(VirtIODevice *vdev,VirtQueue *vq); +VirtIODevice *vdev; +EventNotifier guest_notifier; +EventNotifier host_notifier; };/* virt queue functions */
@@ -592,6 +595,12 @@ VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size,return &vdev->vq[i]; } +void virtio_irq (VirtQueue *vq) +{ + vq->vdev->isr |=0x01 ; +virtio_notify_vector (vq->vdev, vq->vector); +} +void virtio_notify (VirtIODevice *vdev,VirtQueue *vq) {/* Always notify when queue is empty (when feature acknowledge) */
@@ -714,8 +723,10 @@ VirtIODevice *virtio_common_init(const char *name, uint16_t device_id, vdev->queue_sel =0 ; vdev->config_vector =VIRTIO_NO_VECTOR ; vdev->vq =qemu_mallocz (sizeof (VirtQueue) *VIRTIO_PCI_QUEUE_MAX ); -for (i =0 ; i <VIRTIO_PCI_QUEUE_MAX ; i++) +for (i =0 ; i <VIRTIO_PCI_QUEUE_MAX ; i++) { vdev->vq[i].vector =VIRTIO_NO_VECTOR ; + vdev->vq[i].vdev = vdev; + } vdev->name = name; vdev->config_len = config_size;
@@ -733,3 +744,70 @@ void virtio_bind_device(VirtIODevice *vdev, const VirtIOBindings *binding, vdev->binding = binding; vdev->binding_opaque = opaque; } + +target_phys_addr_t virtio_queue_get_desc_addr (VirtIODevice *vdev,int n) +{ +return vdev->vq[n].vring.desc; +} + +target_phys_addr_t virtio_queue_get_avail_addr (VirtIODevice *vdev,int n) +{ +return vdev->vq[n].vring.avail; +} + +target_phys_addr_t virtio_queue_get_used_addr (VirtIODevice *vdev,int n) +{ +return vdev->vq[n].vring.used; +} + +target_phys_addr_t virtio_queue_get_ring_addr (VirtIODevice *vdev,int n) +{ +return vdev->vq[n].vring.desc; +} + +target_phys_addr_t virtio_queue_get_desc_size (VirtIODevice *vdev,int n) +{ +return sizeof (VRingDesc) * vdev->vq[n].vring.num; +} + +target_phys_addr_t virtio_queue_get_avail_size (VirtIODevice *vdev,int n) +{ +return offsetof(VRingAvail , ring) + +sizeof (u_int64_t) * vdev->vq[n].vring.num; +} + +target_phys_addr_t virtio_queue_get_used_size (VirtIODevice *vdev,int n) +{ +return offsetof(VRingUsed , ring) + +sizeof (VRingUsedElem) * vdev->vq[n].vring.num; +} + +target_phys_addr_t virtio_queue_get_ring_size (VirtIODevice *vdev,int n) +{ +return vdev->vq[n].vring.used - vdev->vq[n].vring.desc + +virtio_queue_get_used_size (vdev, n); +} + +uint16_t virtio_queue_get_last_avail_idx (VirtIODevice *vdev,int n) +{ +return vdev->vq[n].last_avail_idx; +} + +void virtio_queue_set_last_avail_idx (VirtIODevice *vdev,int n,uint16_t idx) +{ + vdev->vq[n].last_avail_idx = idx; +} + +VirtQueue *virtio_get_queue (VirtIODevice *vdev,int n) +{ +return vdev->vq + n; +} + +EventNotifier *virtio_queue_get_guest_notifier (VirtQueue *vq) +{ +return &vq->guest_notifier; +} +EventNotifier *virtio_queue_get_host_notifier (VirtQueue *vq) +{ +return &vq->host_notifier; +}
hw/virtio.h +17 -1
@@ -19,6 +19,7 @@#include "qdev.h" #include "sysemu.h" #include "block_int.h" +#include "event_notifier.h" /* from Linux's linux/virtio_config.h */
@@ -89,6 +90,8 @@ typedef struct {int (*load_config)(void * opaque,QEMUFile *f);int (*load_queue)(void * opaque,int n,QEMUFile *f);unsigned (*get_features)(void * opaque); +int (*set_guest_notifier)(void * opaque,int n,bool assigned); +int (*set_host_notifier)(void * opaque,int n,bool assigned); } VirtIOBindings;#define VIRTIO_PCI_QUEUE_MAX 64
@@ -181,5 +184,18 @@ void virtio_net_exit(VirtIODevice *vdev);DEFINE_PROP_BIT ("indirect_desc" , _state, _field, \ VIRTIO_RING_F_INDIRECT_DESC, true) - +target_phys_addr_t virtio_queue_get_desc_addr (VirtIODevice *vdev,int n); +target_phys_addr_t virtio_queue_get_avail_addr (VirtIODevice *vdev,int n); +target_phys_addr_t virtio_queue_get_used_addr (VirtIODevice *vdev,int n); +target_phys_addr_t virtio_queue_get_ring_addr (VirtIODevice *vdev,int n); +target_phys_addr_t virtio_queue_get_desc_size (VirtIODevice *vdev,int n); +target_phys_addr_t virtio_queue_get_avail_size (VirtIODevice *vdev,int n); +target_phys_addr_t virtio_queue_get_used_size (VirtIODevice *vdev,int n); +target_phys_addr_t virtio_queue_get_ring_size (VirtIODevice *vdev,int n); +uint16_t virtio_queue_get_last_avail_idx (VirtIODevice *vdev,int n); +void virtio_queue_set_last_avail_idx (VirtIODevice *vdev,int n,uint16_t idx); +VirtQueue *virtio_get_queue (VirtIODevice *vdev,int n); +EventNotifier *virtio_queue_get_guest_notifier (VirtQueue *vq); +EventNotifier *virtio_queue_get_host_notifier (VirtQueue *vq); +void virtio_irq (VirtQueue *vq);#endif
Signature · 1 line
1.7.0.18.g0d53a5
PATCH v6 3/11 notifier: event notifier implementation
In reply to Michael S. Tsirkinevent notifiers are slightly generalized eventfd descriptors. Current implementation depends on eventfd because vhost is the only user, and vhost depends on eventfd anyway, but a stub is provided for non-eventfd case.
We'll be able to further generalize this when another user comes along and we see how to best do this.
--- Makefile.target | 1 + hw/event_notifier.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++ hw/event_notifier.h | 16 +++++++++++++ qemu-common.h | 1 + 4 files changed, 80 insertions(+), 0 deletions(-) create mode 100644 hw/event_notifier.c create mode 100644 hw/event_notifier.h
Makefile.target +1 -0
@@ -175,6 +175,7 @@ obj-y = vl.o async.o monitor.o pci.o pci_host.o pcie_host.o machine.o gdbstub.o # virtio has to be here due to weird dependency between PCI and virtio-net. # need to fix this properly obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-pci.o virtio-serial-bus.o +obj-y += event_notifier.o obj-y += rwhandler.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o obj-$(CONFIG_ISA_MMIO) += isa_mmio.o
hw/event_notifier.c new file +62 -0
62 lines not on this page · raw message
hw/event_notifier.h new file +16 -0
@@ -0,0 +1,16 @@ +#ifndef QEMU_EVENT_NOTIFIER_H +#define QEMU_EVENT_NOTIFIER_H + +#include "qemu-common.h" + +struct EventNotifier { +int fd; +}; + +int event_notifier_init (EventNotifier *,int active); +void event_notifier_cleanup (EventNotifier *); +int event_notifier_get_fd (EventNotifier *); +int event_notifier_test_and_clear (EventNotifier *); +int event_notifier_test (EventNotifier *); + +#endif
qemu-common.h +1 -0
@@ -227,6 +227,7 @@ typedef struct uWireSlave uWireSlave;typedef struct I2SCodec I2SCodec ;typedef struct DeviceState DeviceState ;typedef struct SSIBus SSIBus ; +typedef struct EventNotifier EventNotifier ;typedef uint64_t pcibus_t ;
Signature · 1 line
1.7.0.18.g0d53a5
PATCH v6 5/11 virtio: add set_status callback
In reply to Michael S. Tsirkinvhost net backend needs to be notified when
frontend status changes. Add a callback,
similar to set_features.
--- hw/s390-virtio-bus.c | 2 +- hw/syborg_virtio.c | 2 +- hw/virtio-pci.c | 5 +++-- hw/virtio.h | 9 +++++++++ 4 files changed, 14 insertions(+), 4 deletions(-)
hw/s390-virtio-bus.c +1 -1
@@ -242,7 +242,7 @@ void s390_virtio_device_update_status(VirtIOS390Device *dev)VirtIODevice *vdev = dev->vdev;uint32_t features; - vdev->status =ldub_phys (dev->dev_offs +VIRTIO_DEV_OFFS_STATUS ); +virtio_set_status (vdev,ldub_phys (dev->dev_offs +VIRTIO_DEV_OFFS_STATUS ));/* Update guest supported feature bitmap */
hw/syborg_virtio.c +1 -1
@@ -149,7 +149,7 @@ static void syborg_virtio_writel(void *opaque, target_phys_addr_t offset,virtio_queue_notify (vdev, value);break ;case SYBORG_VIRTIO_STATUS : - vdev->status = value &0xFF ; +virtio_set_status (vdev, value &0xFF );if (vdev->status ==0 )virtio_reset (vdev);break ;
hw/virtio-pci.c +3 -2
@@ -206,7 +206,7 @@ static void virtio_ioport_write(void *opaque, uint32_t addr, uint32_t val)virtio_queue_notify (vdev, val);break ;case VIRTIO_PCI_STATUS : - vdev->status = val &0xFF ; +virtio_set_status (vdev, val &0xFF );if (vdev->status ==0 ) {virtio_reset (proxy->vdev);msix_unuse_all_vectors (&proxy->pci_dev);
@@ -377,7 +377,8 @@ static void virtio_write_config(PCIDevice *pci_dev, uint32_t address,if (PCI_COMMAND == address) {if (!(val &PCI_COMMAND_MASTER )) { - proxy->vdev->status &= ~VIRTIO_CONFIG_S_DRIVER_OK ; +virtio_set_status (proxy->vdev, + proxy->vdev->status & ~VIRTIO_CONFIG_S_DRIVER_OK ); } }
hw/virtio.h +9 -0
@@ -115,12 +115,21 @@ struct VirtIODevicevoid (*get_config)(VirtIODevice *vdev,uint8_t *config);void (*set_config)(VirtIODevice *vdev,const uint8_t *config);void (*reset)(VirtIODevice *vdev); +void (*set_status)(VirtIODevice *vdev,uint8_t val);VirtQueue *vq;const VirtIOBindings *binding;void *binding_opaque;uint16_t device_id; }; +static inline void virtio_set_status (VirtIODevice *vdev,uint8_t val) +{ +if (vdev->set_status) { + vdev->set_status (vdev, val); + } + vdev->status = val; +} +VirtQueue *virtio_add_queue (VirtIODevice *vdev,int queue_size,void (*handle_output)(VirtIODevice *,VirtQueue *));
Signature · 1 line
1.7.0.18.g0d53a5
PATCH v6 6/11 virtio: move typedef to qemu-common
In reply to Michael S. Tsirkinmake it possible to use type without header include, simplifying header dependencies.
--- hw/virtio.h | 1 - qemu-common.h | 1 + 2 files changed, 1 insertions(+), 1 deletions(-)
hw/virtio.h +0 -1
@@ -69,7 +69,6 @@ static inline target_phys_addr_t vring_align(target_phys_addr_t addr, }typedef struct VirtQueue VirtQueue ; -typedef struct VirtIODevice VirtIODevice ;#define VIRTQUEUE_MAX_SIZE 1024
qemu-common.h +1 -0
@@ -228,6 +228,7 @@ typedef struct I2SCodec I2SCodec;typedef struct DeviceState DeviceState ;typedef struct SSIBus SSIBus ;typedef struct EventNotifier EventNotifier ; +typedef struct VirtIODevice VirtIODevice ;typedef uint64_t pcibus_t ;
Signature · 1 line
1.7.0.18.g0d53a5
PATCH v6 7/11 virtio-pci: fill in notifier support
In reply to Michael S. TsirkinSupport host/guest notifiers in virtio-pci. The last one only with kvm, that's okay because vhost relies on kvm anyway.
Note on kvm usage: kvm ioeventfd API
is implemented on non-kvm systems as well, this is the reason we don't need if (kvm_enabled()) around it.
--- hw/virtio-pci.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-)
hw/virtio-pci.c +63 -0
@@ -24,6 +24,7 @@#include "net.h" #include "block_int.h" #include "loader.h" +#include "kvm.h" /* from Linux's linux/virtio_pci.h */
@@ -392,6 +393,66 @@ static unsigned virtio_pci_get_features(void *opaque)return proxy->host_features; } +static void virtio_pci_guest_notifier_read (void *opaque) +{ +VirtQueue *vq = opaque; +EventNotifier *n =virtio_queue_get_guest_notifier (vq); +if (event_notifier_test_and_clear (n)) { +virtio_irq (vq); + } +} + +static int virtio_pci_set_guest_notifier (void *opaque,int n,bool assign) +{ +VirtIOPCIProxy *proxy = opaque; +VirtQueue *vq =virtio_get_queue (proxy->vdev, n); +EventNotifier *notifier =virtio_queue_get_guest_notifier (vq); + +if (assign) { +int r =event_notifier_init (notifier,0 ); +if (r <0 ) { +return r; + } +qemu_set_fd_handler (event_notifier_get_fd (notifier), + virtio_pci_guest_notifier_read,NULL , vq); + }else { +qemu_set_fd_handler (event_notifier_get_fd (notifier), +NULL ,NULL ,NULL ); +event_notifier_cleanup (notifier); + } + +return 0 ; +} + +static int virtio_pci_set_host_notifier (void *opaque,int n,bool assign) +{ +VirtIOPCIProxy *proxy = opaque; +VirtQueue *vq =virtio_get_queue (proxy->vdev, n); +EventNotifier *notifier =virtio_queue_get_host_notifier (vq); +int r; +if (assign) { + r =event_notifier_init (notifier,1 ); +if (r <0 ) { +return r; + } + r =kvm_set_ioeventfd_pio_word (event_notifier_get_fd (notifier), + proxy->addr +VIRTIO_PCI_QUEUE_NOTIFY , + n, assign); +if (r <0 ) { +event_notifier_cleanup (notifier); + } + }else { + r =kvm_set_ioeventfd_pio_word (event_notifier_get_fd (notifier), + proxy->addr +VIRTIO_PCI_QUEUE_NOTIFY , + n, assign); +if (r <0 ) { +return r; + } +event_notifier_cleanup (notifier); + } +return r; +} +static const VirtIOBindings virtio_pci_bindings = { .notify = virtio_pci_notify, .save_config = virtio_pci_save_config,
@@ -399,6 +460,8 @@ static const VirtIOBindings virtio_pci_bindings = { .save_queue = virtio_pci_save_queue, .load_queue = virtio_pci_load_queue, .get_features = virtio_pci_get_features, + .set_host_notifier = virtio_pci_set_host_notifier, + .set_guest_notifier = virtio_pci_set_guest_notifier, }; static void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev,
Signature · 1 line
1.7.0.18.g0d53a5
PATCH v6 8/11 vhost: vhost net support
In reply to Michael S. TsirkinThis adds vhost net device support in qemu. Will be tied to tap device and virtio by following patches. Raw backend is currently missing, will be worked on/submitted separately.
--- Makefile.target | 2 + configure | 37 +++ hw/vhost.c | 711 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ hw/vhost.h | 48 ++++ hw/vhost_net.c | 195 +++++++++++++++ hw/vhost_net.h | 19 ++ 6 files changed, 1012 insertions(+), 0 deletions(-) create mode 100644 hw/vhost.c create mode 100644 hw/vhost.h create mode 100644 hw/vhost_net.c create mode 100644 hw/vhost_net.h
Makefile.target +2 -0
@@ -176,6 +176,8 @@ obj-y = vl.o async.o monitor.o pci.o pci_host.o pcie_host.o machine.o gdbstub.o # need to fix this properly obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-pci.o virtio-serial-bus.o obj-y += event_notifier.o +obj-y += vhost_net.o +obj-$(CONFIG_VHOST_NET) += vhost.o obj-y += rwhandler.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o obj-$(CONFIG_ISA_MMIO) += isa_mmio.o
configure +37 -0
@@ -263,6 +263,7 @@ vnc_tls="" vnc_sasl="" xen="" linux_aio="" +vhost_net="" gprof="no" debug_tcg="no"
@@ -651,6 +652,10 @@ for opt do ;; --enable-docs) docs="yes" ;; + --disable-vhost-net) vhost_net="no" + ;; + --enable-vhost-net) vhost_net="yes" + ;; *) echo "ERROR: unknown option $opt"; show_help="yes" ;; esac
@@ -806,6 +811,8 @@ echo " --disable-blobs disable installing provided firmware blobs" echo " --kerneldir=PATH look for kernel includes in PATH" echo " --enable-docs enable documentation build" echo " --disable-docs disable documentation build" +echo " --disable-vhost-net disable vhost-net acceleration support" +echo " --enable-vhost-net enable vhost-net acceleration support" echo "" echo "NOTE: The object files are built at the place where configure is launched" exit 1
@@ -1498,6 +1505,32 @@ EOF fi ########################################## +# test for vhost net + +if test "$vhost_net" != "no"; then + if test "$kvm" != "no"; then + cat > $TMPC <<EOF + #include <linux/vhost.h> + int main(void) { return 0; } +EOF + if compile_prog "$kvm_cflags" "" ; then + vhost_net=yes + else + if "$vhost_net" == "yes" ; then + feature_not_found "vhost-net" + fi + vhost_net=no + fi + else + if "$vhost_net" == "yes" ; then + echo -e "NOTE: vhost-net feature requires KVM (--enable-kvm)." + feature_not_found "vhost-net" + fi + vhost_net=no + fi +fi + +########################################## # pthread probe PTHREADLIBS_LIST="-lpthread -lpthreadGC2"
@@ -1968,6 +2001,7 @@ echo "fdt support $fdt" echo "preadv support $preadv" echo "fdatasync $fdatasync" echo "uuid support $uuid" +echo "vhost-net support $vhost_net" if test $sdl_too_old = "yes"; then echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -2492,6 +2526,9 @@ case "$target_arch2" in if test "$kvm_para" = "yes"; then echo "CONFIG_KVM_PARA=y" >> $config_target_mak fi + if test $vhost_net = "yes" ; then + echo "CONFIG_VHOST_NET=y" >> $config_target_mak + fi fi esac if test "$target_bigendian" = "yes" ; then
hw/vhost.c new file +711 -0
711 lines not on this page · raw message
hw/vhost.h new file +48 -0
48 lines not on this page · raw message
hw/vhost_net.c new file +195 -0
195 lines not on this page · raw message
hw/vhost_net.h new file +19 -0
@@ -0,0 +1,19 @@ +#ifndef VHOST_NET_H +#define VHOST_NET_H + +#include "net.h" + +struct vhost_net ; +typedef struct vhost_net VHostNetState ; + +VHostNetState *vhost_net_init (VLANClientState *backend,int devfd); + +int vhost_net_start (VHostNetState *net,VirtIODevice *dev); +void vhost_net_stop (VHostNetState *net,VirtIODevice *dev); + +void vhost_net_cleanup (VHostNetState *net); + +unsigned vhost_net_get_features (VHostNetState *net,unsigned features); +void vhost_net_ack_features (VHostNetState *net,unsigned features); + +#endif
Signature · 1 line
1.7.0.18.g0d53a5
Re: [Qemu-devel] [PATCHv6 08/11] vhost: vhost net support
Quoted 79 lines · Michael S. Tsirkin
This adds vhost net device support in qemu. Will be tied to tap device and virtio by following patches. Raw backend is currently missing, will be worked on/submitted separately.
Signed-off-by Michael S. Tsirkin<[email protected]>--- Makefile.target | 2 + configure | 37 +++ hw/vhost.c | 711 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ hw/vhost.h | 48 ++++ hw/vhost_net.c | 195 +++++++++++++++ hw/vhost_net.h | 19 ++ 6 files changed, 1012 insertions(+), 0 deletions(-)create mode 100644
hw/vhost.c
create mode 100644hw/vhost.h
create mode 100644hw/vhost_net.c
create mode 100644hw/vhost_net.hMakefile.target +2
-0@@ -176,6 +176,8 @@ obj-y = vl.o async.o monitor.o pci.o pci_host.o pcie_host.o machine.o gdbstub.o # need to fix this properly obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-pci.o virtio-serial-bus.o obj-y += event_notifier.o +obj-y += vhost_net.o +obj-$(CONFIG_VHOST_NET) += vhost.o obj-y += rwhandler.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o obj-$(CONFIG_ISA_MMIO) += isa_mmio.oconfigure +19
-0@@ -263,6 +263,7 @@ vnc_tls="" vnc_sasl="" xen="" linux_aio="" +vhost_net="" gprof="no" debug_tcg="no"@@ -651,6 +652,10 @@ for opt do ;; --enable-docs) docs="yes" ;; + --disable-vhost-net) vhost_net="no" + ;; + --enable-vhost-net) vhost_net="yes" + ;; *) echo "ERROR: unknown option $opt"; show_help="yes" ;; esac@@ -806,6 +811,8 @@ echo " --disable-blobs disable installing provided firmware blobs" echo " --kerneldir=PATH look for kernel includes in PATH" echo " --enable-docs enable documentation build" echo " --disable-docs disable documentation build" +echo " --disable-vhost-net disable vhost-net acceleration support" +echo " --enable-vhost-net enable vhost-net acceleration support" echo "" echo "NOTE: The object files are built at the place where configure is launched" exit 1@@ -1498,6 +1505,32 @@ EOF fi ########################################## +# test for vhost net + +if test "$vhost_net" != "no"; then + if test "$kvm" != "no"; then + cat> $TMPC<<EOF + #include<linux/vhost.h> + int main(void) { return 0; } +EOF + if compile_prog "$kvm_cflags" "" ; then + vhost_net=yes + else + if "$vhost_net" == "yes" ; then
configure EOF · line 1529
Quoted 10 lines
configure +9
-0+ feature_not_found "vhost-net" + fi + vhost_net=no + fi + else + if "$vhost_net" == "yes" ; then + echo -e "NOTE: vhost-net feature requires KVM (--enable-kvm)." + feature_not_found "vhost-net" + fi
The indent is quite a bit off here but more importantly, if "$vhost_net" == "yes" is not a valid shell command. Instead, it ought to be:
if test "$vhost_net" = "yes" ; then
And likewise for the earlier check. I'll fold this fix into your series unless you'd like to respin for some reason.
Regards,
Anthony Liguori+ cpu_physical_memory_set_dirty(addr + bit * VHOST_LOG_PAGE);
Re: [Qemu-devel] [PATCHv6 08/11] vhost: vhost net support
Quoted 94 lines · Anthony Liguori
Quoted 79 lines · Michael S. Tsirkin
This adds vhost net device support in qemu. Will be tied to tap device and virtio by following patches. Raw backend is currently missing, will be worked on/submitted separately.
Signed-off-by Michael S. Tsirkin<[email protected]>--- Makefile.target | 2 + configure | 37 +++ hw/vhost.c | 711 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ hw/vhost.h | 48 ++++ hw/vhost_net.c | 195 +++++++++++++++ hw/vhost_net.h | 19 ++ 6 files changed, 1012 insertions(+), 0 deletions(-)create mode 100644
hw/vhost.c
create mode 100644hw/vhost.h
create mode 100644hw/vhost_net.c
create mode 100644hw/vhost_net.hMakefile.target +2
-0@@ -176,6 +176,8 @@ obj-y = vl.o async.o monitor.o pci.o pci_host.o pcie_host.o machine.o gdbstub.o # need to fix this properly obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-pci.o virtio-serial-bus.o obj-y += event_notifier.o +obj-y += vhost_net.o +obj-$(CONFIG_VHOST_NET) += vhost.o obj-y += rwhandler.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o obj-$(CONFIG_ISA_MMIO) += isa_mmio.oconfigure +19
-0@@ -263,6 +263,7 @@ vnc_tls="" vnc_sasl="" xen="" linux_aio="" +vhost_net="" gprof="no" debug_tcg="no"@@ -651,6 +652,10 @@ for opt do ;; --enable-docs) docs="yes" ;; + --disable-vhost-net) vhost_net="no" + ;; + --enable-vhost-net) vhost_net="yes" + ;; *) echo "ERROR: unknown option $opt"; show_help="yes" ;; esac@@ -806,6 +811,8 @@ echo " --disable-blobs disable installing provided firmware blobs" echo " --kerneldir=PATH look for kernel includes in PATH" echo " --enable-docs enable documentation build" echo " --disable-docs disable documentation build" +echo " --disable-vhost-net disable vhost-net acceleration support" +echo " --enable-vhost-net enable vhost-net acceleration support" echo "" echo "NOTE: The object files are built at the place where configure is launched" exit 1@@ -1498,6 +1505,32 @@ EOF fi ########################################## +# test for vhost net + +if test "$vhost_net" != "no"; then + if test "$kvm" != "no"; then + cat> $TMPC<<EOF + #include<linux/vhost.h> + int main(void) { return 0; } +EOF + if compile_prog "$kvm_cflags" "" ; then + vhost_net=yes + else + if "$vhost_net" == "yes" ; thenconfigure EOF · line 1529
Quoted 10 lines
configure +9
-0+ feature_not_found "vhost-net" + fi + vhost_net=no + fi + else + if "$vhost_net" == "yes" ; then + echo -e "NOTE: vhost-net feature requires KVM (--enable-kvm)." + feature_not_found "vhost-net" + fiThe indent is quite a bit off here but more importantly, if "$vhost_net" == "yes" is not a valid shell command. Instead, it ought to be:
Quoted 4 lines
if test "$vhost_net" = "yes" ; then
And likewise for the earlier check. I'll fold this fix into your series unless you'd like to respin for some reason.
So you fixed this yourself? Sure, thanks a lot!
Quoted 3 lines
Regards,
Anthony Liguori+
cpu_physical_memory_set_dirty(addr + bit * VHOST_LOG_PAGE);
Cool new sig.
Signature · 1 line
MST
Anthony Liguori
AppliedRe: [Qemu-devel] [PATCHv6 01/11] tap: add interface to get device fd
In reply to Michael S. TsirkinQuoted 4 lines · Michael S. Tsirkin
Will be used by vhost to attach/detach to backend.
Signed-off-by Michael S. Tsirkin<[email protected]>
Applied. Thanks.
Regards,
Anthony Liguori
Quoted 35 lines
--- net/tap.c | 7 +++++++ net/tap.h | 2 ++ 2 files changed, 9 insertions(+), 0 deletions(-)net/tap.c +7
-0@@ -269,6 +269,13 @@ static void tap_poll(VLANClientState *nc, bool enable)tap_write_poll (s, enable); } +int tap_get_fd (VLANClientState *nc) +{ +TAPState *s =DO_UPCAST (TAPState, nc, nc); +assert (nc->info->type ==NET_CLIENT_TYPE_TAP ); +return s->fd; +} +/* fd support */ static NetClientInfo net_tap_info = {net/tap.h +2
-0@@ -48,4 +48,6 @@ int tap_probe_vnet_hdr(int fd);int tap_probe_has_ufo (int fd);void tap_fd_set_offload (int fd,int csum,int tso4,int tso6,int ecn,int ufo); +int tap_get_fd (VLANClientState *vc); +#endif /* QEMU_NET_TAP_H */
[Qemu-devel] Re: [PATCHv6 03/11] notifier: event notifier implementation
In reply to Michael S. Tsirkinhw/event_notifier.c line 56
Quoted 10 lines · Michael S. Tsirkin
hw/event_notifier.c new file +9
-0+{ +#ifdef CONFIG_EVENTFD +int fd =eventfd (!!active,EFD_NONBLOCK |EFD_CLOEXEC ); +uint64_t value; +int r =read (e->fd,&value,sizeof (value)); +if (r ==sizeof (value)) { +/* restore previous value. */ +int s =write (e->fd,&value,sizeof (value)); +/* never blocks because we use EFD_SEMAPHORE.
No, we don't...
Also, it seems like this function as it is written now requires blocking operation of the eventfd, otherwise it would not be atomic when another thread calls event_notifier_test_and_clear. Which makes everything more complicated.
But after all is unused, maybe it should be zapped?
Paolo