Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc62ccac authored by David Vrabel's avatar David Vrabel Committed by David S. Miller
Browse files

xen-netback: transition to CLOSED when removing a VIF 



If a guest is destroyed without transitioning its frontend to CLOSED,
the domain becomes a zombie as netback was not grant unmapping the
shared rings.

When removing a VIF, transition the backend to CLOSED so the VIF is
disconnected if necessary (which will unmap the shared rings etc).

This fixes a regression introduced by
279f438e (xen-netback: Don't destroy
the netdev until the vif is shut down).

Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Cc: Paul Durrant <Paul.Durrant@citrix.com>
Acked-by: default avatarWei Liu <wei.liu2@citrix.com>
Reviewed-by: default avatarPaul Durrant <paul.durrant@citrix.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3c01352d

drivers/net/xen-netback/xenbus.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -39,11 +39,15 @@ static int connect_rings(struct backend_info *); 
static void connect(struct backend_info *);

static void connect(struct backend_info *);

static void backend_create_xenvif(struct backend_info *be);

static void backend_create_xenvif(struct backend_info *be);

static void unregister_hotplug_status_watch(struct backend_info *be);

static void unregister_hotplug_status_watch(struct backend_info *be);

static void set_backend_state(struct backend_info *be,

			      enum xenbus_state state);





static int netback_remove(struct xenbus_device *dev)

static int netback_remove(struct xenbus_device *dev)

{

{

	struct backend_info *be = dev_get_drvdata(&dev->dev);

	struct backend_info *be = dev_get_drvdata(&dev->dev);





	set_backend_state(be, XenbusStateClosed);



	unregister_hotplug_status_watch(be);

	unregister_hotplug_status_watch(be);

	if (be->vif) {

	if (be->vif) {

		kobject_uevent(&dev->dev.kobj, KOBJ_OFFLINE);

		kobject_uevent(&dev->dev.kobj, KOBJ_OFFLINE);