Merge branch 'main' into benchmark-fix

Author: ShadowCurse

.github/CODEOWNERS

@@ -1,19 +1,19 @@
 # All markdown files
-*.md @xmarcalx @kalyazin @pb8o
+*.md @xmarcalx @kalyazin @pb8o @Manciukic
 
 # But not the ones in docs/
 docs/*.md
 
 # Except these specific ones
-docs/getting-started.md @xmarcalx @kalyazin @pb8o
-docs/prod-host-setup.md @xmarcalx @kalyazin @pb8o
+docs/getting-started.md @xmarcalx @kalyazin @pb8o @Manciukic
+docs/prod-host-setup.md @xmarcalx @kalyazin @pb8o @Manciukic
 
 # Also cover all "*policy*.md" documents
-**/*policy*.md @xmarcalx @kalyazin @pb8o
-**/*POLICY*.md @xmarcalx @kalyazin @pb8o
+**/*policy*.md @xmarcalx @kalyazin @pb8o @Manciukic
+**/*POLICY*.md @xmarcalx @kalyazin @pb8o @Manciukic
 
 # Also these non-md files in the repository root
-THIRD_PARTY @xmarcalx @kalyazin @pb8o
-LICENSE @xmarcalx @kalyazin @pb8o
-NOTICE @xmarcalx @kalyazin @pb8o
-PGP-KEY.asc @xmarcalx @kalyazin @pb8o
+THIRD_PARTY @xmarcalx @kalyazin @pb8o @Manciukic
+LICENSE @xmarcalx @kalyazin @pb8o @Manciukic
+NOTICE @xmarcalx @kalyazin @pb8o @Manciukic
+PGP-KEY.asc @xmarcalx @kalyazin @pb8o @Manciukic

CHANGELOG.md

@@ -30,6 +30,13 @@ and this project adheres to
 - [#4790](https://github.com/firecracker-microvm/firecracker/pull/4790): v1.9.0
   was missing most of the debugging information in the debuginfo file, due to a
   change in the Cargo defaults. This has been corrected.
+- [#4826](https://github.com/firecracker-microvm/firecracker/pull/4826): Add
+  missing configuration of tap offload features when restoring from a snapshot.
+  Setting the features was previously
+  [moved](https://github.com/firecracker-microvm/firecracker/pull/4680/commits/49ed5ea4b48ccd98903da037368fa3108f58ac1f)
+  from net device creation to device activation time, but it was not reflected
+  in the restore path. This was leading to inability to connect to the restored
+  VM if the offload features were used.
 
 ## \[1.9.0\]
 

MAINTAINERS.md

@@ -2,13 +2,12 @@
 
 Firecracker is maintained by a dedicated team within Amazon:
 
-- Alexandra Iordache <[email protected]>
 - Babis Chalios <[email protected]>
-- Diana Popa <[email protected]>
 - Egor Lazarchuk <[email protected]>
-- Jonathan Woollett-Light <jcawl@amazon.com>
+- Jack Thomson <jackabt@amazon.com>
 - Marco Cali <[email protected]>
 - Nikita Kalyazin <[email protected]>
 - Pablo Barbachano <[email protected]>
 - Patrick Roy <[email protected]>
+- Riccardo Mancini <[email protected]>
 - Takahiro Itazuri <[email protected]>

src/vmm/src/devices/virtio/net/device.rs

@@ -665,7 +665,7 @@ impl Net {
 
     /// Builds the offload features we will setup on the TAP device based on the features that the
     /// guest supports.
-    fn build_tap_offload_features(guest_supported_features: u64) -> u32 {
+    pub fn build_tap_offload_features(guest_supported_features: u64) -> u32 {
         let add_if_supported =
             |tap_features: &mut u32, supported_features: u64, tap_flag: u32, virtio_flag: u32| {
                 if supported_features & (1 << virtio_flag) != 0 {

src/vmm/src/devices/virtio/net/persist.rs

@@ -10,7 +10,7 @@ use std::sync::{Arc, Mutex};
 use serde::{Deserialize, Serialize};
 
 use super::device::Net;
-use super::NET_NUM_QUEUES;
+use super::{TapError, NET_NUM_QUEUES};
 use crate::devices::virtio::device::DeviceState;
 use crate::devices::virtio::persist::{PersistError as VirtioStateError, VirtioDeviceState};
 use crate::devices::virtio::queue::FIRECRACKER_MAX_QUEUE_SIZE;
@@ -65,6 +65,8 @@ pub enum NetPersistError {
     VirtioState(#[from] VirtioStateError),
     /// Indicator that no MMDS is associated with this device.
     NoMmdsDataStore,
+    /// Setting tap interface offload flags failed: {0}
+    TapSetOffload(TapError),
 }
 
 impl Persist<'_> for Net {
@@ -129,6 +131,11 @@ impl Persist<'_> for Net {
         net.acked_features = state.virtio_state.acked_features;
 
         if state.virtio_state.activated {
+            let supported_flags: u32 = Net::build_tap_offload_features(net.acked_features);
+            net.tap
+                .set_offload(supported_flags)
+                .map_err(NetPersistError::TapSetOffload)?;
+
             net.device_state = DeviceState::Activated(constructor_args.mem);
         }