xen-netback: move removal of "hotplug-status" to the right place
Subsystems (4)
PATCH 1/1 xen-netback: move removal of "hotplug-status" to the right place
The removal of "hotplug-status" has moved around a bit. First it was moved from netback_remove() to hotplug_status_changed() in upstream commit 1f2565780e9b ("xen-netback: remove 'hotplug-status' once it has served its purpose"). Then the change was reverted in upstream commit 0f4558ae9187 ("Revert "xen-netback: remove 'hotplug-status' once it has served its purpose""), but it moved the removal to backend_disconnect(). Then the upstream commit c55f34b6aec2 ("xen-netback: only remove 'hotplug-status' when the vif is actually destroyed") moved it finally back to netback_remove(). The thing to note being it is removed unconditionally this time around.
The story on v5.4.y adds to this confusion. Commit 60e4e3198ce8 ("Revert "xen-netback: remove 'hotplug-status' once it has served its purpose"") is backported to v5.4.y but the original commit that it tries to revert was never present on 5.4. So the backport incorrectly ends up just adding another xenbus_rm() of "hotplug-status" in backend_disconnect().
Now in v5.4.y it is removed in both backend_disconnect() and netback_remove(). But it should only be removed in netback_remove(), as the upstream version does.
Removing "hotplug-status" in backend_disconnect() causes problems when the frontend unilaterally disconnects, as explained in c55f34b6aec2 ("xen-netback: only remove 'hotplug-status' when the vif is actually destroyed").
Remove "hotplug-status" in the same place as it is done on the upstream version to ensure unilateral re-connection of frontend continues to work.
--- drivers/net/xen-netback/xenbus.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/xen-netback/xenbus.c +1 -2
@@ -202,10 +202,10 @@ static int netback_remove(struct xenbus_device *dev)set_backend_state (be, XenbusStateClosed);unregister_hotplug_status_watch (be); +xenbus_rm (XBT_NIL , dev->nodename,"hotplug-status" );if (be->vif) {kobject_uevent (&dev->dev.kobj,KOBJ_OFFLINE );xen_unregister_watchers (be->vif); -xenbus_rm (XBT_NIL , dev->nodename,"hotplug-status" );xenvif_free (be->vif); be->vif =NULL ; }
@@ -435,7 +435,6 @@ static void backend_disconnect(struct backend_info *be)unsigned int queue_index;xen_unregister_watchers (vif); -xenbus_rm (XBT_NIL , be->dev->nodename,"hotplug-status" );#ifdef CONFIG_DEBUG_FS xenvif_debugfs_delif (vif);#endif /* CONFIG_DEBUG_FS */
--
2.38.1
Greg Kroah-Hartman
maintainerQuoted 30 lines · Pratyush Yadav
The removal of "hotplug-status" has moved around a bit. First it was moved from
netback_remove()tohotplug_status_changed()in upstream commit1f2565780e9b("xen-netback: remove 'hotplug-status' once it has served its purpose"). Then the change was reverted in upstream commit0f4558ae9187("Revert "xen-netback: remove 'hotplug-status' once it has served its purpose""), but it moved the removal tobackend_disconnect(). Then the upstream commitc55f34b6aec2("xen-netback: only remove 'hotplug-status' when the vif is actually destroyed") moved it finally back tonetback_remove(). The thing to note being it is removed unconditionally this time around.The story on v5.4.y adds to this confusion. Commit
60e4e3198ce8("Revert "xen-netback: remove 'hotplug-status' once it has served its purpose"") is backported to v5.4.y but the original commit that it tries to revert was never present on 5.4. So the backport incorrectly ends up just adding anotherxenbus_rm()of "hotplug-status" inbackend_disconnect().Now in v5.4.y it is removed in both
backend_disconnect()andnetback_remove(). But it should only be removed innetback_remove(), as the upstream version does.Removing "hotplug-status" in
backend_disconnect()causes problems when the frontend unilaterally disconnects, as explained inc55f34b6aec2("xen-netback: only remove 'hotplug-status' when the vif is actually destroyed").Remove "hotplug-status" in the same place as it is done on the upstream version to ensure unilateral re-connection of frontend continues to work.
Quoted 5 lines
Fixes 60e4e3198ce8 ("Revert "xen-netback: remove 'hotplug-status' once it has served its purpose"")Signed-off-by Pratyush Yadav <[email protected]>--- drivers/net/xen-netback/xenbus.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Now queued up, thanks.
greg k-h
Patch "xen-netback: move removal of "hotplug-status" to the right place" has been added to the 5.4-stable tree
In reply to Pratyush YadavThis is a note to let you know that I've just added the patch titled
xen-netback: move removal of "hotplug-status" to the right place
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
xen-netback-move-removal-of-hotplug-status-to-the-right-place.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From [email protected] Mon Dec 19 16:41:51 2022
From: Pratyush Yadav <[email protected]>
Date: Mon, 19 Dec 2022 16:37:10 +0100
Subject: xen-netback: move removal of "hotplug-status" to the right place
To: <[email protected]>
Cc: "Pratyush Yadav" <[email protected]>, "Greg Kroah-Hartman" <[email protected]>, "Wei Liu" <[email protected]>, "Paul Durrant" <[email protected]>, "David S. Miller" <[email protected]>, "Marek Marczykowski-Górecki" <[email protected]>, "Jakub Kicinski" <[email protected]>, "Sasha Levin" <[email protected]>, "Puranjay Mohan" <[email protected]>, "Maximilian Heyne" <[email protected]>, "Julien Grall" <[email protected]>, [email protected], [email protected], [email protected]
Message-ID: <[email protected]>
From: Pratyush Yadav <[email protected]>
The removal of "hotplug-status" has moved around a bit. First it was moved from netback_remove() to hotplug_status_changed() in upstream commit 1f2565780e9b ("xen-netback: remove 'hotplug-status' once it has served its purpose"). Then the change was reverted in upstream commit 0f4558ae9187 ("Revert "xen-netback: remove 'hotplug-status' once it has served its purpose""), but it moved the removal to backend_disconnect(). Then the upstream commit c55f34b6aec2 ("xen-netback: only remove 'hotplug-status' when the vif is actually destroyed") moved it finally back to netback_remove(). The thing to note being it is removed unconditionally this time around.
The story on v5.4.y adds to this confusion. Commit 60e4e3198ce8 ("Revert "xen-netback: remove 'hotplug-status' once it has served its purpose"") is backported to v5.4.y but the original commit that it tries to revert was never present on 5.4. So the backport incorrectly ends up just adding another xenbus_rm() of "hotplug-status" in backend_disconnect().
Now in v5.4.y it is removed in both backend_disconnect() and netback_remove(). But it should only be removed in netback_remove(), as the upstream version does.
Removing "hotplug-status" in backend_disconnect() causes problems when the frontend unilaterally disconnects, as explained in c55f34b6aec2 ("xen-netback: only remove 'hotplug-status' when the vif is actually destroyed").
Remove "hotplug-status" in the same place as it is done on the upstream version to ensure unilateral re-connection of frontend continues to work.
--- drivers/net/xen-netback/xenbus.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/xen-netback/xenbus.c +1 -2
@@ -202,10 +202,10 @@ static int netback_remove(struct xenbus_set_backend_state (be, XenbusStateClosed);unregister_hotplug_status_watch (be); +xenbus_rm (XBT_NIL , dev->nodename,"hotplug-status" );if (be->vif) {kobject_uevent (&dev->dev.kobj,KOBJ_OFFLINE );xen_unregister_watchers (be->vif); -xenbus_rm (XBT_NIL , dev->nodename,"hotplug-status" );xenvif_free (be->vif); be->vif =NULL ; }
@@ -435,7 +435,6 @@ static void backend_disconnect(struct baunsigned int queue_index;xen_unregister_watchers (vif); -xenbus_rm (XBT_NIL , be->dev->nodename,"hotplug-status" );#ifdef CONFIG_DEBUG_FS xenvif_debugfs_delif (vif);#endif /* CONFIG_DEBUG_FS */
Patches currently in stable-queue which might be from [email protected] are
queue-5.4/xen-netback-move-removal-of-hotplug-status-to-the-right-place.patch queue-5.4/tracing-ring-buffer-only-do-full-wait-when-cpu-ring_buffer_all_cpus.patch