From patchwork Mon Jul 8 17:13:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Liu X-Patchwork-Id: 56217 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 22D121BDE0; Mon, 8 Jul 2019 11:30:13 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 0B2081B997 for ; Mon, 8 Jul 2019 11:29:59 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jul 2019 02:29:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,466,1557212400"; d="scan'208";a="155821687" Received: from npg-dpdk-virtual-marvin-dev.sh.intel.com ([10.67.119.142]) by orsmga007.jf.intel.com with ESMTP; 08 Jul 2019 02:29:57 -0700 From: Marvin Liu To: tiwei.bie@intel.com, maxime.coquelin@redhat.com, dev@dpdk.org Cc: Marvin Liu Date: Tue, 9 Jul 2019 01:13:17 +0800 Message-Id: <20190708171320.38802-11-yong.liu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190708171320.38802-1-yong.liu@intel.com> References: <20190708171320.38802-1-yong.liu@intel.com> Subject: [dpdk-dev] [RFC PATCH 10/13] add vhost fast zero copy dequeue packed ring function X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Modified vhost zero copy dequeue function which followed fast dequeue function. Signed-off-by: Marvin Liu diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c index a3b1e85fe..7094944cf 100644 --- a/lib/librte_vhost/virtio_net.c +++ b/lib/librte_vhost/virtio_net.c @@ -2143,6 +2143,147 @@ virtio_dev_tx_packed(struct virtio_net *dev, struct vhost_virtqueue *vq, return i; } +static __rte_always_inline void +free_zmbuf(struct vhost_virtqueue *vq) { + struct zcopy_mbuf *next = NULL; + struct zcopy_mbuf *zmbuf; + + for (zmbuf = TAILQ_FIRST(&vq->zmbuf_list); + zmbuf != NULL; zmbuf = next) { + next = TAILQ_NEXT(zmbuf, next); + + uint16_t last_used_idx = vq->last_used_idx; + + if (mbuf_is_consumed(zmbuf->mbuf)) { + uint16_t flags = 0; + + if (vq->used_wrap_counter) + flags = VIRTIO_TX_FLAG_PACKED; + else + flags = VIRTIO_TX_WRAP_FLAG_PACKED; + + vq->desc_packed[last_used_idx].id = zmbuf->desc_idx; + vq->desc_packed[last_used_idx].len = 0; + + rte_smp_wmb(); + vq->desc_packed[last_used_idx].flags = flags; + + vq->last_used_idx += zmbuf->desc_count; + if (vq->last_used_idx >= vq->size) { + vq->used_wrap_counter ^= 1; + vq->last_used_idx -= vq->size; + } + + TAILQ_REMOVE(&vq->zmbuf_list, zmbuf, next); + restore_mbuf(zmbuf->mbuf); + rte_pktmbuf_free(zmbuf->mbuf); + put_zmbuf(zmbuf); + vq->nr_zmbuf -= 1; + } + } +} + +static __rte_always_inline int +virtio_dev_tx_fast_packed_zmbuf(struct virtio_net *dev, struct vhost_virtqueue *vq, + struct rte_mempool *mbuf_pool, struct rte_mbuf **pkts) +{ + struct zcopy_mbuf *zmbuf, *zmbuf1, *zmbuf2, *zmbuf3; + int ret; + uintptr_t desc_addr[4]; + uint16_t ids[4]; + + uint16_t avail_idx = vq->last_avail_idx; + + ret = vhost_dequeue_fast_packed(dev, vq, mbuf_pool, pkts, avail_idx, + desc_addr, ids); + + if (ret) + return ret; + + zmbuf = get_zmbuf(vq); + zmbuf1 = get_zmbuf(vq); + zmbuf2 = get_zmbuf(vq); + zmbuf3 = get_zmbuf(vq); + + if (!zmbuf || !zmbuf1 || !zmbuf2 || !zmbuf3) { + rte_pktmbuf_free(pkts[0]); + rte_pktmbuf_free(pkts[1]); + rte_pktmbuf_free(pkts[2]); + rte_pktmbuf_free(pkts[3]); + return -1; + } + + zmbuf->mbuf = pkts[0]; + zmbuf->desc_idx = avail_idx; + zmbuf->desc_count = 1; + + zmbuf1->mbuf = pkts[1]; + zmbuf1->desc_idx = avail_idx + 1; + zmbuf1->desc_count = 1; + + zmbuf2->mbuf = pkts[2]; + zmbuf2->desc_idx = avail_idx + 2; + zmbuf2->desc_count = 1; + + zmbuf3->mbuf = pkts[3]; + zmbuf3->desc_idx = avail_idx + 3; + zmbuf3->desc_count = 1; + + rte_mbuf_refcnt_update(pkts[0], 1); + rte_mbuf_refcnt_update(pkts[1], 1); + rte_mbuf_refcnt_update(pkts[2], 1); + rte_mbuf_refcnt_update(pkts[3], 1); + + vq->nr_zmbuf += PACKED_DESC_PER_CACHELINE; + TAILQ_INSERT_TAIL(&vq->zmbuf_list, zmbuf, next); + TAILQ_INSERT_TAIL(&vq->zmbuf_list, zmbuf1, next); + TAILQ_INSERT_TAIL(&vq->zmbuf_list, zmbuf2, next); + TAILQ_INSERT_TAIL(&vq->zmbuf_list, zmbuf3, next); + + vq->last_avail_idx += PACKED_DESC_PER_CACHELINE; + if (vq->last_avail_idx >= vq->size) { + vq->last_avail_idx -= vq->size; + vq->avail_wrap_counter ^= 1; + } + + return 0; +} + +static __rte_always_inline int +virtio_dev_tx_normal_packed_zmbuf(struct virtio_net *dev, + struct vhost_virtqueue *vq, + struct rte_mempool *mbuf_pool, struct rte_mbuf **pkts) +{ + uint16_t buf_id, desc_count; + struct zcopy_mbuf *zmbuf; + + if (vhost_dequeue_normal_packed(dev, vq, mbuf_pool, pkts, &buf_id, + &desc_count)) + return -1; + + zmbuf = get_zmbuf(vq); + if (!zmbuf) { + rte_pktmbuf_free(*pkts); + return -1; + } + zmbuf->mbuf = *pkts; + zmbuf->desc_idx = vq->last_avail_idx; + zmbuf->desc_count = desc_count; + + rte_mbuf_refcnt_update(*pkts, 1); + + vq->nr_zmbuf += 1; + TAILQ_INSERT_TAIL(&vq->zmbuf_list, zmbuf, next); + + vq->last_avail_idx += desc_count; + if (vq->last_avail_idx >= vq->size) { + vq->last_avail_idx -= vq->size; + vq->avail_wrap_counter ^= 1; + } + + return 0; +} + uint16_t rte_vhost_dequeue_burst(int vid, uint16_t queue_id, struct rte_mempool *mbuf_pool, struct rte_mbuf **pkts, uint16_t count)