aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2026-02-03 05:34:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

dragonball: vhost-net set_offload with acked features

Browse Source 
set_offload() for tap devices depends on acked features.

Signed-off-by: Helin Guo <helinguo@linux.alibaba.com>
Signed-off-by: Xuewei Niu <niuxuewei.nxw@antgroup.com>
This commit is contained in:
Xuewei Niu
2023-11-07 19:31:33 +08:00
parent 6cd572dbbb
commit e4f83e27c4
1 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/dragonball/src/dbs_virtio_devices/src/vhost/vhost_kern/net.rs
View File

@@ -117,12 +117,6 @@ fn validate_and_configure_tap(tap: &Tap, vq_pairs: usize) -> VirtioResult<()> {
)));
}
// Set offload flags to match the virtio features below.
tap.set_offload(
net_gen::TUN_F_CSUM | net_gen::TUN_F_UFO | net_gen::TUN_F_TSO4 | net_gen::TUN_F_TSO6,
)
.map_err(|err| VirtioError::VhostNet(Error::TapError(TapError::SetOffload(err))))?;
let vnet_hdr_size = vnet_hdr_len() as i32;
tap.set_vnet_hdr_size(vnet_hdr_size)
.map_err(|err| VirtioError::VhostNet(Error::TapError(TapError::SetVnetHdrSize(err))))?;
@@ -342,6 +336,22 @@ where
.set_features(features)
.map_err(|err| VirtioError::VhostNet(Error::VhostError(err)))?;
let tap = &self.taps[pair_index];
tap.set_offload(Self::virtio_features_to_tap_offload(
self.device_info.acked_features(),
))
.map_err(|err| VirtioError::VhostNet(Error::TapError(TapError::SetOffload(err))))?;
self.setup_mem_table(pair_index, mem)?;
self.init_vhost_queues(pair_index, config)?;
Ok(())
}
fn setup_mem_table(&mut self, pair_index: usize, mem: &AS::M) -> VirtioResult<()> {
let handle = &mut self.handles[pair_index];
let mut regions = Vec::new();
for region in mem.iter() {
let guest_phys_addr = region.start_addr();
@@ -363,8 +373,6 @@ where
.set_mem_table(&regions)
.map_err(|err| VirtioError::VhostNet(Error::VhostError(err)))?;
self.init_vhost_queues(pair_index, config)?;
Ok(())
}
@@ -443,6 +451,28 @@ where
Ok(())
}
fn virtio_features_to_tap_offload(features: u64) -> u32 {
let mut tap_offloads: u32 = 0;
if features & (1 << VIRTIO_NET_F_GUEST_CSUM) != 0 {
tap_offloads |= net_gen::TUN_F_CSUM;
}
if features & (1 << VIRTIO_NET_F_GUEST_TSO4) != 0 {
tap_offloads |= net_gen::TUN_F_TSO4;
}
if features & (1 << VIRTIO_NET_F_GUEST_TSO6) != 0 {
tap_offloads |= net_gen::TUN_F_TSO6;
}
if features & (1 << VIRTIO_NET_F_GUEST_ECN) != 0 {
tap_offloads |= net_gen::TUN_F_TSO_ECN;
}
if features & (1 << VIRTIO_NET_F_GUEST_UFO) != 0 {
tap_offloads |= net_gen::TUN_F_UFO;
}
tap_offloads
}
}
impl<AS, Q, R> VirtioDevice<AS, Q, R> for Net<AS, Q, R>