From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 11BCB5A72 for ; Tue, 20 Sep 2016 11:08:10 +0200 (CEST) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP; 20 Sep 2016 02:08:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,367,1470726000"; d="scan'208";a="763653901" Received: from unknown (HELO dpdk5.sh.intel.com) ([10.239.129.118]) by FMSMGA003.fm.intel.com with ESMTP; 20 Sep 2016 02:08:09 -0700 From: Zhihong Wang To: dev@dpdk.org Cc: maxime.coquelin@redhat.com, yuanhan.liu@linux.intel.com, thomas.monjalon@6wind.com, Zhihong Wang Date: Mon, 19 Sep 2016 22:00:16 -0400 Message-Id: <1474336817-22683-6-git-send-email-zhihong.wang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474336817-22683-1-git-send-email-zhihong.wang@intel.com> References: <1471319402-112998-1-git-send-email-zhihong.wang@intel.com> <1474336817-22683-1-git-send-email-zhihong.wang@intel.com> Subject: [dpdk-dev] [PATCH v6 5/6] vhost: batch update used ring 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: Tue, 20 Sep 2016 09:08:12 -0000 This patch enables batch update of the used ring for better efficiency. Signed-off-by: Zhihong Wang --- Changes in v6: 1. Introduce a function for used ring write. --- Changes in v4: 1. Free shadow used ring in the right place. 2. Add failure check for shadow used ring malloc. lib/librte_vhost/vhost.c | 20 +++++++++++++++-- lib/librte_vhost/vhost.h | 4 ++++ lib/librte_vhost/vhost_user.c | 31 +++++++++++++++++++++----- lib/librte_vhost/virtio_net.c | 52 ++++++++++++++++++++++++++++++++++--------- 4 files changed, 89 insertions(+), 18 deletions(-) diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c index 46095c3..cb31cdd 100644 --- a/lib/librte_vhost/vhost.c +++ b/lib/librte_vhost/vhost.c @@ -119,10 +119,26 @@ cleanup_device(struct virtio_net *dev, int destroy) static void free_device(struct virtio_net *dev) { + struct vhost_virtqueue *vq_0; + struct vhost_virtqueue *vq_1; uint32_t i; - for (i = 0; i < dev->virt_qp_nb; i++) - rte_free(dev->virtqueue[i * VIRTIO_QNUM]); + for (i = 0; i < dev->virt_qp_nb; i++) { + vq_0 = dev->virtqueue[i * VIRTIO_QNUM]; + if (vq_0->shadow_used_ring) { + rte_free(vq_0->shadow_used_ring); + vq_0->shadow_used_ring = NULL; + } + + vq_1 = dev->virtqueue[i * VIRTIO_QNUM + 1]; + if (vq_1->shadow_used_ring) { + rte_free(vq_1->shadow_used_ring); + vq_1->shadow_used_ring = NULL; + } + + /* malloc together, free together */ + rte_free(vq_0); + } rte_free(dev); } diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h index 9707dfc..381dc27 100644 --- a/lib/librte_vhost/vhost.h +++ b/lib/librte_vhost/vhost.h @@ -85,6 +85,10 @@ struct vhost_virtqueue { /* Physical address of used ring, for logging */ uint64_t log_guest_addr; + + /* Shadow used ring for performance */ + struct vring_used_elem *shadow_used_ring; + uint32_t shadow_used_idx; } __rte_cache_aligned; /* Old kernels have no such macro defined */ diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index eee99e9..d7cf1ed 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -193,7 +193,21 @@ static int vhost_user_set_vring_num(struct virtio_net *dev, struct vhost_vring_state *state) { - dev->virtqueue[state->index]->size = state->num; + struct vhost_virtqueue *vq; + + vq = dev->virtqueue[state->index]; + vq->size = state->num; + if (!vq->shadow_used_ring) { + vq->shadow_used_ring = rte_malloc(NULL, + vq->size * sizeof(struct vring_used_elem), + RTE_CACHE_LINE_SIZE); + if (!vq->shadow_used_ring) { + RTE_LOG(ERR, VHOST_CONFIG, + "Failed to allocate memory" + " for shadow used ring.\n"); + return -1; + } + } return 0; } @@ -611,14 +625,21 @@ static int vhost_user_get_vring_base(struct virtio_net *dev, struct vhost_vring_state *state) { + struct vhost_virtqueue *vq; + /* We have to stop the queue (virtio) if it is running. */ if (dev->flags & VIRTIO_DEV_RUNNING) { dev->flags &= ~VIRTIO_DEV_RUNNING; notify_ops->destroy_device(dev->vid); } + vq = dev->virtqueue[state->index]; /* Here we are safe to get the last used index */ - state->num = dev->virtqueue[state->index]->last_used_idx; + state->num = vq->last_used_idx; + if (vq->shadow_used_ring) { + rte_free(vq->shadow_used_ring); + vq->shadow_used_ring = NULL; + } RTE_LOG(INFO, VHOST_CONFIG, "vring base idx:%d file:%d\n", state->index, state->num); @@ -627,10 +648,10 @@ vhost_user_get_vring_base(struct virtio_net *dev, * sent and only sent in vhost_vring_stop. * TODO: cleanup the vring, it isn't usable since here. */ - if (dev->virtqueue[state->index]->kickfd >= 0) - close(dev->virtqueue[state->index]->kickfd); + if (vq->kickfd >= 0) + close(vq->kickfd); - dev->virtqueue[state->index]->kickfd = VIRTIO_UNINITIALIZED_EVENTFD; + vq->kickfd = VIRTIO_UNINITIALIZED_EVENTFD; return 0; } diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c index f32a143..8f2882b 100644 --- a/lib/librte_vhost/virtio_net.c +++ b/lib/librte_vhost/virtio_net.c @@ -134,17 +134,40 @@ virtio_enqueue_offload(struct rte_mbuf *m_buf, struct virtio_net_hdr *net_hdr) } static inline void __attribute__((always_inline)) -update_used_ring(struct virtio_net *dev, struct vhost_virtqueue *vq, - uint32_t desc_chain_head, uint32_t desc_chain_len) +update_used_ring(struct vhost_virtqueue *vq, uint32_t desc_chain_head, + uint32_t desc_chain_len) { - uint32_t used_idx = vq->last_used_idx & (vq->size - 1); - - vq->used->ring[used_idx].id = desc_chain_head; - vq->used->ring[used_idx].len = desc_chain_len; + vq->shadow_used_ring[vq->shadow_used_idx].id = desc_chain_head; + vq->shadow_used_ring[vq->shadow_used_idx].len = desc_chain_len; + vq->shadow_used_idx++; vq->last_used_idx++; - vhost_log_used_vring(dev, vq, offsetof(struct vring_used, - ring[used_idx]), - sizeof(vq->used->ring[used_idx])); +} + +static inline void __attribute__((always_inline)) +write_used_ring(struct virtio_net *dev, struct vhost_virtqueue *vq, + uint32_t used_idx, uint32_t used_idx_shadow, uint32_t size) +{ + rte_memcpy(&vq->used->ring[used_idx], + &vq->shadow_used_ring[used_idx_shadow], + size * sizeof(struct vring_used_elem)); + vhost_log_used_vring(dev, vq, + offsetof(struct vring_used, ring[used_idx]), + size * sizeof(struct vring_used_elem)); +} + +static inline void __attribute__((always_inline)) +flush_used_ring(struct virtio_net *dev, struct vhost_virtqueue *vq, + uint32_t used_idx) +{ + if (used_idx + vq->shadow_used_idx < vq->size) { + write_used_ring(dev, vq, used_idx, 0, vq->shadow_used_idx); + } else { + uint32_t size_0 = vq->size - used_idx; + uint32_t size_1 = vq->shadow_used_idx - size_0; + + write_used_ring(dev, vq, used_idx, 0, size_0); + write_used_ring(dev, vq, 0, size_0, size_1); + } } static inline int __attribute__((always_inline)) @@ -204,7 +227,7 @@ enqueue_packet(struct virtio_net *dev, struct vhost_virtqueue *vq, desc_current = desc->next; } else if (is_mrg_rxbuf) { /* start with the next desc chain */ - update_used_ring(dev, vq, desc_chain_head, + update_used_ring(vq, desc_chain_head, desc_chain_len); num_buffers++; virtio_hdr->num_buffers++; @@ -240,7 +263,7 @@ enqueue_packet(struct virtio_net *dev, struct vhost_virtqueue *vq, desc_chain_len += cpy_len; } - update_used_ring(dev, vq, desc_chain_head, desc_chain_len); + update_used_ring(vq, desc_chain_head, desc_chain_len); return 0; @@ -273,6 +296,7 @@ rte_vhost_enqueue_burst(int vid, uint16_t queue_id, { struct vhost_virtqueue *vq; struct virtio_net *dev; + uint32_t used_idx; uint32_t is_mrg_rxbuf = 0; uint32_t pkt_idx = 0; uint32_t pkt_left = count; @@ -298,6 +322,8 @@ rte_vhost_enqueue_burst(int vid, uint16_t queue_id, is_mrg_rxbuf = 1; /* start enqueuing packets 1 by 1 */ + vq->shadow_used_idx = 0; + used_idx = vq->last_used_idx & (vq->size - 1); avail_idx = *((volatile uint16_t *)&vq->avail->idx); while (pkt_left && avail_idx != vq->last_used_idx) { /* prefetch the next desc */ @@ -314,6 +340,10 @@ rte_vhost_enqueue_burst(int vid, uint16_t queue_id, pkt_left--; } + /* batch update used ring for better performance */ + if (likely(vq->shadow_used_idx > 0)) + flush_used_ring(dev, vq, used_idx); + /* update used idx and kick the guest if necessary */ if (pkt_idx) notify_guest(dev, vq); -- 2.7.4