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 A5A24A2EEB for ; Fri, 13 Sep 2019 16:40:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CB7F21F06D; Fri, 13 Sep 2019 16:40:27 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 7BFB11F071 for ; Fri, 13 Sep 2019 16:40:20 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Sep 2019 07:40:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,492,1559545200"; d="scan'208";a="197570564" Received: from baranmx-mobl.ger.corp.intel.com ([10.103.104.83]) by orsmga002.jf.intel.com with ESMTP; 13 Sep 2019 07:40:18 -0700 From: Marcin Baran To: dev@dpdk.org, bruce.richardson@intel.com Cc: Pawel Modrak , Marcin Baran Date: Fri, 13 Sep 2019 16:39:11 +0200 Message-Id: <20190913143914.2332-5-marcinx.baran@intel.com> X-Mailer: git-send-email 2.22.0.windows.1 In-Reply-To: <20190913143914.2332-1-marcinx.baran@intel.com> References: <20190909082939.1629-1-marcinx.baran@intel.com> <20190913143914.2332-1-marcinx.baran@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 4/6] examples/ioat: add two threads configuration 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" From: Pawel Modrak Added possibility to use two lcores: first for packet receiving and copying, second for packets sending. Signed-off-by: Pawel Modrak Signed-off-by: Marcin Baran --- examples/ioat/ioatfwd.c | 92 ++++++++++++++++++++++++++++++----------- 1 file changed, 67 insertions(+), 25 deletions(-) diff --git a/examples/ioat/ioatfwd.c b/examples/ioat/ioatfwd.c index c66ce7e49e..4c51db6bda 100644 --- a/examples/ioat/ioatfwd.c +++ b/examples/ioat/ioatfwd.c @@ -161,7 +161,6 @@ ioat_enqueue_packets(struct rte_mbuf **pkts, rte_mempool_put_bulk(ioat_pktmbuf_pool, (void *)&pkts_copy[i], nb_rx - i); - return ret; } @@ -226,8 +225,8 @@ ioat_tx_port(struct rxtx_port_config *tx_config) struct rte_mbuf *mbufs_dst[MAX_PKT_BURST]; if (copy_mode == COPY_MODE_IOAT_NUM) { - /* Deque the mbufs from IOAT device. */ for (i = 0; i < tx_config->nb_queues; i++) { + /* Deque the mbufs from IOAT device. */ nb_dq = rte_ioat_completed_copies( tx_config->ioat_ids[i], MAX_PKT_BURST, (void *)mbufs_src, (void *)mbufs_dst); @@ -256,31 +255,64 @@ ioat_tx_port(struct rxtx_port_config *tx_config) nb_dq - nb_tx); } } else { - /* Deque the mbufs from rx_to_tx_ring. */ - nb_dq = rte_ring_dequeue_burst(tx_config->rx_to_tx_ring, - (void *)mbufs_dst, MAX_PKT_BURST, NULL); - - if (nb_dq == 0) - return; - - /* Update macs if enabled */ - if (mac_updating) { - for (i = 0; i < nb_dq; i++) - update_mac_addrs(mbufs_dst[i], - tx_config->rxtx_port); - } + for (i = 0; i < tx_config->nb_queues; i++) { + /* Deque the mbufs from IOAT device. */ + nb_dq = rte_ring_dequeue_burst(tx_config->rx_to_tx_ring, + (void *)mbufs_dst, MAX_PKT_BURST, NULL); - const uint16_t nb_tx = rte_eth_tx_burst(tx_config->rxtx_port, - 0, (void *)mbufs_dst, nb_dq); + if (nb_dq == 0) + return; - /* Free any unsent packets. */ - if (unlikely(nb_tx < nb_dq)) - rte_mempool_put_bulk(ioat_pktmbuf_pool, - (void *)&mbufs_dst[nb_tx], - nb_dq - nb_tx); + /* Update macs if enabled */ + if (mac_updating) { + for (j = 0; j < nb_dq; j++) + update_mac_addrs(mbufs_dst[j], + tx_config->rxtx_port); + } + + const uint16_t nb_tx = + rte_eth_tx_burst(tx_config->rxtx_port, 0, + (void *)mbufs_dst, nb_dq); + + /* Free any unsent packets. */ + if (unlikely(nb_tx < nb_dq)) + rte_mempool_put_bulk(ioat_pktmbuf_pool, + (void *)&mbufs_dst[nb_tx], + nb_dq - nb_tx); + } } } +/* Main rx processing loop for IOAT rawdev. */ +static void +rx_main_loop(void) +{ + uint16_t i; + uint16_t nb_ports = cfg.nb_ports; + + RTE_LOG(INFO, IOAT, "Entering main rx loop for copy on lcore %u\n", + rte_lcore_id()); + + while (!force_quit) + for (i = 0; i < nb_ports; i++) + ioat_rx_port(&cfg.ports[i]); +} + +/* Main tx processing loop for hardware copy. */ +static void +tx_main_loop(void) +{ + uint16_t i; + uint16_t nb_ports = cfg.nb_ports; + + RTE_LOG(INFO, IOAT, "Entering main tx loop for copy on lcore %u\n", + rte_lcore_id()); + + while (!force_quit) + for (i = 0; i < nb_ports; i++) + ioat_tx_port(&cfg.ports[i]); +} + /* Main rx and tx loop if only one slave lcore available */ static void rxtx_main_loop(void) @@ -305,9 +337,19 @@ static void start_forwarding_cores(void) RTE_LOG(INFO, IOAT, "Entering %s on lcore %u\n", __func__, rte_lcore_id()); - lcore_id = rte_get_next_lcore(lcore_id, true, true); - rte_eal_remote_launch((lcore_function_t *)rxtx_main_loop, - NULL, lcore_id); + if (cfg.nb_lcores == 1) { + lcore_id = rte_get_next_lcore(lcore_id, true, true); + rte_eal_remote_launch((lcore_function_t *)rxtx_main_loop, + NULL, lcore_id); + } else if (cfg.nb_lcores > 1) { + lcore_id = rte_get_next_lcore(lcore_id, true, true); + rte_eal_remote_launch((lcore_function_t *)rx_main_loop, + NULL, lcore_id); + + lcore_id = rte_get_next_lcore(lcore_id, true, true); + rte_eal_remote_launch((lcore_function_t *)tx_main_loop, NULL, + lcore_id); + } } /* Display usage */ -- 2.22.0.windows.1