|
2 | 2 | // |
3 | 3 | // SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause |
4 | 4 |
|
5 | | -use log::{error, info, warn}; |
| 5 | +use log::{debug, error, info, warn}; |
6 | 6 | use thiserror::Error; |
7 | 7 | use virtio_bindings::virtio_net::{ |
8 | | - VIRTIO_NET_CTRL_GUEST_OFFLOADS, VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET, VIRTIO_NET_CTRL_MQ, |
9 | | - VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX, VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN, |
10 | | - VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET, VIRTIO_NET_ERR, VIRTIO_NET_OK, |
| 8 | + VIRTIO_NET_CTRL_ANNOUNCE, VIRTIO_NET_CTRL_ANNOUNCE_ACK, VIRTIO_NET_CTRL_GUEST_OFFLOADS, |
| 9 | + VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET, VIRTIO_NET_CTRL_MQ, VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX, |
| 10 | + VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN, VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET, VIRTIO_NET_CTRL_RX, |
| 11 | + VIRTIO_NET_CTRL_RX_ALLMULTI, VIRTIO_NET_CTRL_RX_ALLUNI, VIRTIO_NET_CTRL_RX_NOBCAST, |
| 12 | + VIRTIO_NET_CTRL_RX_NOMULTI, VIRTIO_NET_CTRL_RX_NOUNI, VIRTIO_NET_CTRL_RX_PROMISC, |
| 13 | + VIRTIO_NET_CTRL_VLAN, VIRTIO_NET_CTRL_VLAN_ADD, VIRTIO_NET_CTRL_VLAN_DEL, VIRTIO_NET_ERR, |
| 14 | + VIRTIO_NET_OK, |
11 | 15 | }; |
12 | 16 | use virtio_queue::{Queue, QueueT}; |
13 | 17 | use vm_memory::{ByteValued, Bytes, GuestMemoryError}; |
@@ -53,6 +57,26 @@ pub struct ControlHeader { |
53 | 57 | // SAFETY: ControlHeader only contains a series of integers |
54 | 58 | unsafe impl ByteValued for ControlHeader {} |
55 | 59 |
|
| 60 | +fn is_tolerated_ctrl_command(ctrl_hdr: ControlHeader) -> bool { |
| 61 | + match u32::from(ctrl_hdr.class) { |
| 62 | + VIRTIO_NET_CTRL_RX => matches!( |
| 63 | + u32::from(ctrl_hdr.cmd), |
| 64 | + VIRTIO_NET_CTRL_RX_PROMISC |
| 65 | + | VIRTIO_NET_CTRL_RX_ALLMULTI |
| 66 | + | VIRTIO_NET_CTRL_RX_ALLUNI |
| 67 | + | VIRTIO_NET_CTRL_RX_NOMULTI |
| 68 | + | VIRTIO_NET_CTRL_RX_NOUNI |
| 69 | + | VIRTIO_NET_CTRL_RX_NOBCAST |
| 70 | + ), |
| 71 | + VIRTIO_NET_CTRL_VLAN => matches!( |
| 72 | + u32::from(ctrl_hdr.cmd), |
| 73 | + VIRTIO_NET_CTRL_VLAN_ADD | VIRTIO_NET_CTRL_VLAN_DEL |
| 74 | + ), |
| 75 | + VIRTIO_NET_CTRL_ANNOUNCE => u32::from(ctrl_hdr.cmd) == VIRTIO_NET_CTRL_ANNOUNCE_ACK, |
| 76 | + _ => false, |
| 77 | + } |
| 78 | +} |
| 79 | + |
56 | 80 | pub struct CtrlQueue { |
57 | 81 | pub taps: Vec<Tap>, |
58 | 82 | } |
@@ -128,6 +152,10 @@ impl CtrlQueue { |
128 | 152 | false |
129 | 153 | } |
130 | 154 | } |
| 155 | + _ if is_tolerated_ctrl_command(ctrl_hdr) => { |
| 156 | + debug!("Ignoring unsupported but tolerated control command {ctrl_hdr:?}"); |
| 157 | + true |
| 158 | + } |
131 | 159 | _ => { |
132 | 160 | warn!("Unsupported command {ctrl_hdr:?}"); |
133 | 161 | false |
|
0 commit comments