On Mon, Jun 15, 2015 at 03:56:39PM +0800, Ouyang Changchun wrote: > Each virtio device could have multiple queues, say 2 or 4, at most 8. > Enabling this feature allows virtio device/port on guest has the ability to > use different vCPU to receive/transmit packets from/to each queue. > > In multiple queues mode, virtio device readiness means all queues of > this virtio device are ready, cleanup/destroy a virtio device also > requires clearing all queues belong to it. > > Changes in v3: > - fix coding style > - check virtqueue idx validity > > Changes in v2: > - remove the q_num_set api > - add the qp_num_get api > - determine the queue pair num from qemu message > - rework for reset owner message handler > - dynamically alloc mem for dev virtqueue > - queue pair num could be 0x8000 > - fix checkpatch errors > > Signed-off-by: Changchun Ouyang <changchun.ouyang at intel.com> > --- > lib/librte_vhost/rte_virtio_net.h | 10 +- > lib/librte_vhost/vhost-net.h | 1 + > lib/librte_vhost/vhost_rxtx.c | 49 +++++--- > lib/librte_vhost/vhost_user/vhost-net-user.c | 4 +- > lib/librte_vhost/vhost_user/virtio-net-user.c | 76 +++++++++--- > lib/librte_vhost/vhost_user/virtio-net-user.h | 2 + > lib/librte_vhost/virtio-net.c | 161 > +++++++++++++++++--------- > 7 files changed, 216 insertions(+), 87 deletions(-) > > diff --git a/lib/librte_vhost/rte_virtio_net.h > b/lib/librte_vhost/rte_virtio_net.h > index 5d38185..873be3e 100644 > --- a/lib/librte_vhost/rte_virtio_net.h > +++ b/lib/librte_vhost/rte_virtio_net.h > @@ -59,7 +59,6 @@ struct rte_mbuf; > /* Backend value set by guest. */ > #define VIRTIO_DEV_STOPPED -1 > > - > /* Enum for virtqueue management. */ > enum {VIRTIO_RXQ, VIRTIO_TXQ, VIRTIO_QNUM}; > > @@ -96,13 +95,14 @@ struct vhost_virtqueue { > * Device structure contains all configuration information relating to the > device. > */ > struct virtio_net { > - struct vhost_virtqueue *virtqueue[VIRTIO_QNUM]; /**< Contains > all virtqueue information. */ > struct virtio_memory *mem; /**< QEMU memory and memory > region information. */ > + struct vhost_virtqueue **virtqueue; /**< Contains all virtqueue > information. */ > uint64_t features; /**< Negotiated feature set. */ > uint64_t device_fh; /**< device identifier. */ > uint32_t flags; /**< Device flags. Only used to > check if device is running on data core. */ > #define IF_NAME_SZ (PATH_MAX > IFNAMSIZ ? PATH_MAX : IFNAMSIZ) > char ifname[IF_NAME_SZ]; /**< Name of the tap > device or socket path. */ > + uint32_t num_virt_queues; > void *priv; /**< private context */ > } __rte_cache_aligned;
As already pointed out, this breaks ABI. Do you have a plan for that or are you pushing this for dpdk 2.2? > @@ -220,4 +220,10 @@ uint16_t rte_vhost_enqueue_burst(struct virtio_net *dev, > uint16_t queue_id, > uint16_t rte_vhost_dequeue_burst(struct virtio_net *dev, uint16_t queue_id, > struct rte_mempool *mbuf_pool, struct rte_mbuf **pkts, uint16_t count); > > +/** > + * This function get the queue pair number of one vhost device. > + * @return > + * num of queue pair of specified virtio device. > + */ > +uint16_t rte_vhost_qp_num_get(struct virtio_net *dev); This needs to go to rte_vhost_version.map too. fbl