Skip to content

fix: stop dup(2)-ing fds when setting up guest memory #5026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 5, 2025
Merged

fix: stop dup(2)-ing fds when setting up guest memory #5026

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/vmm/src/vstate/memory.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

use std::fs::File;
use std::io::SeekFrom;
use std::sync::Arc;

use libc::c_int;
use serde::{Deserialize, Serialize};
Expand Down Expand Up @@ -35,8 +36,6 @@ pub type GuestMmapRegion = vm_memory::MmapRegion<Option<AtomicBitmap>>;
/// Errors associated with dumping guest memory to file.
#[derive(Debug, thiserror::Error, displaydoc::Display)]
pub enum MemoryError {
/// Cannot access file: {0}
FileError(std::io::Error),
/// Cannot create memory: {0}
CreateMemory(VmMemoryError),
/// Cannot create memory region: {0}
Expand Down Expand Up @@ -173,6 +172,7 @@ impl GuestMemoryExtension for GuestMemoryMmap {
track_dirty_pages: bool,
) -> Result<Self, MemoryError> {
let mut offset = 0;
let file = file.map(Arc::new);
let regions = regions
.map(|(start, size)| {
let mut builder = MmapRegionBuilder::new_with_bitmap(
Expand All @@ -183,8 +183,7 @@ impl GuestMemoryExtension for GuestMemoryMmap {
.with_mmap_flags(libc::MAP_NORESERVE | mmap_flags);

if let Some(ref file) = file {
let file_offset =
FileOffset::new(file.try_clone().map_err(MemoryError::FileError)?, offset);
let file_offset = FileOffset::from_arc(Arc::clone(file), offset);

builder = builder.with_file_offset(file_offset);
}
Expand Down