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 838C0A04B1; Wed, 9 Sep 2020 08:39:09 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B78AF1C116; Wed, 9 Sep 2020 08:38:42 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 939FB1C116 for ; Wed, 9 Sep 2020 08:38:41 +0200 (CEST) IronPort-SDR: QfaiururjdsQc3EBQo+etJGsEUf9T/6f6faS4tR62oSyhBbX6Y60Yy3vy3zlsj5Y86KXx9XhYs tXWDGvli0ZOw== X-IronPort-AV: E=McAfee;i="6000,8403,9738"; a="243094311" X-IronPort-AV: E=Sophos;i="5.76,408,1592895600"; d="scan'208";a="243094311" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Sep 2020 23:38:41 -0700 IronPort-SDR: W12f1wK1DgPzctZ8uIFghcm3cd+ZLcZ8qbDrWkWn4exBeO3m6fd8Kq/mhz7PDTyeH4T6nErBf6 b5p36l8Xh2kg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,408,1592895600"; d="scan'208";a="300049936" Received: from npg-dpdk-cvl-jeffguo-01.sh.intel.com ([10.67.111.128]) by orsmga003.jf.intel.com with ESMTP; 08 Sep 2020 23:38:37 -0700 From: Jeff Guo To: qiming.yang@intel.com, beilei.xing@intel.com, wei.zhao1@intel.com, qi.z.zhang@intel.com, jingjing.wu@intel.com Cc: bruce.richardson@intel.com, dev@dpdk.org, jia.guo@intel.com, helin.zhang@intel.com, mb@smartsharesystems.com, ferruh.yigit@intel.com, haiyue.wang@intel.com, stephen@networkplumber.org, barbette@kth.se Date: Wed, 9 Sep 2020 14:36:36 +0800 Message-Id: <20200909063636.60205-6-jia.guo@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200909063636.60205-1-jia.guo@intel.com> References: <20200827075452.1751-1-jia.guo@intel.com> <20200909063636.60205-1-jia.guo@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v3 5/5] net/fm10k: fix vector rx burst for fm10k 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" The scattered receive path should use a wrapper function to achieve the goal of burst maximizing. And do some code cleaning for vector rx path. Signed-off-by: Jeff Guo --- drivers/net/fm10k/fm10k_rxtx_vec.c | 42 +++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/drivers/net/fm10k/fm10k_rxtx_vec.c b/drivers/net/fm10k/fm10k_rxtx_vec.c index eff3933b5..3b25c570b 100644 --- a/drivers/net/fm10k/fm10k_rxtx_vec.c +++ b/drivers/net/fm10k/fm10k_rxtx_vec.c @@ -645,25 +645,23 @@ fm10k_reassemble_packets(struct fm10k_rx_queue *rxq, return pkt_idx; } -/* - * vPMD receive routine that reassembles scattered packets +/** + * vPMD receive routine that reassembles single burst of 32 scattered packets * * Notice: * - don't support ol_flags for rss and csum err - * - nb_pkts > RTE_FM10K_MAX_RX_BURST, only scan RTE_FM10K_MAX_RX_BURST - * numbers of DD bit */ -uint16_t -fm10k_recv_scattered_pkts_vec(void *rx_queue, - struct rte_mbuf **rx_pkts, - uint16_t nb_pkts) +static uint16_t +fm10k_recv_scattered_burst_vec(void *rx_queue, struct rte_mbuf **rx_pkts, + uint16_t nb_pkts) { struct fm10k_rx_queue *rxq = rx_queue; uint8_t split_flags[RTE_FM10K_MAX_RX_BURST] = {0}; unsigned i = 0; - /* Split_flags only can support max of RTE_FM10K_MAX_RX_BURST */ + /* split_flags only can support max of RTE_FM10K_MAX_RX_BURST */ nb_pkts = RTE_MIN(nb_pkts, RTE_FM10K_MAX_RX_BURST); + /* get some new buffers */ uint16_t nb_bufs = fm10k_recv_raw_pkts_vec(rxq, rx_pkts, nb_pkts, split_flags); @@ -691,6 +689,32 @@ fm10k_recv_scattered_pkts_vec(void *rx_queue, &split_flags[i]); } +/** + * vPMD receive routine that reassembles scattered packets. + */ +uint16_t +fm10k_recv_scattered_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, + uint16_t nb_pkts) +{ + uint16_t retval = 0; + + while (nb_pkts > RTE_FM10K_MAX_RX_BURST) { + uint16_t burst; + + burst = fm10k_recv_scattered_burst_vec(rx_queue, + rx_pkts + retval, + RTE_FM10K_MAX_RX_BURST); + retval += burst; + nb_pkts -= burst; + if (burst < RTE_FM10K_MAX_RX_BURST) + return retval; + } + + return retval + fm10k_recv_scattered_burst_vec(rx_queue, + rx_pkts + retval, + nb_pkts); +} + static const struct fm10k_txq_ops vec_txq_ops = { .reset = fm10k_reset_tx_queue, }; -- 2.20.1