From: Ciara Loftus <ciara.loftus@intel.com>
To: dev@dpdk.org
Cc: Ciara Loftus <ciara.loftus@intel.com>
Subject: [PATCH 4/4] net/cpfl: use the common Rx path selection infrastructure
Date: Thu, 11 Sep 2025 14:31:45 +0000 [thread overview]
Message-ID: <20250911143145.3355960-5-ciara.loftus@intel.com> (raw)
In-Reply-To: <20250911143145.3355960-1-ciara.loftus@intel.com>
Replace the existing complicated logic with the use of the common
function.
Signed-off-by: Ciara Loftus <ciara.loftus@intel.com>
---
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
prev parent reply other threads:[~2025-09-11 14:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-11 14:31 [PATCH 0/4] idpf and cpfl rx path selection simplification Ciara Loftus
2025-09-11 14:31 ` [PATCH 1/4] net/idpf: use the new common vector capability function Ciara Loftus
2025-09-11 14:35 ` Bruce Richardson
2025-09-11 14:31 ` [PATCH 2/4] net/idpf: use the common Rx path selection infrastructure Ciara Loftus
2025-09-11 16:21 ` Bruce Richardson
2025-09-11 14:31 ` [PATCH 3/4] net/cpfl: use the new common vector capability function Ciara Loftus
2025-09-11 14:31 ` Ciara Loftus [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250911143145.3355960-5-ciara.loftus@intel.com \
--to=ciara.loftus@intel.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).