Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

xen-netback: Check for hotplug-status existence before watching

The logic in connect() is currently written with the assumption that
xenbus_watch_pathfmt() will return an error for a node that does not
exist. This assumption is incorrect: xenstore does allow a watch to
be registered for a nonexistent node (and will send notifications
should the node be subsequently created).

As of commit 1f2565780 ("xen-netback: remove 'hotplug-status' once it
has served its purpose"), this leads to a failure when a domU
transitions into XenbusStateConnected more than once. On the first
domU transition into Connected state, the "hotplug-status" node will
be deleted by the hotplug_status_changed() callback in dom0. On the
second or subsequent domU transition into Connected state, the
hotplug_status_changed() callback will therefore never be invoked, and
so the backend will remain stuck in InitWait.

This failure prevents scenarios such as reloading the xen-netfront
module within a domU, or booting a domU via iPXE. There is
unfortunately no way for the domU to work around this dom0 bug.

Fix by explicitly checking for existence of the "hotplug-status" node,
thereby creating the behaviour that was previously assumed to exist.

Signed-off-by: Michael Brown <mbrown@fensystems.co.uk>
Reviewed-by: Paul Durrant <paul@xen.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Michael Brown and committed by
David S. Miller
2afeec08 38ec4944

+8 -4
+8 -4
drivers/net/xen-netback/xenbus.c
··· 824 824 xenvif_carrier_on(be->vif); 825 825 826 826 unregister_hotplug_status_watch(be); 827 - err = xenbus_watch_pathfmt(dev, &be->hotplug_status_watch, NULL, 828 - hotplug_status_changed, 829 - "%s/%s", dev->nodename, "hotplug-status"); 830 - if (!err) 827 + if (xenbus_exists(XBT_NIL, dev->nodename, "hotplug-status")) { 828 + err = xenbus_watch_pathfmt(dev, &be->hotplug_status_watch, 829 + NULL, hotplug_status_changed, 830 + "%s/%s", dev->nodename, 831 + "hotplug-status"); 832 + if (err) 833 + goto err; 831 834 be->have_hotplug_status_watch = 1; 835 + } 832 836 833 837 netif_tx_wake_all_queues(be->vif->dev); 834 838