diff options
author | Wei Liu <wei.liu2@citrix.com> | 2013-05-16 19:26:11 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-05-17 21:23:07 -0400 |
commit | b103f358d9f6f58658f1a6dc08912ab921dd86f1 (patch) | |
tree | 5f35cbec030e789a1261676f579cb1b57b236021 /drivers/net/xen-netback/interface.c | |
parent | f1db320ec5788d5fcc05c0285bd0980319185497 (diff) |
xen-netback: enable user to unload netback module
This patch enables user to unload netback module, which is useful when user
wants to upgrade to a newer netback module without rebooting the host.
Netfront cannot handle netback removal event. As we cannot fix all possible
frontends we add module get / put along with vif get / put to avoid
mis-unloading of netback. To unload netback module, user needs to shutdown all
VMs or migrate them to another host or unplug all vifs before hand.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>¬
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/xen-netback/interface.c')
-rw-r--r-- | drivers/net/xen-netback/interface.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c index d98414168485..82202c2b1bd1 100644 --- a/drivers/net/xen-netback/interface.c +++ b/drivers/net/xen-netback/interface.c | |||
@@ -316,6 +316,8 @@ int xenvif_connect(struct xenvif *vif, unsigned long tx_ring_ref, | |||
316 | if (vif->irq) | 316 | if (vif->irq) |
317 | return 0; | 317 | return 0; |
318 | 318 | ||
319 | __module_get(THIS_MODULE); | ||
320 | |||
319 | err = xen_netbk_map_frontend_rings(vif, tx_ring_ref, rx_ring_ref); | 321 | err = xen_netbk_map_frontend_rings(vif, tx_ring_ref, rx_ring_ref); |
320 | if (err < 0) | 322 | if (err < 0) |
321 | goto err; | 323 | goto err; |
@@ -343,6 +345,7 @@ int xenvif_connect(struct xenvif *vif, unsigned long tx_ring_ref, | |||
343 | err_unmap: | 345 | err_unmap: |
344 | xen_netbk_unmap_frontend_rings(vif); | 346 | xen_netbk_unmap_frontend_rings(vif); |
345 | err: | 347 | err: |
348 | module_put(THIS_MODULE); | ||
346 | return err; | 349 | return err; |
347 | } | 350 | } |
348 | 351 | ||
@@ -360,18 +363,32 @@ void xenvif_carrier_off(struct xenvif *vif) | |||
360 | 363 | ||
361 | void xenvif_disconnect(struct xenvif *vif) | 364 | void xenvif_disconnect(struct xenvif *vif) |
362 | { | 365 | { |
366 | /* Disconnect funtion might get called by generic framework | ||
367 | * even before vif connects, so we need to check if we really | ||
368 | * need to do a module_put. | ||
369 | */ | ||
370 | int need_module_put = 0; | ||
371 | |||
363 | if (netif_carrier_ok(vif->dev)) | 372 | if (netif_carrier_ok(vif->dev)) |
364 | xenvif_carrier_off(vif); | 373 | xenvif_carrier_off(vif); |
365 | 374 | ||
366 | atomic_dec(&vif->refcnt); | 375 | atomic_dec(&vif->refcnt); |
367 | wait_event(vif->waiting_to_free, atomic_read(&vif->refcnt) == 0); | 376 | wait_event(vif->waiting_to_free, atomic_read(&vif->refcnt) == 0); |
368 | 377 | ||
369 | if (vif->irq) | 378 | if (vif->irq) { |
370 | unbind_from_irqhandler(vif->irq, vif); | 379 | unbind_from_irqhandler(vif->irq, vif); |
380 | /* vif->irq is valid, we had a module_get in | ||
381 | * xenvif_connect. | ||
382 | */ | ||
383 | need_module_put = 1; | ||
384 | } | ||
371 | 385 | ||
372 | unregister_netdev(vif->dev); | 386 | unregister_netdev(vif->dev); |
373 | 387 | ||
374 | xen_netbk_unmap_frontend_rings(vif); | 388 | xen_netbk_unmap_frontend_rings(vif); |
375 | 389 | ||
376 | free_netdev(vif->dev); | 390 | free_netdev(vif->dev); |
391 | |||
392 | if (need_module_put) | ||
393 | module_put(THIS_MODULE); | ||
377 | } | 394 | } |