<!DOCTYPE html><html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> </head> <body> <div class="moz-cite-prefix">On 30-06-2026 20:13, Maxime Leroy wrote: </div> <blockquote type="cite" cite="mid:20260630144329.457643-6-maxime@leroys.fr"> <pre wrap="" class="moz-quote-pre">diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index a68404ee5e..36f8669644 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -5,6 +5,8 @@ #include <time.h> #include <net/if.h> +#include <unistd.h> +#include <errno.h> #include <eal_export.h> #include <rte_mbuf.h> @@ -25,6 +27,7 @@ #include <dpaa2_hw_mempool.h> #include <dpaa2_hw_dpio.h> #include <mc/fsl_dpmng.h> +#include <mc/fsl_dpcon.h> #include "dpaa2_ethdev.h" #include "dpaa2_sparser.h" #include <fsl_qbman_debug.h> @@ -658,6 +661,8 @@ dpaa2_clear_queue_active_dps(struct dpaa2_queue *q, int num_lcores) } } +static void dpaa2_dev_rx_queue_intr_unbind(struct dpaa2_queue *dpaa2_q); + static void dpaa2_free_rx_tx_queues(struct rte_eth_dev *dev) { @@ -675,6 +680,12 @@ dpaa2_free_rx_tx_queues(struct rte_eth_dev *dev) /* cleaning up queue storage */ for (i = 0; i < priv->nb_rx_queues; i++) { dpaa2_q = priv->rx_vq[i]; + if (dpaa2_q->napi_dpcon) { /* release the rx-intr channel */ + dpaa2_dev_rx_queue_intr_unbind(dpaa2_q); + rte_dpaa2_free_dpcon_dev(dpaa2_q->napi_dpcon); + dpaa2_q->napi_dpcon = NULL; + dpaa2_q->napi_sub_dpio = NULL; + } dpaa2_clear_queue_active_dps(dpaa2_q, RTE_MAX_LCORE); dpaa2_queue_storage_free(dpaa2_q, @@ -880,6 +891,26 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev) } } + if (dev->data->dev_conf.intr_conf.rxq) { + if (!dev->intr_handle) + dev->intr_handle = rte_intr_instance_alloc(RTE_INTR_INSTANCE_F_PRIVATE); + if (!dev->intr_handle || + rte_intr_vec_list_alloc(dev->intr_handle, "rxq_intr", + dev->data->nb_rx_queues) || + rte_intr_nb_efd_set(dev->intr_handle, dev->data->nb_rx_queues) || + rte_intr_type_set(dev->intr_handle, RTE_INTR_HANDLE_EXT)) { + DPAA2_PMD_ERR("Failed to set up rx-queue interrupts"); + /* capture the error before cleanup may clobber rte_errno */ + ret = rte_errno ? -rte_errno : -EIO; + if (dev->intr_handle) { + rte_intr_vec_list_free(dev->intr_handle); + rte_intr_instance_free(dev->intr_handle); + dev->intr_handle = NULL; + } + return ret; + } + } +</pre> </blockquote> If <code style="background-color: var(--mui-palette-action-selected); color: var(--mui-palette-success-dark); padding: 2px 4px; border-radius: 3px; font-family: Monaco, Menlo, "Ubuntu Mono", Consolas, monospace;">dev_configure()</code> is called a second time (e.g. after changing <code style="background-color: var(--mui-palette-action-selected); color: var(--mui-palette-success-dark); padding: 2px 4px; border-radius: 3px; font-family: Monaco, Menlo, "Ubuntu Mono", Consolas, monospace;">nb_rx_queues</code>), <code style="background-color: var(--mui-palette-action-selected); color: var(--mui-palette-success-dark); padding: 2px 4px; border-radius: 3px; font-family: Monaco, Menlo, "Ubuntu Mono", Consolas, monospace;">dev->intr_handle</code> is already non-NULL. The code skips <code style="background-color: var(--mui-palette-action-selected); color: var(--mui-palette-success-dark); padding: 2px 4px; border-radius: 3px; font-family: Monaco, Menlo, "Ubuntu Mono", Consolas, monospace;">rte_intr_instance_alloc()</code> but calls <code style="background-color: var(--mui-palette-action-selected); color: var(--mui-palette-success-dark); padding: 2px 4px; border-radius: 3px; font-family: Monaco, Menlo, "Ubuntu Mono", Consolas, monospace;">rte_intr_vec_list_alloc()</code> on the existing handle without first freeing the old vector list. This leaks the previously allocated vector list and may also cause a size mismatch if <code style="background-color: var(--mui-palette-action-selected); color: var(--mui-palette-success-dark); padding: 2px 4px; border-radius: 3px; font-family: Monaco, Menlo, "Ubuntu Mono", Consolas, monospace;">nb_rx_queues</code> changed between calls. Should not we free the old vector list before reallocating: if (dev->intr_handle) rte_intr_vec_list_free(dev->intr_handle); else dev->intr_handle = rte_intr_instance_alloc(RTE_INTR_INSTANCE_F_PRIVATE); /* then always call rte_intr_vec_list_alloc() */ <blockquote type="cite" cite="mid:20260630144329.457643-6-maxime@leroys.fr"> <pre wrap="" class="moz-quote-pre"> dpaa2_tm_init(dev); return 0; @@ -898,6 +929,7 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev, { struct dpaa2_dev_priv *priv = dev->data->dev_private; struct fsl_mc_io *dpni = dev->process_private; + bool dpcon_allocated = false; struct dpaa2_queue *dpaa2_q; struct dpni_queue cfg; uint8_t options = 0; @@ -938,6 +970,25 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev, dpaa2_q->bp_array = rte_dpaa2_bpid_info; dpaa2_q->offloads = rx_conf->offloads; + /* NAPI: grab a DPCON channel for dev_start to bind this FQ statically */ + dpaa2_q->napi_sub_dpio = NULL;</pre> </blockquote> <blockquote type="cite" cite="mid:20260630144329.457643-6-maxime@leroys.fr"> <code style="background-color: var(--mui-palette-action-selected); color: var(--mui-palette-success-dark); padding: 2px 4px; border-radius: 3px; font-family: Monaco, Menlo, "Ubuntu Mono", Consolas, monospace;">dpaa2_q->napi_sub_dpio</code> is declared as <code style="background-color: var(--mui-palette-action-selected); color: var(--mui-palette-success-dark); padding: 2px 4px; border-radius: 3px; font-family: Monaco, Menlo, "Ubuntu Mono", Consolas, monospace;">RTE_ATOMIC(struct dpaa2_dpio_dev *)</code> in <code style="background-color: var(--mui-palette-action-selected); color: var(--mui-palette-success-dark); padding: 2px 4px; border-radius: 3px; font-family: Monaco, Menlo, "Ubuntu Mono", Consolas, monospace;">dpaa2_hw_pvt.h</code>, but here it is assigned with a plain <code style="background-color: var(--mui-palette-action-selected); color: var(--mui-palette-success-dark); padding: 2px 4px; border-radius: 3px; font-family: Monaco, Menlo, "Ubuntu Mono", Consolas, monospace;">= NULL</code> instead of <code style="background-color: var(--mui-palette-action-selected); color: var(--mui-palette-success-dark); padding: 2px 4px; border-radius: 3px; font-family: Monaco, Menlo, "Ubuntu Mono", Consolas, monospace;">rte_atomic_store_explicit(...)</code>. This is inconsistent with the atomic stores used elsewhere (e.g. in <code style="background-color: var(--mui-palette-action-selected); color: var(--mui-palette-success-dark); padding: 2px 4px; border-radius: 3px; font-family: Monaco, Menlo, "Ubuntu Mono", Consolas, monospace;">dpaa2_dev_rx_queue_intr_unbind</code>) and may cause memory-ordering issues on weakly-ordered architectures (ARM/aarch64). Please use: rte_atomic_store_explicit(&dpaa2_q->napi_sub_dpio, NULL, rte_memory_order_release); <pre wrap="" class="moz-quote-pre"> </pre> </blockquote> <blockquote type="cite" cite="mid:20260630144329.457643-6-maxime@leroys.fr"> <pre wrap="" class="moz-quote-pre"> </pre> </blockquote> </body> </html>