From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3B8BE468B7; Mon, 9 Jun 2025 17:39:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0AB80427B6; Mon, 9 Jun 2025 17:38:09 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by mails.dpdk.org (Postfix) with ESMTP id 187A2427A1 for ; Mon, 9 Jun 2025 17:38:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1749483487; x=1781019487; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zR2iShE9V074Wy0A2hrbtfLO8z6qRHJT4gU7Qe2ZqOE=; b=Rt9vbzlzuGnVUidYm7VZ0Vff93A9rC4Oyl+FJQGAJ0p9ovqF9AHEo0Ce /c4TMaixzQntgSVwphCsnhblVYpvWki1+MPFMQEaToUHu7vVfKVIYP4on /65yZPzClKkRe4otCSYGSJJ5difoNvsO4jvq5eVNMz5zrW7v36vUE4sgY fgBGpBhcAyyt32VeS0zNrOLDSk7q8FDojDL/3cBXsNF4jtaQjM7ncx/Cy hDqS/ZIe2knEah3bIVTI4cipEUgZnbccUdu4M1JypZ2Zh0i2eNzRYC8F+ 9naVp7ZIU+H4Z1DHxRa86jin2hIxAuzrazRD6wHtHF5NLWDuJMIABniGZ g==; X-CSE-ConnectionGUID: u7j8OrQCSyGD06kwLxsSBw== X-CSE-MsgGUID: 3sDKc66yTw+It18J4WMetw== X-IronPort-AV: E=McAfee;i="6800,10657,11459"; a="69012183" X-IronPort-AV: E=Sophos;i="6.16,222,1744095600"; d="scan'208";a="69012183" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2025 08:38:07 -0700 X-CSE-ConnectionGUID: 4rmphkBEQO6yxYbxDzrQtQ== X-CSE-MsgGUID: tdouAKq7S72blDAkz0IJTw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,222,1744095600"; d="scan'208";a="151419651" Received: from silpixa00401119.ir.intel.com ([10.55.129.167]) by fmviesa005.fm.intel.com with ESMTP; 09 Jun 2025 08:38:05 -0700 From: Anatoly Burakov To: dev@dpdk.org, Vladimir Medvedkin Cc: bruce.richardson@intel.com Subject: [PATCH v6 13/33] net/ixgbe: rename vector txq free mbufs Date: Mon, 9 Jun 2025 16:37:11 +0100 Message-ID: <8b66b094e3a32e39c031c1bdeb7d0ca7808c82ce.1749483382.git.anatoly.burakov@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org There is no reason why scalar and vector implementations of tx free mbufs function have to share the same name, in fact it is counter-productive because including `ixgbe_rxtx_vec_common.h` from `ixgbe_rxtx.c` will cause naming clashes. Rename the vector implementation to avoid naming clashes. Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- Notes: v5: - Add this patch drivers/net/intel/ixgbe/ixgbe_rxtx_vec_common.h | 2 +- drivers/net/intel/ixgbe/ixgbe_rxtx_vec_neon.c | 2 +- drivers/net/intel/ixgbe/ixgbe_rxtx_vec_sse.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/intel/ixgbe/ixgbe_rxtx_vec_common.h b/drivers/net/intel/ixgbe/ixgbe_rxtx_vec_common.h index 018010820f..9e1abf4449 100644 --- a/drivers/net/intel/ixgbe/ixgbe_rxtx_vec_common.h +++ b/drivers/net/intel/ixgbe/ixgbe_rxtx_vec_common.h @@ -12,7 +12,7 @@ #include "ixgbe_rxtx.h" static __rte_always_inline int -ixgbe_tx_free_bufs(struct ci_tx_queue *txq) +ixgbe_tx_free_bufs_vec(struct ci_tx_queue *txq) { struct ci_tx_entry_vec *txep; uint32_t status; diff --git a/drivers/net/intel/ixgbe/ixgbe_rxtx_vec_neon.c b/drivers/net/intel/ixgbe/ixgbe_rxtx_vec_neon.c index f8916d44e8..3a0b2909a7 100644 --- a/drivers/net/intel/ixgbe/ixgbe_rxtx_vec_neon.c +++ b/drivers/net/intel/ixgbe/ixgbe_rxtx_vec_neon.c @@ -583,7 +583,7 @@ ixgbe_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts, nb_pkts = RTE_MIN(nb_pkts, txq->tx_rs_thresh); if (txq->nb_tx_free < txq->tx_free_thresh) - ixgbe_tx_free_bufs(txq); + ixgbe_tx_free_bufs_vec(txq); nb_commit = nb_pkts = (uint16_t)RTE_MIN(txq->nb_tx_free, nb_pkts); if (unlikely(nb_pkts == 0)) diff --git a/drivers/net/intel/ixgbe/ixgbe_rxtx_vec_sse.c b/drivers/net/intel/ixgbe/ixgbe_rxtx_vec_sse.c index 9417e5b11f..1e063bb243 100644 --- a/drivers/net/intel/ixgbe/ixgbe_rxtx_vec_sse.c +++ b/drivers/net/intel/ixgbe/ixgbe_rxtx_vec_sse.c @@ -703,7 +703,7 @@ ixgbe_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts, nb_pkts = RTE_MIN(nb_pkts, txq->tx_rs_thresh); if (txq->nb_tx_free < txq->tx_free_thresh) - ixgbe_tx_free_bufs(txq); + ixgbe_tx_free_bufs_vec(txq); nb_commit = nb_pkts = (uint16_t)RTE_MIN(txq->nb_tx_free, nb_pkts); if (unlikely(nb_pkts == 0)) -- 2.47.1