Commit e8240add authored by Marek Marczykowski-Górecki's avatar Marek Marczykowski-Górecki Committed by Jakub Kicinski

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

This reverts commit 2afeec08.

The reasoning in the commit was wrong - the code expected to setup the
watch even if 'hotplug-status' didn't exist. In fact, it relied on the
watch being fired the first time - to check if maybe 'hotplug-status' is
already set to 'connected'. Not registering a watch for non-existing
path (which is the case if hotplug script hasn't been executed yet),
made the backend not waiting for the hotplug script to execute. This in
turns, made the netfront think the interface is fully operational, while
in fact it was not (the vif interface on xen-netback side might not be
configured yet).

This was a workaround for 'hotplug-status' erroneously being removed.
But since that is reverted now, the workaround is not necessary either.

More discussion at
https://lore.kernel.org/xen-devel/afedd7cb-a291-e773-8b0d-4db9b291fa98@ipxe.org/T/#uSigned-off-by: default avatarMarek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Reviewed-by: default avatarPaul Durrant <paul@xen.org>
Reviewed-by: default avatarMichael Brown <mbrown@fensystems.co.uk>
Link: https://lore.kernel.org/r/20220222001817.2264967-2-marmarek@invisiblethingslab.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 0f4558ae
...@@ -824,15 +824,11 @@ static void connect(struct backend_info *be) ...@@ -824,15 +824,11 @@ static void connect(struct backend_info *be)
xenvif_carrier_on(be->vif); xenvif_carrier_on(be->vif);
unregister_hotplug_status_watch(be); unregister_hotplug_status_watch(be);
if (xenbus_exists(XBT_NIL, dev->nodename, "hotplug-status")) { err = xenbus_watch_pathfmt(dev, &be->hotplug_status_watch, NULL,
err = xenbus_watch_pathfmt(dev, &be->hotplug_status_watch, hotplug_status_changed,
NULL, hotplug_status_changed, "%s/%s", dev->nodename, "hotplug-status");
"%s/%s", dev->nodename, if (!err)
"hotplug-status");
if (err)
goto err;
be->have_hotplug_status_watch = 1; be->have_hotplug_status_watch = 1;
}
netif_tx_wake_all_queues(be->vif->dev); netif_tx_wake_all_queues(be->vif->dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment