[Date Prev] | [Thread Prev] | [Thread Next] | [Date Next] -- [Date Index] | [Thread Index] | [List Home]
Subject: [RESEND Patch v1 28/37] vhost-pci-net: pass the mem and vring info to the driver
When DRIVER_OK, the device sends the mem and vring info to the driver via the controlq. Signed-off-by: Wei Wang <wei.w.wang@intel.com> --- hw/net/vhost-pci-net.c | 68 ++++++++++++++++++++++++++ include/standard-headers/linux/vhost_pci_net.h | 17 +++++++ 2 files changed, 85 insertions(+) diff --git a/hw/net/vhost-pci-net.c b/hw/net/vhost-pci-net.c index b3475c2..2560e3d 100644 --- a/hw/net/vhost-pci-net.c +++ b/hw/net/vhost-pci-net.c @@ -14,6 +14,7 @@ */ #include "qemu/osdep.h" +#include "qemu/iov.h" #include "hw/virtio/virtio-access.h" #include "hw/virtio/vhost-pci-net.h" @@ -57,8 +58,75 @@ static void vpnet_handle_crq(VirtIODevice *vdev, VirtQueue *vq) { } +static size_t vpnet_send_crq_msg(VhostPCINet *vpnet, + struct vpnet_controlq_msg *msg) +{ + VirtQueueElement *elem; + VirtQueue *vq; + size_t msg_len = VPNET_CQ_MSG_HDR_SIZE + msg->size; + + vq = vpnet->crq; + if (!virtio_queue_ready(vq)) { + return 0; + } + + elem = virtqueue_pop(vq, sizeof(VirtQueueElement)); + if (!elem) { + return 0; + } + + /* TODO: detect a buffer that's too short, set NEEDS_RESET */ + iov_from_buf(elem->in_sg, elem->in_num, 0, msg, msg_len); + + virtqueue_push(vq, elem, msg_len); + virtio_notify(VIRTIO_DEVICE(vpnet), vq); + g_free(elem); + + return msg_len; +} + +static void vpnet_send_peer_mem_msg(VhostPCINet *vpnet) +{ + struct vpnet_controlq_msg msg = { + .class = VHOST_PCI_CTRL_PEER_MEM_MSG, + .size = sizeof(struct peer_mem_msg), + }; + memcpy(&msg.payload.pmem_msg, &vp_slave->pmem_msg, msg.size); + vpnet_send_crq_msg(vpnet, &msg); +} + +static void vpnet_send_peer_vq_msg(VhostPCINet *vpnet) +{ + struct vpnet_controlq_msg *msg; + struct peer_vqs_msg *pvqs_msg; + struct peer_vq_msg *pvq_msg; + uint16_t pvq_num, msg_size, payload_size; + + pvq_num = vpnet->peer_vq_num; + payload_size = sizeof(struct peer_vqs_msg) + + sizeof(struct peer_vq_msg) * pvq_num; + msg_size = VPNET_CQ_MSG_HDR_SIZE + payload_size; + msg = g_malloc(msg_size); + msg->class = VHOST_PCI_CTRL_PEER_VQ_MSG, + msg->size = msg_size; + + pvqs_msg = &msg->payload.pvqs_msg; + pvqs_msg->nvqs = pvq_num; + pvq_msg = pvqs_msg->pvq_msg; + memcpy(pvq_msg, vpnet->pvq_msg, payload_size); + + vpnet_send_crq_msg(vpnet, msg); + g_free(msg); +} + static void vpnet_set_status(struct VirtIODevice *vdev, uint8_t status) { + VhostPCINet *vpnet = VHOST_PCI_NET(vdev); + + if (status & VIRTIO_CONFIG_S_DRIVER_OK) { + vpnet_send_peer_mem_msg(vpnet); + vpnet_send_peer_vq_msg(vpnet); + } } static uint64_t vpnet_get_features(VirtIODevice *vdev, uint64_t features, diff --git a/include/standard-headers/linux/vhost_pci_net.h b/include/standard-headers/linux/vhost_pci_net.h index e525569..770171e 100644 --- a/include/standard-headers/linux/vhost_pci_net.h +++ b/include/standard-headers/linux/vhost_pci_net.h @@ -65,4 +65,21 @@ struct peer_vqs_msg { struct peer_vq_msg pvq_msg[]; }; +#define VHOST_PCI_CTRL_PEER_MEM_MSG 0 +#define VHOST_PCI_CTRL_PEER_VQ_MSG 1 +struct vpnet_controlq_msg { + uint8_t class; + uint8_t cmd; + uint16_t size; + union { + struct peer_mem_msg pmem_msg; + struct peer_vqs_msg pvqs_msg; + } payload; +} __attribute__((packed)); + +static struct vpnet_controlq_msg vpnet_msg __attribute__ ((unused)); +#define VPNET_CQ_MSG_HDR_SIZE (sizeof(vpnet_msg.class) \ + + sizeof(vpnet_msg.cmd) \ + + sizeof(vpnet_msg.size)) + #endif -- 2.7.4
[Date Prev] | [Thread Prev] | [Thread Next] | [Date Next] -- [Date Index] | [Thread Index] | [List Home]