Patch "netdev: fix repeated netlink messages in queue dump" has been added to the 6.12-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    netdev: fix repeated netlink messages in queue dump

to the 6.12-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:
     netdev-fix-repeated-netlink-messages-in-queue-dump.patch
and it can be found in the queue-6.12 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 831ba8dc6aa595495a4d02cc3add677b269359b7
Author: Jakub Kicinski <kuba@xxxxxxxxxx>
Date:   Fri Dec 13 07:22:40 2024 -0800

    netdev: fix repeated netlink messages in queue dump
    
    [ Upstream commit b1f3a2f5a742c1e939a73031bd31b9e557a2d77d ]
    
    The context is supposed to record the next queue to dump,
    not last dumped. If the dump doesn't fit we will restart
    from the already-dumped queue, duplicating the message.
    
    Before this fix and with the selftest improvements later
    in this series we see:
    
      # ./run_kselftest.sh -t drivers/net:queues.py
      timeout set to 45
      selftests: drivers/net: queues.py
      KTAP version 1
      1..2
      # Check| At /root/ksft-net-drv/drivers/net/./queues.py, line 32, in get_queues:
      # Check|     ksft_eq(queues, expected)
      # Check failed 102 != 100
      # Check| At /root/ksft-net-drv/drivers/net/./queues.py, line 32, in get_queues:
      # Check|     ksft_eq(queues, expected)
      # Check failed 101 != 100
      not ok 1 queues.get_queues
      ok 2 queues.addremove_queues
      # Totals: pass:1 fail:1 xfail:0 xpass:0 skip:0 error:0
      not ok 1 selftests: drivers/net: queues.py # exit=1
    
    With the fix:
    
      # ./ksft-net-drv/run_kselftest.sh -t drivers/net:queues.py
      timeout set to 45
      selftests: drivers/net: queues.py
      KTAP version 1
      1..2
      ok 1 queues.get_queues
      ok 2 queues.addremove_queues
      # Totals: pass:2 fail:0 xfail:0 xpass:0 skip:0 error:0
    
    Fixes: 6b6171db7fc8 ("netdev-genl: Add netlink framework functions for queue")
    Reviewed-by: Joe Damato <jdamato@xxxxxxxxxx>
    Link: https://patch.msgid.link/20241213152244.3080955-2-kuba@xxxxxxxxxx
    Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/net/core/netdev-genl.c b/net/core/netdev-genl.c
index d2baa1af9df0..71359922ae8b 100644
--- a/net/core/netdev-genl.c
+++ b/net/core/netdev-genl.c
@@ -417,24 +417,21 @@ netdev_nl_queue_dump_one(struct net_device *netdev, struct sk_buff *rsp,
 			 struct netdev_nl_dump_ctx *ctx)
 {
 	int err = 0;
-	int i;
 
 	if (!(netdev->flags & IFF_UP))
 		return err;
 
-	for (i = ctx->rxq_idx; i < netdev->real_num_rx_queues;) {
-		err = netdev_nl_queue_fill_one(rsp, netdev, i,
+	for (; ctx->rxq_idx < netdev->real_num_rx_queues; ctx->rxq_idx++) {
+		err = netdev_nl_queue_fill_one(rsp, netdev, ctx->rxq_idx,
 					       NETDEV_QUEUE_TYPE_RX, info);
 		if (err)
 			return err;
-		ctx->rxq_idx = i++;
 	}
-	for (i = ctx->txq_idx; i < netdev->real_num_tx_queues;) {
-		err = netdev_nl_queue_fill_one(rsp, netdev, i,
+	for (; ctx->txq_idx < netdev->real_num_tx_queues; ctx->txq_idx++) {
+		err = netdev_nl_queue_fill_one(rsp, netdev, ctx->txq_idx,
 					       NETDEV_QUEUE_TYPE_TX, info);
 		if (err)
 			return err;
-		ctx->txq_idx = i++;
 	}
 
 	return err;