upd

Signed-off-by: Akira Hayakawa <ruby.wktk@gmail.com>
akiradeveloper · May 8, 2024 · 256a89b · 256a89b
1 parent 8f88c49
commit 256a89b
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 580 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,8 +1,6 @@
 [workspace]
 members = [
-    "nbd",
-    "nbd-ramdisk",
     "abuse",
-    "abuse-ramdisk",
     "abusectl",
+    "abuse-ramdisk",
 ]
diff --git a/abuse/src/lib.rs b/abuse/src/lib.rs
@@ -195,13 +195,16 @@ pub async fn run_on(config: Config, engine: impl StorageEngine) {
                     let page_address = io_vec.address as i64;
                     let map_len = io_vec.offset as usize + io_vec.len as usize;
                     println!("pfn={}, len={} bytes", page_address >> 9, map_len);
+
                     let mut prot_flags = ProtFlags::empty();
                     prot_flags.insert(ProtFlags::PROT_READ);
                     prot_flags.insert(ProtFlags::PROT_WRITE);
+
                     let mut map_flags = MapFlags::empty();
                     map_flags.insert(MapFlags::MAP_SHARED);
                     map_flags.insert(MapFlags::MAP_POPULATE);
                     map_flags.insert(MapFlags::MAP_NONBLOCK);
+
                     // Last argument page_offset should be a multiple of page size
                     // This passes to xxx_mmap as vma.pg_off after 9 right shift.
                     let p = unsafe { mmap(p0, map_len, prot_flags, map_flags, fd, page_address) }.expect("failed to mmap");

diff --git a/abusectl/Cargo.toml b/abusectl/Cargo.toml
@@ -7,5 +7,5 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = "3.0.0-beta.2"
+clap = "4"
 nix = "0.19"
diff --git a/nbd-ramdisk/Cargo.toml b/nbd-ramdisk/Cargo.toml
diff --git a/nbd-ramdisk/README.md b/nbd-ramdisk/README.md
diff --git a/nbd-ramdisk/src/main.rs b/nbd-ramdisk/src/main.rs
diff --git a/nbd/Cargo.toml b/nbd/Cargo.toml
diff --git a/nbd/src/lib.rs b/nbd/src/lib.rs
diff --git a/nbd/src/transport/mod.rs b/nbd/src/transport/mod.rs