Skip to content

Commit 059a49a

Browse files
leitaodavem330
authored andcommitted
virtio_net: Do not send RSS key if it is not supported
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]>
1 parent 237f3cf commit 059a49a

File tree

1 file changed

+22
-4
lines changed

1 file changed

+22
-4
lines changed

drivers/net/virtio_net.c

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3807,20 +3807,36 @@ static int virtnet_set_rxfh(struct net_device *dev,
38073807
struct netlink_ext_ack *extack)
38083808
{
38093809
struct virtnet_info *vi = netdev_priv(dev);
3810+
bool update = false;
38103811
int i;
38113812

38123813
if (rxfh->hfunc != ETH_RSS_HASH_NO_CHANGE &&
38133814
rxfh->hfunc != ETH_RSS_HASH_TOP)
38143815
return -EOPNOTSUPP;
38153816

38163817
if (rxfh->indir) {
3818+
if (!vi->has_rss)
3819+
return -EOPNOTSUPP;
3820+
38173821
for (i = 0; i < vi->rss_indir_table_size; ++i)
38183822
vi->ctrl->rss.indirection_table[i] = rxfh->indir[i];
3823+
update = true;
38193824
}
3820-
if (rxfh->key)
3825+
3826+
if (rxfh->key) {
3827+
/* If either _F_HASH_REPORT or _F_RSS are negotiated, the
3828+
* device provides hash calculation capabilities, that is,
3829+
* hash_key is configured.
3830+
*/
3831+
if (!vi->has_rss && !vi->has_rss_hash_report)
3832+
return -EOPNOTSUPP;
3833+
38213834
memcpy(vi->ctrl->rss.key, rxfh->key, vi->rss_key_size);
3835+
update = true;
3836+
}
38223837

3823-
virtnet_commit_rss_command(vi);
3838+
if (update)
3839+
virtnet_commit_rss_command(vi);
38243840

38253841
return 0;
38263842
}
@@ -4729,13 +4745,15 @@ static int virtnet_probe(struct virtio_device *vdev)
47294745
if (virtio_has_feature(vdev, VIRTIO_NET_F_HASH_REPORT))
47304746
vi->has_rss_hash_report = true;
47314747

4732-
if (virtio_has_feature(vdev, VIRTIO_NET_F_RSS))
4748+
if (virtio_has_feature(vdev, VIRTIO_NET_F_RSS)) {
47334749
vi->has_rss = true;
47344750

4735-
if (vi->has_rss || vi->has_rss_hash_report) {
47364751
vi->rss_indir_table_size =
47374752
virtio_cread16(vdev, offsetof(struct virtio_net_config,
47384753
rss_max_indirection_table_length));
4754+
}
4755+
4756+
if (vi->has_rss || vi->has_rss_hash_report) {
47394757
vi->rss_key_size =
47404758
virtio_cread8(vdev, offsetof(struct virtio_net_config, rss_max_key_size));
47414759

0 commit comments

Comments
 (0)