This is a note to let you know that I've just added the patch titled
net: move net_set_todo inside rollback_registered()
to the 5.10-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:
net-move-net_set_todo-inside-rollback_registered.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Sat Jul 23 05:03:39 PM CEST 2022
From: Fedor Pchelkin <pchelkin@xxxxxxxxx>
Date: Fri, 15 Jul 2022 19:26:29 +0300
Subject: net: move net_set_todo inside rollback_registered()
To: stable@xxxxxxxxxxxxxxx, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Cc: Fedor Pchelkin <pchelkin@xxxxxxxxx>, Jakub Kicinski <kuba@xxxxxxxxxx>, Alexey Khoroshilov <khoroshilov@xxxxxxxxx>, Edwin Peer <edwin.peer@xxxxxxxxxxxx>
Message-ID: <20220715162632.332718-5-pchelkin@xxxxxxxxx>
From: Fedor Pchelkin <pchelkin@xxxxxxxxx>
From: Jakub Kicinski <kuba@xxxxxxxxxx>
commit 2014beea7eb165c745706b13659a0f1d0a9a2a61 upstream.
Commit 93ee31f14f6f ("[NET]: Fix free_netdev on register_netdev
failure.") moved net_set_todo() outside of rollback_registered()
so that rollback_registered() can be used in the failure path of
register_netdevice() but without risking a double free.
Since commit cf124db566e6 ("net: Fix inconsistent teardown and
release of private netdev state."), however, we have a better
way of handling that condition, since destructors don't call
free_netdev() directly.
After the change in commit c269a24ce057 ("net: make free_netdev()
more lenient with unregistering devices") we can now move
net_set_todo() back.
Reviewed-by: Edwin Peer <edwin.peer@xxxxxxxxxxxx>
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Fedor Pchelkin <pchelkin@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/core/dev.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -9595,8 +9595,10 @@ static void rollback_registered_many(str
synchronize_net();
- list_for_each_entry(dev, head, unreg_list)
+ list_for_each_entry(dev, head, unreg_list) {
dev_put(dev);
+ net_set_todo(dev);
+ }
}
static void rollback_registered(struct net_device *dev)
@@ -10147,7 +10149,6 @@ int register_netdevice(struct net_device
/* Expect explicit free_netdev() on failure */
dev->needs_free_netdev = false;
rollback_registered(dev);
- net_set_todo(dev);
goto out;
}
/*
@@ -10755,8 +10756,6 @@ void unregister_netdevice_queue(struct n
list_move_tail(&dev->unreg_list, head);
} else {
rollback_registered(dev);
- /* Finish processing unregister after unlock */
- net_set_todo(dev);
}
}
EXPORT_SYMBOL(unregister_netdevice_queue);
@@ -10770,12 +10769,8 @@ EXPORT_SYMBOL(unregister_netdevice_queue
*/
void unregister_netdevice_many(struct list_head *head)
{
- struct net_device *dev;
-
if (!list_empty(head)) {
rollback_registered_many(head);
- list_for_each_entry(dev, head, unreg_list)
- net_set_todo(dev);
list_del(head);
}
}
Patches currently in stable-queue which might be from pchelkin@xxxxxxxxx are
queue-5.10/net-make-sure-devices-go-through-netdev_wait_all_refs.patch
queue-5.10/net-make-free_netdev-more-lenient-with-unregistering-devices.patch
queue-5.10/docs-net-explain-struct-net_device-lifetime.patch
queue-5.10/net-move-rollback_registered_many.patch
queue-5.10/net-inline-rollback_registered_many.patch
queue-5.10/net-move-net_set_todo-inside-rollback_registered.patch
queue-5.10/net-inline-rollback_registered.patch
