hv_netvsc: Fix tx_table init in rndis_set_subchannel() (c39ea5cb) · Commits · 戴 / test

Host can provide send indirection table messages anytime after RSS is enabled by calling rndis_filter_set_rss_param(). So the host provided table values may be overwritten by the initialization in rndis_set_subchannel(). To prevent this problem, move the tx_table initialization before calling rndis_filter_set_rss_param(). Fixes: ("hv_netvsc: Set tx_table to equal weight after subchannels open") Signed-off-by:

Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by:

Jakub Kicinski <jakub.kicinski@netronome.com>

drivers/net/hyperv/rndis_filter.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1171,6 +1171,9 @@ int rndis_set_subchannel(struct net_device *ndev,
		wait_event(nvdev->subchan_open,
		atomic_read(&nvdev->open_chn) == nvdev->num_chn);

		for (i = 0; i < VRSS_SEND_TAB_SIZE; i++)
		ndev_ctx->tx_table[i] = i % nvdev->num_chn;

		/* ignore failures from setting rss parameters, still have channels */
		if (dev_info)
		rndis_filter_set_rss_param(rdev, dev_info->rss_key);
		@@ -1180,9 +1183,6 @@ int rndis_set_subchannel(struct net_device *ndev,
		netif_set_real_num_tx_queues(ndev, nvdev->num_chn);
		netif_set_real_num_rx_queues(ndev, nvdev->num_chn);

		for (i = 0; i < VRSS_SEND_TAB_SIZE; i++)
		ndev_ctx->tx_table[i] = i % nvdev->num_chn;

		return 0;
		}

Admin message