From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 5382E8DAA for ; Fri, 6 Nov 2015 02:31:35 +0100 (CET) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 05 Nov 2015 17:31:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,249,1444719600"; d="scan'208";a="812931198" Received: from tan-s2600cw.sh.intel.com ([10.239.128.225]) by orsmga001.jf.intel.com with ESMTP; 05 Nov 2015 17:31:32 -0800 From: Jianfeng Tan To: dev@dpdk.org Date: Fri, 6 Nov 2015 02:31:12 +0800 Message-Id: <1446748276-132087-2-git-send-email-jianfeng.tan@intel.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1446748276-132087-1-git-send-email-jianfeng.tan@intel.com> References: <1446748276-132087-1-git-send-email-jianfeng.tan@intel.com> Cc: nakajima.yoshihiro@lab.ntt.co.jp, zhbzg@huawei.com, mst@redhat.com, gaoxiaoqiu@huawei.com, oscar.zhangbo@huawei.com, ann.zhuangyanying@huawei.com, zhoujingbin@huawei.com, guohongzhen@huawei.com Subject: [dpdk-dev] [RFC 1/5] virtio/container: add handler for ioport rd/wr X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Nov 2015 01:31:36 -0000 Add handler to turn ioport rd/wr into vhost user unix socket msgs. Add field, like kickfd, callfd in struct virtio_hw. Add CONFIG_RTE_VIRTIO_VDEV to control virtio vdev, disabled by default. Signed-off-by: Huawei Xie Signed-off-by: Jianfeng Tan --- config/common_linuxapp | 5 + drivers/net/virtio/Makefile | 4 + drivers/net/virtio/vhost-user.c | 433 ++++++++++++++++++++++++++++++++++++++++ drivers/net/virtio/vhost-user.h | 137 +++++++++++++ drivers/net/virtio/virtio_pci.h | 32 ++- 5 files changed, 610 insertions(+), 1 deletion(-) create mode 100644 drivers/net/virtio/vhost-user.c create mode 100644 drivers/net/virtio/vhost-user.h diff --git a/config/common_linuxapp b/config/common_linuxapp index c1d4bbd..99dd348 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -477,3 +477,8 @@ CONFIG_RTE_APP_TEST=y CONFIG_RTE_TEST_PMD=y CONFIG_RTE_TEST_PMD_RECORD_CORE_CYCLES=n CONFIG_RTE_TEST_PMD_RECORD_BURST_STATS=n + +# +# Enable virtio support for container +# +#CONFIG_RTE_VIRTIO_VDEV=y diff --git a/drivers/net/virtio/Makefile b/drivers/net/virtio/Makefile index 43835ba..dddf125 100644 --- a/drivers/net/virtio/Makefile +++ b/drivers/net/virtio/Makefile @@ -52,6 +52,10 @@ SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx.c SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_ethdev.c SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple.c +ifeq ($(CONFIG_RTE_VIRTIO_VDEV),y) + SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += vhost-user.c +endif + # this lib depends upon: DEPDIRS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += lib/librte_eal lib/librte_ether DEPDIRS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += lib/librte_mempool lib/librte_mbuf diff --git a/drivers/net/virtio/vhost-user.c b/drivers/net/virtio/vhost-user.c new file mode 100644 index 0000000..d0960ce --- /dev/null +++ b/drivers/net/virtio/vhost-user.c @@ -0,0 +1,433 @@ +/*- + * BSD LICENSE + * + * Copyright(c) 2010-2015 Intel Corporation. All rights reserved. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "virtio_pci.h" +#include "virtio_logs.h" +#include "virtio_ethdev.h" +#include "virtqueue.h" +#include "vhost-user.h" + +static int +vhost_user_read(int fd, void *buf, int len, int *fds, int fd_num) +{ + struct msghdr msgh; + struct iovec iov; + int r; + + size_t fd_size = fd_num * sizeof(int); + char control[CMSG_SPACE(fd_size)]; + struct cmsghdr *cmsg; + + memset(&msgh, 0, sizeof(msgh)); + memset(control, 0, sizeof(control)); + + iov.iov_base = (uint8_t *)buf; + iov.iov_len = len; + + msgh.msg_iov = &iov; + msgh.msg_iovlen = 1; + + msgh.msg_control = control; + msgh.msg_controllen = sizeof(control); + + cmsg = CMSG_FIRSTHDR(&msgh); + + cmsg->cmsg_len = CMSG_LEN(fd_size); + cmsg->cmsg_level = SOL_SOCKET; + cmsg->cmsg_type = SCM_RIGHTS; + memcpy(CMSG_DATA(cmsg), fds, fd_size); + + do { + r = sendmsg(fd, &msgh, 0); + } while (r < 0 && errno == EINTR); + + return r; +} + +static int +vhost_user_write(int fd, VhostUserMsg *msg) +{ + uint32_t valid_flags = VHOST_USER_REPLY_MASK | VHOST_USER_VERSION; + int ret, sz_hdr = VHOST_USER_HDR_SIZE, sz_payload; + + + ret = recv(fd, (void *)msg, sz_hdr, 0); + if (ret < sz_hdr) { + PMD_DRV_LOG(ERR, "Failed to recv msg hdr: %d instead of %d.", + ret, sz_hdr); + goto fail; + } + + /* validate msg flags */ + if (msg->flags != (valid_flags)) { + PMD_DRV_LOG(ERR, "Failed to recv msg: flags 0x%x instead of 0x%x.", + msg->flags, valid_flags); + goto fail; + } + + sz_payload = msg->size; + if (sz_payload) { + ret = recv(fd, (void *)((uint8_t*)msg + sz_hdr), sz_payload, 0); + if (ret < sz_payload) { + PMD_DRV_LOG(ERR, "Failed to recv msg payload: %d instead of %d.", + ret, msg->size); + goto fail; + } + } + + return 0; + +fail: + return -1; +} + +static VhostUserMsg m __attribute__ ((unused)); +static int +vhost_user_sendmsg(struct virtio_hw *hw, VhostUserRequest req, void *arg) +{ + VhostUserMsg msg; + VhostUserMemoryRegion *mr; + struct vhost_vring_file *file = 0; + int need_reply = 0; + int fds[VHOST_MEMORY_MAX_NREGIONS]; + ssize_t fd_num = 0; + int len; + + msg.request = req; + msg.flags = VHOST_USER_VERSION; + msg.size = 0; + + switch (req) { + case VHOST_USER_GET_FEATURES: + need_reply = 1; + break; + + case VHOST_USER_SET_FEATURES: + case VHOST_USER_SET_LOG_BASE: + msg.payload.u64 = *((__u64 *)arg); + msg.size = sizeof(m.payload.u64); + break; + + case VHOST_USER_SET_MEM_TABLE: + { + int fd; + void *addr; + uint64_t size; + + rte_memseg_info_get(0, &fd, &size, &addr); + + mr = &msg.payload.memory.regions[0]; + mr->userspace_addr = (uint64_t)addr; + mr->memory_size = size; + /* to keep continuity, use virtual address here */ + mr->guest_phys_addr = (uint64_t)addr; + mr->mmap_offset = 0; + fds[fd_num++] = fd; + msg.payload.memory.nregions = 1; + + msg.size = sizeof(m.payload.memory.nregions); + msg.size += sizeof(m.payload.memory.padding); + msg.size += fd_num * sizeof(VhostUserMemoryRegion); + + break; + } + case VHOST_USER_SET_LOG_FD: + fds[fd_num++] = *((int *)arg); + break; + + case VHOST_USER_SET_VRING_NUM: + case VHOST_USER_SET_VRING_BASE: + memcpy(&msg.payload.state, arg, sizeof(struct vhost_vring_state)); + msg.size = sizeof(m.payload.state); + break; + + case VHOST_USER_GET_VRING_BASE: + memcpy(&msg.payload.state, arg, sizeof(struct vhost_vring_state)); + msg.size = sizeof(m.payload.state); + need_reply = 1; + break; + + case VHOST_USER_SET_VRING_ADDR: + memcpy(&msg.payload.addr, arg, sizeof(struct vhost_vring_addr)); + msg.size = sizeof(m.payload.addr); + break; + + case VHOST_USER_SET_VRING_KICK: + case VHOST_USER_SET_VRING_CALL: + case VHOST_USER_SET_VRING_ERR: + file = arg; + msg.payload.u64 = file->index & VHOST_USER_VRING_IDX_MASK; + msg.size = sizeof(m.payload.u64); + if (file->fd > 0) + fds[fd_num++] = file->fd; + else + msg.payload.u64 |= VHOST_USER_VRING_NOFD_MASK; + break; + default: + PMD_DRV_LOG(ERR, "vhost-user trying to send unhandled ioctl"); + return -1; + } + + len = VHOST_USER_HDR_SIZE + msg.size; + if (vhost_user_read(hw->sockfd, &msg, len, fds, fd_num) < 0) + return 0; + + if (need_reply) { + if (vhost_user_write(hw->sockfd, &msg) < 0) + return -1; + + if (req != msg.request) { + PMD_DRV_LOG(ERR, "Received unexpected msg type." + " Expected %d received %d", + req, msg.request); + return -1; + } + + switch (req) { + case VHOST_USER_GET_FEATURES: + if (msg.size != sizeof(m.payload.u64)) { + PMD_DRV_LOG(ERR, "Received bad msg size."); + return -1; + } + *((__u64 *)arg) = msg.payload.u64; + break; + case VHOST_USER_GET_VRING_BASE: + if (msg.size != sizeof(m.payload.state)) { + PMD_DRV_LOG(ERR, "Received bad msg size."); + return -1; + } + memcpy(arg, &msg.payload.state, sizeof(struct vhost_vring_state)); + break; + default: + PMD_DRV_LOG(ERR, "Received unexpected msg type."); + return -1; + } + } + + return 0; +} + +static void +kick_one_vq(struct virtio_hw *hw, struct virtqueue *vq, unsigned queue_sel) +{ + struct vhost_vring_file file; + + /* Of all per virtqueue MSGs, make sure VHOST_SET_VRING_CALL comes + * firstly because vhost depends on this msg to allocate virtqueue + * pair. + */ + file.index = queue_sel; + file.fd = hw->callfd; + vhost_user_sendmsg(hw, VHOST_USER_SET_VRING_CALL, &file); + + struct vhost_vring_state state; + state.index = queue_sel; + state.num = vq->vq_ring.num; + vhost_user_sendmsg(hw, VHOST_USER_SET_VRING_NUM, &state); + + state.num = 0; /* no reservation */ + vhost_user_sendmsg(hw, VHOST_USER_SET_VRING_BASE, &state); + + struct vhost_vring_addr addr = { + .index = queue_sel, + .desc_user_addr = (uint64_t)vq->vq_ring.desc, + .avail_user_addr = (uint64_t)vq->vq_ring.avail, + .used_user_addr = (uint64_t)vq->vq_ring.used, + .log_guest_addr = 0, + .flags = 0, /* disable log */ + }; + vhost_user_sendmsg(hw, VHOST_USER_SET_VRING_ADDR, &addr); + + /* Of all per virtqueue MSGs, make sure VHOST_SET_VRING_KICK comes + * lastly because vhost depends on this msg to judge if + * virtio_is_ready(). + */ + file.fd = hw->kickfd; + vhost_user_sendmsg(hw, VHOST_USER_SET_VRING_KICK, &file); +} + +static void kick_all_vq(struct virtio_hw *hw) +{ + unsigned i, queue_sel; + struct rte_eth_dev_data *data = hw->data; + + vhost_user_sendmsg(hw, VHOST_USER_SET_MEM_TABLE, NULL); + + for (i = 0; i < data->nb_rx_queues; ++i) { + queue_sel = 2 * i + VTNET_SQ_RQ_QUEUE_IDX; + kick_one_vq(hw, data->rx_queues[i], queue_sel); + } + for (i = 0; i < data->nb_tx_queues; ++i) { + queue_sel = 2 * i + VTNET_SQ_TQ_QUEUE_IDX; + kick_one_vq(hw, data->tx_queues[i], queue_sel); + } +} + +void +virtio_ioport_write(struct virtio_hw *hw, uint64_t addr, uint32_t val) +{ + uint64_t guest_features; + + switch (addr) { + case VIRTIO_PCI_GUEST_FEATURES: + hw->guest_features = val; + guest_features = val; + vhost_user_sendmsg(hw, VHOST_USER_SET_FEATURES, &guest_features); + break; + case VIRTIO_PCI_QUEUE_PFN: + /* do nothing */ + break; + case VIRTIO_PCI_QUEUE_SEL: + hw->queue_sel = val; + break; + case VIRTIO_PCI_STATUS: + if (val & VIRTIO_CONFIG_S_DRIVER_OK) + kick_all_vq(hw); + hw->status = val & 0xFF; + break; + default: + PMD_DRV_LOG(ERR, "unexpected address %"PRIu64" value 0x%x\n", + addr, val); + break; + } +} + +uint32_t +virtio_ioport_read(struct virtio_hw *hw, uint64_t addr) +{ + uint32_t ret = 0xFFFFFFFF; + uint64_t host_features; + + PMD_DRV_LOG(INFO, "addr: %"PRIu64"\n", addr); + + switch (addr) { + case VIRTIO_PCI_HOST_FEATURES: + vhost_user_sendmsg(hw, VHOST_USER_GET_FEATURES, &host_features); + ret = host_features; + break; + case VIRTIO_PCI_GUEST_FEATURES: + ret = hw->guest_features; + break; + case VIRTIO_PCI_QUEUE_PFN: + PMD_DRV_LOG(ERR, "VIRTIO_PCI_QUEUE_PFN (r) not supported\n"); + break; + case VIRTIO_PCI_QUEUE_NUM: + ret = hw->queue_num; + break; + case VIRTIO_PCI_QUEUE_SEL: + ret = hw->queue_sel; + break; + case VIRTIO_PCI_STATUS: + ret = hw->status; + break; + default: + PMD_DRV_LOG(ERR, "%"PRIu64" (r) not supported\n", addr); + break; + } + + return ret; +} + +int +virtio_vdev_init(struct rte_eth_dev_data *data, const char *path, + int nb_rx, int nb_tx, int nb_cq __attribute__ ((unused)), + int queue_num) +{ + int flag; + int sockfd, callfd, kickfd; + struct sockaddr_un un; + struct virtio_hw *hw = data->dev_private; + + hw->data = data; + hw->path = strdup(path); + hw->max_rx_queues = nb_rx; + hw->max_tx_queues = nb_tx; + hw->queue_num = queue_num; + + /* TODO: cq */ + + sockfd = socket(AF_UNIX, SOCK_STREAM, 0); + + if (sockfd < 0) { + PMD_DRV_LOG(ERR, "socket error, %s\n", strerror(errno)); + exit(-1); + } + flag = fcntl(sockfd, F_GETFD); + fcntl(sockfd, F_SETFD, flag | FD_CLOEXEC); + + memset(&un, 0, sizeof(un)); + un.sun_family = AF_UNIX; + snprintf(un.sun_path, sizeof(un.sun_path), "%s", hw->path); + if (connect(sockfd, (struct sockaddr *)&un, sizeof(un)) < 0) { + PMD_DRV_LOG(ERR, "connect error, %s\n", strerror(errno)); + exit(-1); + } + hw->sockfd = sockfd; + + /* or use invalid flag to disable it, but vhost-dpdk uses this to judge + * if dev is alive. so finally we need two real event_fds. + */ + callfd = eventfd(0, O_CLOEXEC | O_NONBLOCK); + if (callfd < 0) { + PMD_DRV_LOG(ERR, "callfd error, %s\n", strerror(errno)); + exit(-1); + } + hw->callfd = callfd; + + kickfd = eventfd(0, O_CLOEXEC | O_NONBLOCK); + if (kickfd < 0) { + PMD_DRV_LOG(ERR, "callfd error, %s\n", strerror(errno)); + exit(-1); + } + hw->kickfd = kickfd; + + /* VHOST_USER_SET_OWNER */ + vhost_user_sendmsg(hw, VHOST_USER_SET_OWNER, NULL); + + return 0; +} diff --git a/drivers/net/virtio/vhost-user.h b/drivers/net/virtio/vhost-user.h new file mode 100644 index 0000000..148e2b7 --- /dev/null +++ b/drivers/net/virtio/vhost-user.h @@ -0,0 +1,137 @@ +/*- + * BSD LICENSE + * + * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _VHOST_NET_USER_H +#define _VHOST_NET_USER_H + +#include +#include + +#define VHOST_MEMORY_MAX_NREGIONS 8 + +struct vhost_vring_state { + unsigned int index; + unsigned int num; +}; + +struct vhost_vring_file { + unsigned int index; + int fd; +}; + +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; +}; + +#define VIRTIO_CONFIG_S_DRIVER_OK 4 + +/* refer to hw/virtio/vhost-user.c */ + +typedef enum VhostUserRequest { + VHOST_USER_NONE = 0, + VHOST_USER_GET_FEATURES = 1, + VHOST_USER_SET_FEATURES = 2, + VHOST_USER_SET_OWNER = 3, + VHOST_USER_RESET_OWNER = 4, + VHOST_USER_SET_MEM_TABLE = 5, + VHOST_USER_SET_LOG_BASE = 6, + VHOST_USER_SET_LOG_FD = 7, + VHOST_USER_SET_VRING_NUM = 8, + VHOST_USER_SET_VRING_ADDR = 9, + VHOST_USER_SET_VRING_BASE = 10, + VHOST_USER_GET_VRING_BASE = 11, + VHOST_USER_SET_VRING_KICK = 12, + VHOST_USER_SET_VRING_CALL = 13, + VHOST_USER_SET_VRING_ERR = 14, + VHOST_USER_GET_PROTOCOL_FEATURES = 15, + VHOST_USER_SET_PROTOCOL_FEATURES = 16, + VHOST_USER_GET_QUEUE_NUM = 17, + VHOST_USER_SET_VRING_ENABLE = 18, + VHOST_USER_MAX +} VhostUserRequest; + +typedef struct VhostUserMemoryRegion { + uint64_t guest_phys_addr; + uint64_t memory_size; + uint64_t userspace_addr; + uint64_t mmap_offset; +} VhostUserMemoryRegion; + +typedef struct VhostUserMemory { + uint32_t nregions; + uint32_t padding; + VhostUserMemoryRegion regions[VHOST_MEMORY_MAX_NREGIONS]; +} VhostUserMemory; + +typedef struct VhostUserMsg { + VhostUserRequest request; + +#define VHOST_USER_VERSION_MASK 0x3 +#define VHOST_USER_REPLY_MASK (0x1 << 2) + uint32_t flags; + uint32_t size; /* the following payload size */ + union { +#define VHOST_USER_VRING_IDX_MASK 0xff +#define VHOST_USER_VRING_NOFD_MASK (0x1<<8) + uint64_t u64; + struct vhost_vring_state state; + struct vhost_vring_addr addr; + VhostUserMemory memory; + } payload; + int fds[VHOST_MEMORY_MAX_NREGIONS]; +} __attribute((packed)) VhostUserMsg; + +#define VHOST_USER_HDR_SIZE offsetof(VhostUserMsg, payload.u64) +#define VHOST_USER_PAYLOAD_SIZE (sizeof(VhostUserMsg) - VHOST_USER_HDR_SIZE) + +/* The version of the protocol we support */ +#define VHOST_USER_VERSION 0x1 + +/*****************************************************************************/ +#endif diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h index 47f722a..e33579f 100644 --- a/drivers/net/virtio/virtio_pci.h +++ b/drivers/net/virtio/virtio_pci.h @@ -147,7 +147,6 @@ struct virtqueue; * rest are per-device feature bits. */ #define VIRTIO_TRANSPORT_F_START 28 -#define VIRTIO_TRANSPORT_F_END 32 /* The Guest publishes the used index for which it expects an interrupt * at the end of the avail ring. Host should ignore the avail->flags field. */ @@ -174,6 +173,16 @@ struct virtio_hw { uint8_t use_msix; uint8_t started; uint8_t mac_addr[ETHER_ADDR_LEN]; +#ifdef RTE_VIRTIO_VDEV + uint32_t queue_num; + struct rte_eth_dev_data *data; + char *path; + int sockfd; + int callfd; + int kickfd; + uint32_t queue_sel; + uint8_t status; +#endif }; /* @@ -226,6 +235,25 @@ outl_p(unsigned int data, unsigned int port) } #endif +#ifdef RTE_VIRTIO_VDEV +uint32_t virtio_ioport_read(struct virtio_hw *, uint64_t); +void virtio_ioport_write(struct virtio_hw *, uint64_t, uint32_t); + +#define VIRTIO_READ_REG_1(hw, reg) \ + virtio_ioport_read(hw, reg) +#define VIRTIO_WRITE_REG_1(hw, reg, value) \ + virtio_ioport_write(hw, reg, value) +#define VIRTIO_READ_REG_2(hw, reg) \ + virtio_ioport_read(hw, reg) +#define VIRTIO_WRITE_REG_2(hw, reg, value) \ + virtio_ioport_write(hw, reg, value) +#define VIRTIO_READ_REG_4(hw, reg) \ + virtio_ioport_read(hw, reg) +#define VIRTIO_WRITE_REG_4(hw, reg, value) \ + virtio_ioport_write(hw, reg, value) + +#else /* RTE_VIRTIO_VDEV */ + #define VIRTIO_PCI_REG_ADDR(hw, reg) \ (unsigned short)((hw)->io_base + (reg)) @@ -244,6 +272,8 @@ outl_p(unsigned int data, unsigned int port) #define VIRTIO_WRITE_REG_4(hw, reg, value) \ outl_p((unsigned int)(value), (VIRTIO_PCI_REG_ADDR((hw), (reg)))) +#endif /* RTE_VIRTIO_VDEV */ + static inline int vtpci_with_feature(struct virtio_hw *hw, uint32_t bit) { -- 2.1.4