* [PATCH net-next] net: Rename ifq_idx to rxq_idx in netif_mp_* helpers
@ 2026-04-10 13:06 Daniel Borkmann
2026-04-10 14:17 ` Nikolay Aleksandrov
0 siblings, 1 reply; 2+ messages in thread
From: Daniel Borkmann @ 2026-04-10 13:06 UTC (permalink / raw)
To: netdev; +Cc: kuba, dw, pabeni, razor
Rename the leftover ifq_idx parameter naming to rxq_idx to be
consistent with the rest of the file and the header declaration.
Back then this was taken out of the queue leasing series given
the cleanup is independent. No functional change.
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/netdev/20260131160237.07789674@kernel.org
---
net/core/netdev_rx_queue.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/net/core/netdev_rx_queue.c b/net/core/netdev_rx_queue.c
index 8771e06a0afe..de4dac4c88b3 100644
--- a/net/core/netdev_rx_queue.c
+++ b/net/core/netdev_rx_queue.c
@@ -275,14 +275,14 @@ int netif_mp_open_rxq(struct net_device *dev, unsigned int rxq_idx,
return ret;
}
-static void __netif_mp_close_rxq(struct net_device *dev, unsigned int ifq_idx,
+static void __netif_mp_close_rxq(struct net_device *dev, unsigned int rxq_idx,
const struct pp_memory_provider_params *old_p)
{
struct netdev_queue_config qcfg[2];
struct netdev_rx_queue *rxq;
int err;
- rxq = __netif_get_rx_queue(dev, ifq_idx);
+ rxq = __netif_get_rx_queue(dev, rxq_idx);
/* Callers holding a netdev ref may get here after we already
* went thru shutdown via dev_memory_provider_uninstall().
@@ -295,28 +295,28 @@ static void __netif_mp_close_rxq(struct net_device *dev, unsigned int ifq_idx,
rxq->mp_params.mp_priv != old_p->mp_priv))
return;
- netdev_queue_config(dev, ifq_idx, &qcfg[0]);
+ netdev_queue_config(dev, rxq_idx, &qcfg[0]);
memset(&rxq->mp_params, 0, sizeof(rxq->mp_params));
- netdev_queue_config(dev, ifq_idx, &qcfg[1]);
+ netdev_queue_config(dev, rxq_idx, &qcfg[1]);
- err = netdev_rx_queue_reconfig(dev, ifq_idx, &qcfg[0], &qcfg[1]);
+ err = netdev_rx_queue_reconfig(dev, rxq_idx, &qcfg[0], &qcfg[1]);
WARN_ON(err && err != -ENETDOWN);
}
-void netif_mp_close_rxq(struct net_device *dev, unsigned int ifq_idx,
+void netif_mp_close_rxq(struct net_device *dev, unsigned int rxq_idx,
const struct pp_memory_provider_params *old_p)
{
- if (WARN_ON_ONCE(ifq_idx >= dev->real_num_rx_queues))
+ if (WARN_ON_ONCE(rxq_idx >= dev->real_num_rx_queues))
return;
- if (!netif_rxq_is_leased(dev, ifq_idx))
- return __netif_mp_close_rxq(dev, ifq_idx, old_p);
+ if (!netif_rxq_is_leased(dev, rxq_idx))
+ return __netif_mp_close_rxq(dev, rxq_idx, old_p);
- if (!__netif_get_rx_queue_lease(&dev, &ifq_idx, NETIF_VIRT_TO_PHYS)) {
+ if (!__netif_get_rx_queue_lease(&dev, &rxq_idx, NETIF_VIRT_TO_PHYS)) {
WARN_ON_ONCE(1);
return;
}
netdev_lock(dev);
- __netif_mp_close_rxq(dev, ifq_idx, old_p);
+ __netif_mp_close_rxq(dev, rxq_idx, old_p);
netdev_unlock(dev);
}
@@ -339,11 +339,11 @@ void netif_rxq_cleanup_unlease(struct netdev_rx_queue *phys_rxq,
struct netdev_rx_queue *virt_rxq)
{
struct pp_memory_provider_params *p = &phys_rxq->mp_params;
- unsigned int ifq_idx = get_netdev_rx_queue_index(phys_rxq);
+ unsigned int rxq_idx = get_netdev_rx_queue_index(phys_rxq);
if (!p->mp_ops)
return;
__netif_mp_uninstall_rxq(virt_rxq, p);
- __netif_mp_close_rxq(phys_rxq->dev, ifq_idx, p);
+ __netif_mp_close_rxq(phys_rxq->dev, rxq_idx, p);
}
--
2.43.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] net: Rename ifq_idx to rxq_idx in netif_mp_* helpers
2026-04-10 13:06 [PATCH net-next] net: Rename ifq_idx to rxq_idx in netif_mp_* helpers Daniel Borkmann
@ 2026-04-10 14:17 ` Nikolay Aleksandrov
0 siblings, 0 replies; 2+ messages in thread
From: Nikolay Aleksandrov @ 2026-04-10 14:17 UTC (permalink / raw)
To: Daniel Borkmann; +Cc: netdev, kuba, dw, pabeni
On Fri, Apr 10, 2026 at 03:06:02PM +0200, Daniel Borkmann wrote:
> Rename the leftover ifq_idx parameter naming to rxq_idx to be
> consistent with the rest of the file and the header declaration.
> Back then this was taken out of the queue leasing series given
> the cleanup is independent. No functional change.
>
> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
> Link: https://lore.kernel.org/netdev/20260131160237.07789674@kernel.org
> ---
> net/core/netdev_rx_queue.c | 26 +++++++++++++-------------
> 1 file changed, 13 insertions(+), 13 deletions(-)
>
Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org>
> diff --git a/net/core/netdev_rx_queue.c b/net/core/netdev_rx_queue.c
> index 8771e06a0afe..de4dac4c88b3 100644
> --- a/net/core/netdev_rx_queue.c
> +++ b/net/core/netdev_rx_queue.c
> @@ -275,14 +275,14 @@ int netif_mp_open_rxq(struct net_device *dev, unsigned int rxq_idx,
> return ret;
> }
>
> -static void __netif_mp_close_rxq(struct net_device *dev, unsigned int ifq_idx,
> +static void __netif_mp_close_rxq(struct net_device *dev, unsigned int rxq_idx,
> const struct pp_memory_provider_params *old_p)
> {
> struct netdev_queue_config qcfg[2];
> struct netdev_rx_queue *rxq;
> int err;
>
> - rxq = __netif_get_rx_queue(dev, ifq_idx);
> + rxq = __netif_get_rx_queue(dev, rxq_idx);
>
> /* Callers holding a netdev ref may get here after we already
> * went thru shutdown via dev_memory_provider_uninstall().
> @@ -295,28 +295,28 @@ static void __netif_mp_close_rxq(struct net_device *dev, unsigned int ifq_idx,
> rxq->mp_params.mp_priv != old_p->mp_priv))
> return;
>
> - netdev_queue_config(dev, ifq_idx, &qcfg[0]);
> + netdev_queue_config(dev, rxq_idx, &qcfg[0]);
> memset(&rxq->mp_params, 0, sizeof(rxq->mp_params));
> - netdev_queue_config(dev, ifq_idx, &qcfg[1]);
> + netdev_queue_config(dev, rxq_idx, &qcfg[1]);
>
> - err = netdev_rx_queue_reconfig(dev, ifq_idx, &qcfg[0], &qcfg[1]);
> + err = netdev_rx_queue_reconfig(dev, rxq_idx, &qcfg[0], &qcfg[1]);
> WARN_ON(err && err != -ENETDOWN);
> }
>
> -void netif_mp_close_rxq(struct net_device *dev, unsigned int ifq_idx,
> +void netif_mp_close_rxq(struct net_device *dev, unsigned int rxq_idx,
> const struct pp_memory_provider_params *old_p)
> {
> - if (WARN_ON_ONCE(ifq_idx >= dev->real_num_rx_queues))
> + if (WARN_ON_ONCE(rxq_idx >= dev->real_num_rx_queues))
> return;
> - if (!netif_rxq_is_leased(dev, ifq_idx))
> - return __netif_mp_close_rxq(dev, ifq_idx, old_p);
> + if (!netif_rxq_is_leased(dev, rxq_idx))
> + return __netif_mp_close_rxq(dev, rxq_idx, old_p);
>
> - if (!__netif_get_rx_queue_lease(&dev, &ifq_idx, NETIF_VIRT_TO_PHYS)) {
> + if (!__netif_get_rx_queue_lease(&dev, &rxq_idx, NETIF_VIRT_TO_PHYS)) {
> WARN_ON_ONCE(1);
> return;
> }
> netdev_lock(dev);
> - __netif_mp_close_rxq(dev, ifq_idx, old_p);
> + __netif_mp_close_rxq(dev, rxq_idx, old_p);
> netdev_unlock(dev);
> }
>
> @@ -339,11 +339,11 @@ void netif_rxq_cleanup_unlease(struct netdev_rx_queue *phys_rxq,
> struct netdev_rx_queue *virt_rxq)
> {
> struct pp_memory_provider_params *p = &phys_rxq->mp_params;
> - unsigned int ifq_idx = get_netdev_rx_queue_index(phys_rxq);
> + unsigned int rxq_idx = get_netdev_rx_queue_index(phys_rxq);
>
> if (!p->mp_ops)
> return;
>
> __netif_mp_uninstall_rxq(virt_rxq, p);
> - __netif_mp_close_rxq(phys_rxq->dev, ifq_idx, p);
> + __netif_mp_close_rxq(phys_rxq->dev, rxq_idx, p);
> }
> --
> 2.43.0
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-04-10 14:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-04-10 13:06 [PATCH net-next] net: Rename ifq_idx to rxq_idx in netif_mp_* helpers Daniel Borkmann
2026-04-10 14:17 ` Nikolay Aleksandrov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox