Skip to content

Commit 285b3f7

Browse files
committed
netdevsim: allow normal queue reset while down
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. Reviewed-by: Mina Almasry <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent c1e00bc commit 285b3f7

File tree

2 files changed

+21
-7
lines changed

2 files changed

+21
-7
lines changed

drivers/net/netdevsim/netdev.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -645,8 +645,11 @@ nsim_queue_mem_alloc(struct net_device *dev, void *per_queue_mem, int idx)
645645
if (ns->rq_reset_mode > 3)
646646
return -EINVAL;
647647

648-
if (ns->rq_reset_mode == 1)
648+
if (ns->rq_reset_mode == 1) {
649+
if (!netif_running(ns->netdev))
650+
return -ENETDOWN;
649651
return nsim_create_page_pool(&qmem->pp, &ns->rq[idx]->napi);
652+
}
650653

651654
qmem->rq = nsim_queue_alloc();
652655
if (!qmem->rq)
@@ -754,11 +757,6 @@ nsim_qreset_write(struct file *file, const char __user *data,
754757
return -EINVAL;
755758

756759
rtnl_lock();
757-
if (!netif_running(ns->netdev)) {
758-
ret = -ENETDOWN;
759-
goto exit_unlock;
760-
}
761-
762760
if (queue >= ns->netdev->real_num_rx_queues) {
763761
ret = -EINVAL;
764762
goto exit_unlock;

tools/testing/selftests/net/nl_netdev.py

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,21 @@ def napi_list_check(nf) -> None:
3535
comment=f"queue count after reset queue {q} mode {i}")
3636

3737

38+
def nsim_rxq_reset_down(nf) -> None:
39+
"""
40+
Test that the queue API supports resetting a queue
41+
while the interface is down. We should convert this
42+
test to testing real HW once more devices support
43+
queue API.
44+
"""
45+
with NetdevSimDev(queue_count=4) as nsimdev:
46+
nsim = nsimdev.nsims[0]
47+
48+
ip(f"link set dev {nsim.ifname} down")
49+
for i in [0, 2, 3]:
50+
nsim.dfs_write("queue_reset", f"1 {i}")
51+
52+
3853
def page_pool_check(nf) -> None:
3954
with NetdevSimDev() as nsimdev:
4055
nsim = nsimdev.nsims[0]
@@ -106,7 +121,8 @@ def get_pp():
106121

107122
def main() -> None:
108123
nf = NetdevFamily()
109-
ksft_run([empty_check, lo_check, page_pool_check, napi_list_check],
124+
ksft_run([empty_check, lo_check, page_pool_check, napi_list_check,
125+
nsim_rxq_reset_down],
110126
args=(nf, ))
111127
ksft_exit()
112128

0 commit comments

Comments
 (0)