From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 337D95AA1 for ; Thu, 18 Aug 2016 15:41:15 +0200 (CEST) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP; 18 Aug 2016 06:41:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,539,1464678000"; d="scan'208";a="750443112" Received: from unknown (HELO dpdk5.sh.intel.com) ([10.239.129.118]) by FMSMGA003.fm.intel.com with ESMTP; 18 Aug 2016 06:41:14 -0700 From: Zhihong Wang To: dev@dpdk.org Cc: maxime.coquelin@redhat.com, yuanhan.liu@linux.intel.com, Zhihong Wang Date: Thu, 18 Aug 2016 02:33:10 -0400 Message-Id: <1471501991-37257-6-git-send-email-zhihong.wang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1471501991-37257-1-git-send-email-zhihong.wang@intel.com> References: <1471319402-112998-1-git-send-email-zhihong.wang@intel.com> <1471501991-37257-1-git-send-email-zhihong.wang@intel.com> Subject: [dpdk-dev] [PATCH v2 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: Thu, 18 Aug 2016 13:41:16 -0000 This patch enables batch update of the used ring for better efficiency. Signed-off-by: Zhihong Wang --- lib/librte_vhost/vhost-net.h | 4 +++ lib/librte_vhost/vhost_rxtx.c | 68 +++++++++++++++++++++++++++++++++---------- lib/librte_vhost/virtio-net.c | 15 ++++++++-- 3 files changed, 68 insertions(+), 19 deletions(-) diff --git a/lib/librte_vhost/vhost-net.h b/lib/librte_vhost/vhost-net.h index 51fdf3d..a15182c 100644 --- a/lib/librte_vhost/vhost-net.h +++ b/lib/librte_vhost/vhost-net.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_rxtx.c b/lib/librte_vhost/vhost_rxtx.c index 7db83d0..60d63d3 100644 --- a/lib/librte_vhost/vhost_rxtx.c +++ b/lib/librte_vhost/vhost_rxtx.c @@ -155,7 +155,6 @@ enqueue_packet(struct virtio_net *dev, struct vhost_virtqueue *vq, uint32_t mbuf_len_left = 0; uint32_t copy_len = 0; uint32_t extra_buffers = 0; - uint32_t used_idx_round = 0; /* start with the first mbuf of the packet */ mbuf_len = rte_pktmbuf_data_len(mbuf); @@ -207,17 +206,11 @@ enqueue_packet(struct virtio_net *dev, struct vhost_virtqueue *vq, goto rollback; } else if (is_mrg_rxbuf) { /* start with the next desc chain */ - used_idx_round = vq->last_used_idx - & (vq->size - 1); - vq->used->ring[used_idx_round].id = + vq->shadow_used_ring[vq->shadow_used_idx].id = desc_chain_head; - vq->used->ring[used_idx_round].len = + vq->shadow_used_ring[vq->shadow_used_idx].len = desc_chain_len; - vhost_log_used_vring(dev, vq, - offsetof(struct vring_used, - ring[used_idx_round]), - sizeof(vq->used->ring[ - used_idx_round])); + vq->shadow_used_idx++; vq->last_used_idx++; extra_buffers++; virtio_hdr->num_buffers++; @@ -255,12 +248,9 @@ enqueue_packet(struct virtio_net *dev, struct vhost_virtqueue *vq, desc_chain_len += copy_len; } - used_idx_round = vq->last_used_idx & (vq->size - 1); - vq->used->ring[used_idx_round].id = desc_chain_head; - vq->used->ring[used_idx_round].len = desc_chain_len; - vhost_log_used_vring(dev, vq, - offsetof(struct vring_used, ring[used_idx_round]), - sizeof(vq->used->ring[used_idx_round])); + 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++; return 0; @@ -275,6 +265,45 @@ error: } static inline void __attribute__((always_inline)) +update_used_ring(struct virtio_net *dev, struct vhost_virtqueue *vq, + uint32_t used_idx_start) +{ + if (used_idx_start + vq->shadow_used_idx < vq->size) { + rte_memcpy(&vq->used->ring[used_idx_start], + &vq->shadow_used_ring[0], + vq->shadow_used_idx * + sizeof(struct vring_used_elem)); + vhost_log_used_vring(dev, vq, + offsetof(struct vring_used, + ring[used_idx_start]), + vq->shadow_used_idx * + sizeof(struct vring_used_elem)); + } else { + uint32_t part_1 = vq->size - used_idx_start; + uint32_t part_2 = vq->shadow_used_idx - part_1; + + rte_memcpy(&vq->used->ring[used_idx_start], + &vq->shadow_used_ring[0], + part_1 * + sizeof(struct vring_used_elem)); + vhost_log_used_vring(dev, vq, + offsetof(struct vring_used, + ring[used_idx_start]), + part_1 * + sizeof(struct vring_used_elem)); + rte_memcpy(&vq->used->ring[0], + &vq->shadow_used_ring[part_1], + part_2 * + sizeof(struct vring_used_elem)); + vhost_log_used_vring(dev, vq, + offsetof(struct vring_used, + ring[0]), + part_2 * + sizeof(struct vring_used_elem)); + } +} + +static inline void __attribute__((always_inline)) notify_guest(struct virtio_net *dev, struct vhost_virtqueue *vq) { rte_smp_wmb(); @@ -293,6 +322,7 @@ rte_vhost_enqueue_burst(int vid, uint16_t queue_id, { struct vhost_virtqueue *vq; struct virtio_net *dev; + uint32_t used_idx_start = 0; uint32_t pkt_idx = 0; uint32_t pkt_left = 0; uint32_t pkt_sent = 0; @@ -322,6 +352,8 @@ rte_vhost_enqueue_burst(int vid, uint16_t queue_id, /* start enqueuing packets 1 by 1 */ pkt_idx = 0; pkt_left = count; + vq->shadow_used_idx = 0; + used_idx_start = vq->last_used_idx & (vq->size - 1); avail_idx = *((volatile uint16_t *)&vq->avail->idx); while (1) { if (loop_check(vq, avail_idx, pkt_left)) @@ -336,6 +368,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)) + update_used_ring(dev, vq, used_idx_start); + /* update used idx and kick the guest if necessary */ if (pkt_sent) notify_guest(dev, vq); diff --git a/lib/librte_vhost/virtio-net.c b/lib/librte_vhost/virtio-net.c index 1785695..87d09fa 100644 --- a/lib/librte_vhost/virtio-net.c +++ b/lib/librte_vhost/virtio-net.c @@ -152,10 +152,14 @@ cleanup_device(struct virtio_net *dev, int destroy) static void free_device(struct virtio_net *dev) { + struct vhost_virtqueue *vq; 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 = dev->virtqueue[i * VIRTIO_QNUM]; + rte_free(vq->shadow_used_ring); + rte_free(vq); + } rte_free(dev); } @@ -418,13 +422,18 @@ int vhost_set_vring_num(int vid, struct vhost_vring_state *state) { struct virtio_net *dev; + struct vhost_virtqueue *vq; dev = get_device(vid); if (dev == NULL) return -1; /* State->index refers to the queue index. The txq is 1, rxq is 0. */ - dev->virtqueue[state->index]->size = state->num; + vq = dev->virtqueue[state->index]; + vq->size = state->num; + vq->shadow_used_ring = rte_malloc("", + vq->size * sizeof(struct vring_used_elem), + RTE_CACHE_LINE_SIZE); return 0; } -- 2.7.4