From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2CD73A09FD; Fri, 18 Dec 2020 12:44:46 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AFCD1CACD; Fri, 18 Dec 2020 12:44:11 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id F2181CAAF for ; Fri, 18 Dec 2020 12:44:08 +0100 (CET) IronPort-SDR: Ha2X6y6uSevRyvjcDaE2GM3inTaUzV7PFL13PjJfPLamU4K1Hle+X9Jagtg2iqedaDSQsCtmba v3+NjwZ1lldQ== X-IronPort-AV: E=McAfee;i="6000,8403,9838"; a="193829618" X-IronPort-AV: E=Sophos;i="5.78,430,1599548400"; d="scan'208";a="193829618" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2020 03:44:08 -0800 IronPort-SDR: RjORRR/U+XLyRM90rF4S7mMK36ME0pkKY9nAbV9wkdkHxLJd6aQR+OG9Sh/kHamDF1D0NJs2Fb U1lXlntEutTA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,430,1599548400"; d="scan'208";a="370534235" Received: from dpdk_jiangcheng.sh.intel.com ([10.67.119.112]) by orsmga008.jf.intel.com with ESMTP; 18 Dec 2020 03:44:06 -0800 From: Cheng Jiang To: maxime.coquelin@redhat.com, chenbo.xia@intel.com Cc: dev@dpdk.org, Jiayu.Hu@intel.com, YvonneX.Yang@intel.com, Cheng Jiang Date: Fri, 18 Dec 2020 11:33:26 +0000 Message-Id: <20201218113327.70528-3-Cheng1.jiang@intel.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201218113327.70528-1-Cheng1.jiang@intel.com> References: <20201218113327.70528-1-Cheng1.jiang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v1 2/3] examples/vhost: optimize vhost data path for batch 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" Change the vm2vm data path to batch enqueue for better performance. Signed-off-by: Cheng Jiang --- examples/vhost/main.c | 84 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 75 insertions(+), 9 deletions(-) diff --git a/examples/vhost/main.c b/examples/vhost/main.c index 8d8c3038bf..28226a4ff7 100644 --- a/examples/vhost/main.c +++ b/examples/vhost/main.c @@ -182,6 +182,11 @@ struct mbuf_table { /* TX queue for each data core. */ struct mbuf_table lcore_tx_queue[RTE_MAX_LCORE]; +static uint64_t vhost_tsc[MAX_VHOST_DEVICE]; + +/* TX queue for each vhost device. */ +struct mbuf_table vhost_m_table[MAX_VHOST_DEVICE]; + #define MBUF_TABLE_DRAIN_TSC ((rte_get_tsc_hz() + US_PER_S - 1) \ / US_PER_S * BURST_TX_DRAIN_US) #define VLAN_HLEN 4 @@ -804,6 +809,13 @@ unlink_vmdq(struct vhost_dev *vdev) } } +static inline void +free_pkts(struct rte_mbuf **pkts, uint16_t n) +{ + while (n--) + rte_pktmbuf_free(pkts[n]); +} + static __rte_always_inline void virtio_xmit(struct vhost_dev *dst_vdev, struct vhost_dev *src_vdev, struct rte_mbuf *m) @@ -837,6 +849,40 @@ virtio_xmit(struct vhost_dev *dst_vdev, struct vhost_dev *src_vdev, } } +static __rte_always_inline void +drain_vhost(struct vhost_dev *dst_vdev, struct rte_mbuf **m, uint16_t nr_xmit) +{ + uint16_t ret, nr_cpl; + struct rte_mbuf *m_cpl[MAX_PKT_BURST]; + + if (builtin_net_driver) { + ret = vs_enqueue_pkts(dst_vdev, VIRTIO_RXQ, m, nr_xmit); + } else if (async_vhost_driver) { + ret = rte_vhost_submit_enqueue_burst(dst_vdev->vid, VIRTIO_RXQ, + m, nr_xmit); + dst_vdev->nr_async_pkts += ret; + free_pkts(&m[ret], nr_xmit - ret); + + while (likely(dst_vdev->nr_async_pkts)) { + nr_cpl = rte_vhost_poll_enqueue_completed(dst_vdev->vid, + VIRTIO_RXQ, m_cpl, MAX_PKT_BURST); + dst_vdev->nr_async_pkts -= nr_cpl; + free_pkts(m_cpl, nr_cpl); + } + } else { + ret = rte_vhost_enqueue_burst(dst_vdev->vid, VIRTIO_RXQ, + m, nr_xmit); + } + + if (enable_stats) { + rte_atomic64_add(&dst_vdev->stats.rx_total_atomic, nr_xmit); + rte_atomic64_add(&dst_vdev->stats.rx_atomic, ret); + } + + if (!async_vhost_driver) + free_pkts(m, nr_xmit); +} + /* * Check if the packet destination MAC address is for a local device. If so then put * the packet on that devices RX queue. If not then return. @@ -846,6 +892,7 @@ virtio_tx_local(struct vhost_dev *vdev, struct rte_mbuf *m) { struct rte_ether_hdr *pkt_hdr; struct vhost_dev *dst_vdev; + struct mbuf_table *vhost_txq; pkt_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); @@ -869,7 +916,19 @@ virtio_tx_local(struct vhost_dev *vdev, struct rte_mbuf *m) return 0; } - virtio_xmit(dst_vdev, vdev, m); + vhost_txq = &vhost_m_table[dst_vdev->vid]; + vhost_txq->m_table[vhost_txq->len++] = m; + + if (enable_stats) { + vdev->stats.tx_total++; + vdev->stats.tx++; + } + + if (unlikely(vhost_txq->len == MAX_PKT_BURST)) { + drain_vhost(dst_vdev, vhost_txq->m_table, MAX_PKT_BURST); + vhost_txq->len = 0; + vhost_tsc[dst_vdev->vid] = rte_rdtsc(); + } return 0; } @@ -940,13 +999,6 @@ static void virtio_tx_offload(struct rte_mbuf *m) tcp_hdr->cksum = get_psd_sum(l3_hdr, m->ol_flags); } -static inline void -free_pkts(struct rte_mbuf **pkts, uint16_t n) -{ - while (n--) - rte_pktmbuf_free(pkts[n]); -} - static __rte_always_inline void do_drain_mbuf_table(struct mbuf_table *tx_q) { @@ -986,7 +1038,6 @@ virtio_tx_route(struct vhost_dev *vdev, struct rte_mbuf *m, uint16_t vlan_tag) /*check if destination is local VM*/ if ((vm2vm_mode == VM2VM_SOFTWARE) && (virtio_tx_local(vdev, m) == 0)) { - rte_pktmbuf_free(m); return; } @@ -1144,8 +1195,10 @@ static __rte_always_inline void drain_virtio_tx(struct vhost_dev *vdev) { struct rte_mbuf *pkts[MAX_PKT_BURST]; + struct mbuf_table *vhost_txq; uint16_t count; uint16_t i; + uint64_t cur_tsc; if (builtin_net_driver) { count = vs_dequeue_pkts(vdev, VIRTIO_TXQ, mbuf_pool, @@ -1163,6 +1216,19 @@ drain_virtio_tx(struct vhost_dev *vdev) for (i = 0; i < count; ++i) virtio_tx_route(vdev, pkts[i], vlan_tags[vdev->vid]); + + vhost_txq = &vhost_m_table[vdev->vid]; + cur_tsc = rte_rdtsc(); + if (unlikely(cur_tsc - vhost_tsc[vdev->vid] > MBUF_TABLE_DRAIN_TSC)) { + if (vhost_txq->len) { + RTE_LOG_DP(DEBUG, VHOST_DATA, + "Vhost tX queue drained after timeout with burst size %u\n", + vhost_txq->len); + drain_vhost(vdev, vhost_txq->m_table, vhost_txq->len); + vhost_txq->len = 0; + vhost_tsc[vdev->vid] = cur_tsc; + } + } } /* -- 2.29.2