[PATCH] xen-blkback: Don't disconnect backend until state switchedto XenbusStateClosed.

[Joe Jin]

When do block-attach/block-detach test with below steps, umount hang
in guest. Also shutdown ends up being stuck when umounting filesystems.

1. start guest.
2. attach new block device by xm block-attach in Dom0.
3. mount new disk in guest.
4. execute xm block-detach to detach the block device in dom0 until timeout
5. Any request to the disk will hung.

Root cause:
  This issue caused by when setting backend device's state to
  'XenbusStateClosing', which will send frontend XenbusStateClosing 
  notification. When frontend receives the notification it tries to release
  the disk by blkfront_closing(), but at that moment, the disk is still in use
  by guest, so frontend refuses to close. 
  In blkfront_closing(), it sets the disk state to XenbusStateClosing and send
  a state switch to Closing notification to backend, when backend received the
  event, it disconnect the vbd from real device, set the vbd device state to
  XenbusStateClosing. For backend disconnected from real device/file, any IO
  requests to the disk in guest will end up, leaving disk DEAD disk and set to
  "XenbusStateClosing". For the disk have been disconnected, umount will hang
  on blkif_release()->xlvbd_release_gendisk() for unable send any IO to the
  disk, this prevent system clean shutdown.

Solution:
  Don't disconnect backend until frontend state switch to XenbusStateClosed.

Signed-off-by: Joe Jin <joe.jin@xxxxxxxxxx>
Cc: Daniel Stodden <daniel.stodden@xxxxxxxxxx>
Cc: Jens Axboe <jaxboe@xxxxxxxxxxxx>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
Cc: Annie Li <annie.li@xxxxxxxxxx>
Cc: Ian Campbell <Ian.Campbell@xxxxxxxxxxxxx>
---
 drivers/block/xen-blkback/xenbus.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
index 3f129b4..1a87f5b 100644
--- a/drivers/block/xen-blkback/xenbus.c
+++ b/drivers/block/xen-blkback/xenbus.c
@@ -601,11 +601,11 @@ static void frontend_changed(struct xenbus_device *dev,
 		break;
 
 	case XenbusStateClosing:
-		xen_blkif_disconnect(be->blkif);
 		xenbus_switch_state(dev, XenbusStateClosing);
 		break;
 
 	case XenbusStateClosed:
+		xen_blkif_disconnect(be->blkif);
 		xenbus_switch_state(dev, XenbusStateClosed);
 		if (xenbus_dev_is_online(dev))
 			break;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/