Commit 3bc06da8 authored by Brett Creeley's avatar Brett Creeley Committed by Jakub Kicinski
Browse files

virtio_net: sync rss_trailer.max_tx_vq on queue_pairs change via VQ_PAIRS_SET 



When netif_is_rxfh_configured() is true (i.e., the user has explicitly
configured the RSS indirection table), virtnet_set_queues() skips the
RSS update path and falls through to the VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET
command to change the number of queue pairs. However, it does not update
vi->rss_trailer.max_tx_vq to reflect the new queue_pairs value.

This causes a mismatch between vi->curr_queue_pairs and
vi->rss_trailer.max_tx_vq. Any subsequent RSS reconfiguration (e.g.,
via ethtool -X) calls virtnet_commit_rss_command(), which sends the
stale max_tx_vq to the device, silently reverting the queue count.

Reproduction:
1. User configured RSS
  ethtool -X eth0 equal 8
2. VQ_PAIRS_SET path; max_tx_vq stays 16
  ethtool -L eth0 combined 12
3. RSS commit uses max_tx_vq=16 instead of 12
  ethtool -X eth0 equal 4

Fix this by updating vi->rss_trailer.max_tx_vq after a successful
VQ_PAIRS_SET command when RSS is enabled, keeping it in sync with
curr_queue_pairs.

Fixes: 50bfcaed ("virtio_net: Update rss when set queue")
Signed-off-by: default avatarBrett Creeley <brett.creeley@amd.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Link: https://patch.msgid.link/20260416212121.29073-1-brett.creeley@amd.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d40831b0

drivers/net/virtio_net.c

+6 −0
Original line number Diff line number Diff line
@@ -3759,6 +3759,12 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs) 
			 queue_pairs);

		return -EINVAL;

	}



	/* Keep max_tx_vq in sync so that a later RSS command does not

	 * revert queue_pairs to a stale value.

	 */

	if (vi->has_rss)

		vi->rss_trailer.max_tx_vq = cpu_to_le16(queue_pairs);

succ:

	vi->curr_queue_pairs = queue_pairs;

	if (dev->flags & IFF_UP) {