devlink: health: combine loops in dump

Walk devlink instances only once. Dump the instance reporters
and port reporters before moving to the next instance.
User space should not depend on ordering of messages.

This will make improving stability of the walk easier.

Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/devlink/leftover.c b/net/devlink/leftover.c
index d88461b33ddfedead1ce35b4f5486d40056afe86..83cd7bd55941b54f7c9c9bb0b8cbd4e8844a95e2 100644 (file)
--- a/net/devlink/leftover.c
+++ b/net/devlink/leftover.c
@@ -7940,10 +7940,7 @@ devlink_nl_cmd_health_reporter_get_dumpit(struct sk_buff *msg,
                        idx++;
                }
                mutex_unlock(&devlink->reporters_lock);
-               devlink_put(devlink);
-       }
 
-       devlinks_xa_for_each_registered_get(sock_net(msg->sk), index, devlink) {
                devl_lock(devlink);
                xa_for_each(&devlink->ports, port_index, port) {
                        mutex_lock(&port->reporters_lock);