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 4523C46ECA; Thu, 11 Sep 2025 16:32:36 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1EACA40689; Thu, 11 Sep 2025 16:32:12 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) by mails.dpdk.org (Postfix) with ESMTP id 0DCBC4066A for ; Thu, 11 Sep 2025 16:32:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1757601129; x=1789137129; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=047oGu3a3rfDdVKhL7Q9BE6i6XN0grXhOLJqDF8MXtI=; b=GZk+mXKiOd6kLo8VE5qGGPUPkD0a2LBbEmF/zEKA2JXMQH2Appd3d63N zxnv1Saj6zyXLkuOpE0JyaaCqY6mKmNL3aM7DUbw8vkmdS7aezFQORxhX F1+DMv4IvFFYwf8ZRnAyZrRXQwXvWKLTSzxftS9DXSpXWv9w+wnohZ9/9 i+b1ApLWSosVEarC29TDR6OiicSJdwZcyTSObbBUahPvrNT6ucwk/Nm0b sZrkjBg+KAe/HTt0Q6fcPQcBcFwIA2l6Fpg983ycTffb758JKo+4NPVrj STgypQ9mzR6FH2fPL1JPIQNmx41YDIlUOqaCog6Krr2FDlcrtupBsWaNb g==; X-CSE-ConnectionGUID: mNfBX9qiSWepQMW6BR0h+Q== X-CSE-MsgGUID: tpbkECaoSye5xpuKQRNnRg== X-IronPort-AV: E=McAfee;i="6800,10657,11549"; a="62562496" X-IronPort-AV: E=Sophos;i="6.18,257,1751266800"; d="scan'208";a="62562496" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Sep 2025 07:32:08 -0700 X-CSE-ConnectionGUID: joQ1U0OMRiOxnQCFisecXA== X-CSE-MsgGUID: /NaOckCTRLmkvJ0pDdQnHw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,257,1751266800"; d="scan'208";a="210845034" Received: from silpixa00401177.ir.intel.com ([10.237.213.77]) by orviesa001.jf.intel.com with ESMTP; 11 Sep 2025 07:32:08 -0700 From: Ciara Loftus To: dev@dpdk.org Cc: Ciara Loftus Subject: [PATCH 4/4] net/cpfl: use the common Rx path selection infrastructure Date: Thu, 11 Sep 2025 14:31:45 +0000 Message-Id: <20250911143145.3355960-5-ciara.loftus@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250911143145.3355960-1-ciara.loftus@intel.com> References: <20250911143145.3355960-1-ciara.loftus@intel.com> 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 Replace the existing complicated logic with the use of the common function. Signed-off-by: Ciara Loftus --- drivers/net/intel/cpfl/cpfl_rxtx.c | 105 ++++++-------------- drivers/net/intel/idpf/idpf_common_device.h | 1 - 2 files changed, 29 insertions(+), 77 deletions(-) diff --git a/drivers/net/intel/cpfl/cpfl_rxtx.c b/drivers/net/intel/cpfl/cpfl_rxtx.c index 0f5b645f89..c9e2a48417 100644 --- a/drivers/net/intel/cpfl/cpfl_rxtx.c +++ b/drivers/net/intel/cpfl/cpfl_rxtx.c @@ -1409,98 +1409,51 @@ cpfl_set_rx_function(struct rte_eth_dev *dev) { struct cpfl_vport *cpfl_vport = dev->data->dev_private; struct idpf_vport *vport = &cpfl_vport->base; + struct idpf_adapter *ad = vport->adapter; + struct ci_rx_path_features req_features = { + .rx_offloads = dev->data->dev_conf.rxmode.offloads, + .simd_width = RTE_VECT_SIMD_DISABLED, + }; #ifdef RTE_ARCH_X86 struct cpfl_rx_queue *cpfl_rxq; - enum rte_vect_max_simd rx_simd_width = RTE_VECT_SIMD_DISABLED; int i; if (cpfl_rx_vec_dev_check_default(dev) == CPFL_VECTOR_PATH && - rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128) { - vport->rx_vec_allowed = true; - rx_simd_width = cpfl_get_max_simd_bitwidth(); - } else { - vport->rx_vec_allowed = false; - } + rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_256) + req_features.simd_width = cpfl_get_max_simd_bitwidth(); #endif /* RTE_ARCH_X86 */ + req_features.extra.single_queue = (vport->rxq_model == VIRTCHNL2_QUEUE_MODEL_SINGLE); + req_features.extra.scattered = dev->data->scattered_rx; + + ad->rx_func_type = ci_rx_path_select(req_features, + &idpf_rx_path_infos[0], + IDPF_RX_MAX, + IDPF_RX_DEFAULT); + #ifdef RTE_ARCH_X86 - if (vport->rxq_model == VIRTCHNL2_QUEUE_MODEL_SPLIT) { - if (vport->rx_vec_allowed) { + if (idpf_rx_path_infos[ad->rx_func_type].features.simd_width >= RTE_VECT_SIMD_256) { + /* Vector function selected. Prepare the rxq accordingly. */ + if (idpf_rx_path_infos[ad->rx_func_type].features.extra.single_queue) { for (i = 0; i < dev->data->nb_rx_queues; i++) { cpfl_rxq = dev->data->rx_queues[i]; - if (cpfl_rxq->hairpin_info.hairpin_q) - continue; - (void)idpf_qc_splitq_rx_vec_setup(&cpfl_rxq->base); - } -#ifdef CC_AVX512_SUPPORT - if (rx_simd_width == RTE_VECT_SIMD_512) { - PMD_DRV_LOG(NOTICE, - "Using Split AVX512 Vector Rx (port %d).", - dev->data->port_id); - dev->rx_pkt_burst = idpf_dp_splitq_recv_pkts_avx512; - return; + (void)idpf_qc_singleq_rx_vec_setup(&cpfl_rxq->base); } -#endif /* CC_AVX512_SUPPORT */ - } - PMD_DRV_LOG(NOTICE, - "Using Split Scalar Rx (port %d).", - dev->data->port_id); - dev->rx_pkt_burst = idpf_dp_splitq_recv_pkts; - } else { - if (vport->rx_vec_allowed) { + } else { for (i = 0; i < dev->data->nb_rx_queues; i++) { cpfl_rxq = dev->data->rx_queues[i]; - (void)idpf_qc_singleq_rx_vec_setup(&cpfl_rxq->base); - } -#ifdef CC_AVX512_SUPPORT - if (rx_simd_width == RTE_VECT_SIMD_512) { - PMD_DRV_LOG(NOTICE, - "Using Single AVX512 Vector Rx (port %d).", - dev->data->port_id); - dev->rx_pkt_burst = idpf_dp_singleq_recv_pkts_avx512; - return; - } -#endif /* CC_AVX512_SUPPORT */ - if (rx_simd_width == RTE_VECT_SIMD_256) { - PMD_DRV_LOG(NOTICE, - "Using Single AVX2 Vector Rx (port %d).", - dev->data->port_id); - dev->rx_pkt_burst = idpf_dp_singleq_recv_pkts_avx2; - return; + if (cpfl_rxq->hairpin_info.hairpin_q) + continue; + (void)idpf_qc_splitq_rx_vec_setup(&cpfl_rxq->base); } } - if (dev->data->scattered_rx) { - PMD_DRV_LOG(NOTICE, - "Using Single Scalar Scatterd Rx (port %d).", - dev->data->port_id); - dev->rx_pkt_burst = idpf_dp_singleq_recv_scatter_pkts; - return; - } - PMD_DRV_LOG(NOTICE, - "Using Single Scalar Rx (port %d).", - dev->data->port_id); - dev->rx_pkt_burst = idpf_dp_singleq_recv_pkts; - } -#else - if (vport->rxq_model == VIRTCHNL2_QUEUE_MODEL_SPLIT) { - PMD_DRV_LOG(NOTICE, - "Using Split Scalar Rx (port %d).", - dev->data->port_id); - dev->rx_pkt_burst = idpf_dp_splitq_recv_pkts; - } else { - if (dev->data->scattered_rx) { - PMD_DRV_LOG(NOTICE, - "Using Single Scalar Scatterd Rx (port %d).", - dev->data->port_id); - dev->rx_pkt_burst = idpf_dp_singleq_recv_scatter_pkts; - return; - } - PMD_DRV_LOG(NOTICE, - "Using Single Scalar Rx (port %d).", - dev->data->port_id); - dev->rx_pkt_burst = idpf_dp_singleq_recv_pkts; } -#endif /* RTE_ARCH_X86 */ +#endif + + dev->rx_pkt_burst = idpf_rx_path_infos[ad->rx_func_type].pkt_burst; + PMD_DRV_LOG(NOTICE, "Using %s (port %d).", + idpf_rx_path_infos[ad->rx_func_type].info, dev->data->port_id); + } void diff --git a/drivers/net/intel/idpf/idpf_common_device.h b/drivers/net/intel/idpf/idpf_common_device.h index 11baa195e5..3b95d519c6 100644 --- a/drivers/net/intel/idpf/idpf_common_device.h +++ b/drivers/net/intel/idpf/idpf_common_device.h @@ -133,7 +133,6 @@ struct idpf_vport { uint16_t devarg_id; - bool rx_vec_allowed; bool tx_vec_allowed; struct virtchnl2_vport_stats eth_stats_offset; -- 2.34.1