| Message ID | 20250206225638.1387810-5-kuba@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 285b3f78eabd951e59e98f01f86abaaa6c76cd44 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: improve core queue API handling while device is down | expand |
On Thu, Feb 6, 2025 at 2:56 PM Jakub Kicinski <kuba@kernel.org> wrote: > > Resetting queues while the device is down should be legal. > Allow it, test it. Ideally we'd test this with a real device > supporting devmem but I don't have access to such devices. > > Signed-off-by: Jakub Kicinski <kuba@kernel.org> > --- > drivers/net/netdevsim/netdev.c | 10 ++++------ > tools/testing/selftests/net/nl_netdev.py | 18 +++++++++++++++++- > 2 files changed, 21 insertions(+), 7 deletions(-) > > diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c > index 42f247cbdcee..9b394ddc5206 100644 > --- a/drivers/net/netdevsim/netdev.c > +++ b/drivers/net/netdevsim/netdev.c > @@ -645,8 +645,11 @@ nsim_queue_mem_alloc(struct net_device *dev, void *per_queue_mem, int idx) > if (ns->rq_reset_mode > 3) > return -EINVAL; > > - if (ns->rq_reset_mode == 1) > + if (ns->rq_reset_mode == 1) { > + if (!netif_running(ns->netdev)) > + return -ENETDOWN; To be honest I could not track down for myself why mode 1 needed to be excluded as well. AFAICT it should be a similar story to modes 2/3, i.e. we never initialize the napi on nsim_queue_mem_alloc() for all of modes [1, 2, 3] and this particular warning you fixed in patch 3 should again not fire for mode 1 just like they stopped firing for 2 & 3. But, I'm not sure it's critical to expand the coverage further to mode 1, so FWIW Reviewed-by: Mina Almasry <almasrymina@google.com>
diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c index 42f247cbdcee..9b394ddc5206 100644 --- a/drivers/net/netdevsim/netdev.c +++ b/drivers/net/netdevsim/netdev.c @@ -645,8 +645,11 @@ nsim_queue_mem_alloc(struct net_device *dev, void *per_queue_mem, int idx) if (ns->rq_reset_mode > 3) return -EINVAL; - if (ns->rq_reset_mode == 1) + if (ns->rq_reset_mode == 1) { + if (!netif_running(ns->netdev)) + return -ENETDOWN; return nsim_create_page_pool(&qmem->pp, &ns->rq[idx]->napi); + } qmem->rq = nsim_queue_alloc(); if (!qmem->rq) @@ -754,11 +757,6 @@ nsim_qreset_write(struct file *file, const char __user *data, return -EINVAL; rtnl_lock(); - if (!netif_running(ns->netdev)) { - ret = -ENETDOWN; - goto exit_unlock; - } - if (queue >= ns->netdev->real_num_rx_queues) { ret = -EINVAL; goto exit_unlock; diff --git a/tools/testing/selftests/net/nl_netdev.py b/tools/testing/selftests/net/nl_netdev.py index 93e8cb671c3d..beaee5e4e2aa 100755 --- a/tools/testing/selftests/net/nl_netdev.py +++ b/tools/testing/selftests/net/nl_netdev.py @@ -35,6 +35,21 @@ from lib.py import NetdevFamily, NetdevSimDev, ip comment=f"queue count after reset queue {q} mode {i}") +def nsim_rxq_reset_down(nf) -> None: + """ + Test that the queue API supports resetting a queue + while the interface is down. We should convert this + test to testing real HW once more devices support + queue API. + """ + with NetdevSimDev(queue_count=4) as nsimdev: + nsim = nsimdev.nsims[0] + + ip(f"link set dev {nsim.ifname} down") + for i in [0, 2, 3]: + nsim.dfs_write("queue_reset", f"1 {i}") + + def page_pool_check(nf) -> None: with NetdevSimDev() as nsimdev: nsim = nsimdev.nsims[0] @@ -106,7 +121,8 @@ from lib.py import NetdevFamily, NetdevSimDev, ip def main() -> None: nf = NetdevFamily() - ksft_run([empty_check, lo_check, page_pool_check, napi_list_check], + ksft_run([empty_check, lo_check, page_pool_check, napi_list_check, + nsim_rxq_reset_down], args=(nf, )) ksft_exit()
Resetting queues while the device is down should be legal. Allow it, test it. Ideally we'd test this with a real device supporting devmem but I don't have access to such devices. Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- drivers/net/netdevsim/netdev.c | 10 ++++------ tools/testing/selftests/net/nl_netdev.py | 18 +++++++++++++++++- 2 files changed, 21 insertions(+), 7 deletions(-)