Skip to content

Commit ea937f7

Browse files
kuba-moodavem330
authored andcommitted
net: netdevsim: don't try to destroy PHC on VFs
PHC gets initialized in nsim_init_netdevsim(), which is only called if (nsim_dev_port_is_pf()). Create a counterpart of nsim_init_netdevsim() and move the mock_phc_destroy() there. This fixes a crash trying to destroy netdevsim with VFs instantiated, as caught by running the devlink.sh test: BUG: kernel NULL pointer dereference, address: 00000000000000b8 RIP: 0010:mock_phc_destroy+0xd/0x30 Call Trace: <TASK> nsim_destroy+0x4a/0x70 [netdevsim] __nsim_dev_port_del+0x47/0x70 [netdevsim] nsim_dev_reload_destroy+0x105/0x120 [netdevsim] nsim_drv_remove+0x2f/0xb0 [netdevsim] device_release_driver_internal+0x1a1/0x210 bus_remove_device+0xd5/0x120 device_del+0x159/0x490 device_unregister+0x12/0x30 del_device_store+0x11a/0x1a0 [netdevsim] kernfs_fop_write_iter+0x130/0x1d0 vfs_write+0x30b/0x4b0 ksys_write+0x69/0xf0 do_syscall_64+0xcc/0x1e0 entry_SYSCALL_64_after_hwframe+0x6f/0x77 Fixes: b63e78f ("net: netdevsim: use mock PHC driver") Signed-off-by: Jakub Kicinski <[email protected]> Reviewed-by: Simon Horman <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent c0f5aec commit ea937f7

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

drivers/net/netdevsim/netdev.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,12 @@ static int nsim_init_netdevsim_vf(struct netdevsim *ns)
369369
return err;
370370
}
371371

372+
static void nsim_exit_netdevsim(struct netdevsim *ns)
373+
{
374+
nsim_udp_tunnels_info_destroy(ns->netdev);
375+
mock_phc_destroy(ns->phc);
376+
}
377+
372378
struct netdevsim *
373379
nsim_create(struct nsim_dev *nsim_dev, struct nsim_dev_port *nsim_dev_port)
374380
{
@@ -417,8 +423,7 @@ void nsim_destroy(struct netdevsim *ns)
417423
}
418424
rtnl_unlock();
419425
if (nsim_dev_port_is_pf(ns->nsim_dev_port))
420-
nsim_udp_tunnels_info_destroy(dev);
421-
mock_phc_destroy(ns->phc);
426+
nsim_exit_netdevsim(ns);
422427
free_netdev(dev);
423428
}
424429

0 commit comments

Comments
 (0)