Skip to content

Commit 43a71c1

Browse files
leitaogregkh
authored andcommitted
virtio_net: Do not send RSS key if it is not supported
commit 059a49a upstream. There is a bug when setting the RSS options in virtio_net that can break the whole machine, getting the kernel into an infinite loop. Running the following command in any QEMU virtual machine with virtionet will reproduce this problem: # ethtool -X eth0 hfunc toeplitz This is how the problem happens: 1) ethtool_set_rxfh() calls virtnet_set_rxfh() 2) virtnet_set_rxfh() calls virtnet_commit_rss_command() 3) virtnet_commit_rss_command() populates 4 entries for the rss scatter-gather 4) Since the command above does not have a key, then the last scatter-gatter entry will be zeroed, since rss_key_size == 0. sg_buf_size = vi->rss_key_size; 5) This buffer is passed to qemu, but qemu is not happy with a buffer with zero length, and do the following in virtqueue_map_desc() (QEMU function): if (!sz) { virtio_error(vdev, "virtio: zero sized buffers are not allowed"); 6) virtio_error() (also QEMU function) set the device as broken vdev->broken = true; 7) Qemu bails out, and do not repond this crazy kernel. 8) The kernel is waiting for the response to come back (function virtnet_send_command()) 9) The kernel is waiting doing the following : while (!virtqueue_get_buf(vi->cvq, &tmp) && !virtqueue_is_broken(vi->cvq)) cpu_relax(); 10) None of the following functions above is true, thus, the kernel loops here forever. Keeping in mind that virtqueue_is_broken() does not look at the qemu `vdev->broken`, so, it never realizes that the vitio is broken at QEMU side. Fix it by not sending RSS commands if the feature is not available in the device. Fixes: c7114b1 ("drivers/net/virtio_net: Added basic RSS support.") Cc: [email protected] Cc: [email protected] Signed-off-by: Breno Leitao <[email protected]> Reviewed-by: Heng Qi <[email protected]> Reviewed-by: Xuan Zhuo <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Vlad Poenaru <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent bd41ee1 commit 43a71c1

File tree

1 file changed

+21
-4
lines changed

1 file changed

+21
-4
lines changed

drivers/net/virtio_net.c

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3570,19 +3570,34 @@ static int virtnet_get_rxfh(struct net_device *dev, u32 *indir, u8 *key, u8 *hfu
35703570
static int virtnet_set_rxfh(struct net_device *dev, const u32 *indir, const u8 *key, const u8 hfunc)
35713571
{
35723572
struct virtnet_info *vi = netdev_priv(dev);
3573+
bool update = false;
35733574
int i;
35743575

35753576
if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP)
35763577
return -EOPNOTSUPP;
35773578

35783579
if (indir) {
3580+
if (!vi->has_rss)
3581+
return -EOPNOTSUPP;
3582+
35793583
for (i = 0; i < vi->rss_indir_table_size; ++i)
35803584
vi->ctrl->rss.indirection_table[i] = indir[i];
3585+
update = true;
35813586
}
3582-
if (key)
3587+
if (key) {
3588+
/* If either _F_HASH_REPORT or _F_RSS are negotiated, the
3589+
* device provides hash calculation capabilities, that is,
3590+
* hash_key is configured.
3591+
*/
3592+
if (!vi->has_rss && !vi->has_rss_hash_report)
3593+
return -EOPNOTSUPP;
3594+
35833595
memcpy(vi->ctrl->rss.key, key, vi->rss_key_size);
3596+
update = true;
3597+
}
35843598

3585-
virtnet_commit_rss_command(vi);
3599+
if (update)
3600+
virtnet_commit_rss_command(vi);
35863601

35873602
return 0;
35883603
}
@@ -4491,13 +4506,15 @@ static int virtnet_probe(struct virtio_device *vdev)
44914506
if (virtio_has_feature(vdev, VIRTIO_NET_F_HASH_REPORT))
44924507
vi->has_rss_hash_report = true;
44934508

4494-
if (virtio_has_feature(vdev, VIRTIO_NET_F_RSS))
4509+
if (virtio_has_feature(vdev, VIRTIO_NET_F_RSS)) {
44954510
vi->has_rss = true;
44964511

4497-
if (vi->has_rss || vi->has_rss_hash_report) {
44984512
vi->rss_indir_table_size =
44994513
virtio_cread16(vdev, offsetof(struct virtio_net_config,
45004514
rss_max_indirection_table_length));
4515+
}
4516+
4517+
if (vi->has_rss || vi->has_rss_hash_report) {
45014518
vi->rss_key_size =
45024519
virtio_cread8(vdev, offsetof(struct virtio_net_config, rss_max_key_size));
45034520

0 commit comments

Comments
 (0)