kobako 0.30.0 → 0.31.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.release-please-manifest.json +1 -1
- data/CHANGELOG.md +335 -0
- data/Cargo.lock +469 -11
- data/README.md +43 -3
- data/ROADMAP.md +1 -1
- data/crates/kobako-runtime/CHANGELOG.md +219 -0
- data/crates/kobako-runtime/Cargo.toml +51 -3
- data/crates/kobako-runtime/README.md +7 -4
- data/crates/kobako-runtime/src/cred.rs +124 -0
- data/crates/kobako-runtime/src/dispatch.rs +4 -5
- data/crates/kobako-runtime/src/endpoint/buffer.rs +153 -44
- data/crates/kobako-runtime/src/endpoint/dispatch.rs +80 -41
- data/crates/kobako-runtime/src/endpoint/invoke.rs +23 -36
- data/crates/kobako-runtime/src/endpoint.rs +137 -36
- data/crates/kobako-runtime/src/errno.rs +391 -0
- data/crates/kobako-runtime/src/error.rs +31 -10
- data/crates/kobako-runtime/src/filesystem/anon_inodes.rs +52 -0
- data/crates/kobako-runtime/src/filesystem/bind/lookup.rs +52 -14
- data/crates/kobako-runtime/src/filesystem/bind/walk.rs +19 -20
- data/crates/kobako-runtime/src/filesystem/bind.rs +437 -245
- data/crates/kobako-runtime/src/filesystem/overlay/file.rs +6 -6
- data/crates/kobako-runtime/src/filesystem/overlay/path.rs +43 -65
- data/crates/kobako-runtime/src/filesystem/overlay/stack/copy_up.rs +9 -16
- data/crates/kobako-runtime/src/filesystem/overlay/stack/dir.rs +47 -72
- data/crates/kobako-runtime/src/filesystem/overlay/stack/namei.rs +12 -12
- data/crates/kobako-runtime/src/filesystem/overlay/stack/readdir.rs +4 -7
- data/crates/kobako-runtime/src/filesystem/overlay/stack.rs +121 -37
- data/crates/kobako-runtime/src/filesystem/overlay.rs +302 -343
- data/crates/kobako-runtime/src/filesystem/pipe.rs +12 -9
- data/crates/kobako-runtime/src/filesystem/rdir.rs +15 -32
- data/crates/kobako-runtime/src/filesystem/tmpfs/seed.rs +32 -0
- data/crates/kobako-runtime/src/filesystem/tmpfs/tmpfile.rs +3 -3
- data/crates/kobako-runtime/src/filesystem/tmpfs/whiteout.rs +57 -35
- data/crates/kobako-runtime/src/filesystem/tmpfs/xattr.rs +2 -2
- data/crates/kobako-runtime/src/filesystem/tmpfs.rs +172 -160
- data/crates/kobako-runtime/src/filesystem/wrap.rs +36 -52
- data/crates/kobako-runtime/src/filesystem.rs +6 -3
- data/crates/kobako-runtime/src/fork.rs +96 -0
- data/crates/kobako-runtime/src/grant.rs +3 -0
- data/crates/kobako-runtime/src/hashtable.rs +4 -2
- data/crates/kobako-runtime/src/lib.rs +18 -7
- data/crates/kobako-runtime/src/limits.rs +195 -0
- data/crates/kobako-runtime/src/locking.rs +10 -0
- data/crates/kobako-runtime/src/memcg.rs +383 -0
- data/crates/kobako-runtime/src/mount.rs +67 -9
- data/crates/kobako-runtime/src/net/backends.rs +43 -0
- data/crates/kobako-runtime/src/net/connections.rs +179 -0
- data/crates/kobako-runtime/src/net/credential.rs +125 -0
- data/crates/kobako-runtime/src/net/egress.rs +160 -0
- data/crates/kobako-runtime/src/net/family.rs +181 -0
- data/crates/kobako-runtime/src/net/http.rs +2733 -0
- data/crates/kobako-runtime/src/net/lookup.rs +285 -0
- data/crates/kobako-runtime/src/net/mock.rs +251 -0
- data/crates/kobako-runtime/src/net/namespace.rs +1366 -0
- data/crates/kobako-runtime/src/net/reactor.rs +531 -0
- data/crates/kobako-runtime/src/net/resolv/darwin.rs +275 -0
- data/crates/kobako-runtime/src/net/resolv/stub/tests.rs +469 -0
- data/crates/kobako-runtime/src/net/resolv/stub.rs +536 -0
- data/crates/kobako-runtime/src/net/resolv/windows.rs +248 -0
- data/crates/kobako-runtime/src/net/resolv.rs +227 -0
- data/crates/kobako-runtime/src/net/socket.rs +870 -0
- data/crates/kobako-runtime/src/net/tcp.rs +1588 -0
- data/crates/kobako-runtime/src/net/tls.rs +58 -0
- data/crates/kobako-runtime/src/net/transport.rs +279 -0
- data/crates/kobako-runtime/src/net/udp.rs +1003 -0
- data/crates/kobako-runtime/src/net.rs +42 -0
- data/crates/kobako-runtime/src/network/builder.rs +177 -0
- data/crates/kobako-runtime/src/network/ruleset.rs +777 -0
- data/crates/kobako-runtime/src/network.rs +551 -0
- data/crates/kobako-runtime/src/policy.rs +16 -0
- data/crates/kobako-runtime/src/profile.rs +29 -144
- data/crates/kobako-runtime/src/runtime.rs +3 -5
- data/crates/kobako-runtime/src/sched.rs +130 -29
- data/crates/kobako-runtime/src/security/entry_policy.rs +22 -0
- data/crates/kobako-runtime/src/{vfs/cred.rs → security/hooks.rs} +52 -144
- data/crates/kobako-runtime/src/security/mount_policy.rs +158 -0
- data/crates/kobako-runtime/src/security.rs +101 -196
- data/crates/kobako-runtime/src/snapshot.rs +121 -2
- data/crates/kobako-runtime/src/vfs/attr.rs +5 -5
- data/crates/kobako-runtime/src/vfs/dentry.rs +143 -89
- data/crates/kobako-runtime/src/vfs/file.rs +199 -203
- data/crates/kobako-runtime/src/vfs/inode.rs +41 -45
- data/crates/kobako-runtime/src/vfs/kern_path.rs +38 -42
- data/crates/kobako-runtime/src/vfs/mount.rs +10 -9
- data/crates/kobako-runtime/src/vfs/namei.rs +829 -700
- data/crates/kobako-runtime/src/vfs/namespace.rs +162 -0
- data/crates/kobako-runtime/src/vfs/open_files.rs +69 -0
- data/crates/kobako-runtime/src/vfs/openat2.rs +3 -3
- data/crates/kobako-runtime/src/vfs/path.rs +6 -6
- data/crates/kobako-runtime/src/vfs/readdir.rs +6 -6
- data/crates/kobako-runtime/src/vfs/stat.rs +159 -23
- data/crates/kobako-runtime/src/vfs/super_block.rs +18 -14
- data/crates/kobako-runtime/src/vfs/utimes.rs +37 -27
- data/crates/kobako-runtime/src/vfs.rs +9 -6
- data/crates/kobako-runtime/src/wait.rs +356 -0
- data/crates/kobako-transport/CHANGELOG.md +31 -0
- data/crates/kobako-transport/Cargo.toml +1 -1
- data/crates/kobako-transport/README.md +3 -4
- data/crates/kobako-transport/src/abi.rs +78 -72
- data/crates/kobako-transport/src/envelope/bytes.rs +17 -6
- data/crates/kobako-transport/src/envelope/call.rs +32 -4
- data/crates/kobako-transport/src/envelope/error_record.rs +21 -0
- data/crates/kobako-transport/src/envelope/name.rs +99 -0
- data/crates/kobako-transport/src/envelope/outcome.rs +9 -9
- data/crates/kobako-transport/src/envelope/preamble.rs +24 -21
- data/crates/kobako-transport/src/envelope/reply.rs +27 -27
- data/crates/kobako-transport/src/envelope/unsupported.rs +10 -10
- data/crates/kobako-transport/src/envelope.rs +13 -8
- data/crates/kobako-wasmtime/CHANGELOG.md +161 -0
- data/crates/kobako-wasmtime/Cargo.toml +26 -7
- data/crates/kobako-wasmtime/README.md +3 -2
- data/crates/kobako-wasmtime/build/preview2.rs +1339 -0
- data/crates/kobako-wasmtime/build.rs +16 -0
- data/crates/kobako-wasmtime/src/abi.rs +17 -37
- data/crates/kobako-wasmtime/src/ambient.rs +33 -18
- data/crates/kobako-wasmtime/src/cache.rs +23 -15
- data/crates/kobako-wasmtime/src/config.rs +52 -68
- data/crates/kobako-wasmtime/src/driver.rs +48 -63
- data/crates/kobako-wasmtime/src/exports.rs +143 -17
- data/crates/kobako-wasmtime/src/guest.rs +12 -6
- data/crates/kobako-wasmtime/src/guest_binary.rs +14 -0
- data/crates/kobako-wasmtime/src/imports.rs +42 -18
- data/crates/kobako-wasmtime/src/instance_pre.rs +4 -4
- data/crates/kobako-wasmtime/src/invocation.rs +74 -12
- data/crates/kobako-wasmtime/src/lib.rs +5 -3
- data/crates/kobako-wasmtime/src/limiter.rs +70 -5
- data/crates/kobako-wasmtime/src/preview1/descriptors.rs +309 -0
- data/crates/kobako-wasmtime/src/preview1/differential/mount.rs +5 -15
- data/crates/kobako-wasmtime/src/preview1/differential.rs +27 -31
- data/crates/kobako-wasmtime/src/preview1/errno.rs +55 -66
- data/crates/kobako-wasmtime/src/preview1/fd.rs +327 -296
- data/crates/kobako-wasmtime/src/preview1/memory.rs +21 -12
- data/crates/kobako-wasmtime/src/preview1/mount_view/wrap.rs +34 -53
- data/crates/kobako-wasmtime/src/preview1/mount_view.rs +231 -217
- data/crates/kobako-wasmtime/src/preview1/path.rs +56 -121
- data/crates/kobako-wasmtime/src/preview1/poll.rs +244 -120
- data/crates/kobako-wasmtime/src/preview1/sock.rs +10 -8
- data/crates/kobako-wasmtime/src/preview1/testsuite.rs +5 -15
- data/crates/kobako-wasmtime/src/preview1.rs +46 -42
- data/crates/kobako-wasmtime/src/preview2/abi.rs +227 -0
- data/crates/kobako-wasmtime/src/preview2/error.rs +118 -0
- data/crates/kobako-wasmtime/src/preview2/filesystem.rs +122 -0
- data/crates/kobako-wasmtime/src/preview2/host.rs +3959 -0
- data/crates/kobako-wasmtime/src/preview2/http.rs +1503 -0
- data/crates/kobako-wasmtime/src/preview2/io.rs +315 -0
- data/crates/kobako-wasmtime/src/preview2/sockets.rs +379 -0
- data/crates/kobako-wasmtime/src/preview2/table.rs +305 -0
- data/crates/kobako-wasmtime/src/preview2.rs +57 -0
- data/crates/kobako-wasmtime/src/trap.rs +24 -9
- data/crates/kobako-wasmtime/src/wasi.rs +210 -81
- data/crates/kobako-wasmtime/wit/deps/cli.wit +233 -0
- data/crates/kobako-wasmtime/wit/deps/clocks.wit +162 -0
- data/crates/kobako-wasmtime/wit/deps/filesystem.wit +589 -0
- data/crates/kobako-wasmtime/wit/deps/http.wit +733 -0
- data/crates/kobako-wasmtime/wit/deps/io.wit +299 -0
- data/crates/kobako-wasmtime/wit/deps/random.wit +92 -0
- data/crates/kobako-wasmtime/wit/deps/sockets.wit +949 -0
- data/data/kobako.wasm +0 -0
- data/ext/kobako/Cargo.toml +1 -1
- data/ext/kobako/src/{runtime/errors.rs → errors.rs} +34 -26
- data/ext/kobako/src/{runtime/escape.rs → escape.rs} +42 -11
- data/ext/kobako/src/{runtime/filesystem → filesystem}/grants.rs +30 -26
- data/ext/kobako/src/{runtime/filesystem → filesystem}/ruby.rs +149 -168
- data/ext/kobako/src/{runtime/filesystem.rs → filesystem.rs} +24 -15
- data/ext/kobako/src/gvl.rs +306 -0
- data/ext/kobako/src/lib.rs +64 -3
- data/ext/kobako/src/network/mock.rs +187 -0
- data/ext/kobako/src/network.rs +591 -0
- data/ext/kobako/src/runtime/bridge.rs +30 -29
- data/ext/kobako/src/runtime/snapshot.rs +4 -4
- data/ext/kobako/src/runtime.rs +221 -143
- data/ext/kobako/src/wire.rs +42 -0
- data/lib/kobako/catalog/extensions.rb +14 -2
- data/lib/kobako/catalog/flags.rb +3 -5
- data/lib/kobako/catalog/grants.rb +5 -4
- data/lib/kobako/catalog/handles.rb +5 -27
- data/lib/kobako/catalog/mount.rb +11 -3
- data/lib/kobako/catalog/network.rb +35 -0
- data/lib/kobako/catalog/replacements.rb +28 -0
- data/lib/kobako/catalog/services.rb +5 -19
- data/lib/kobako/catalog/snippets.rb +3 -18
- data/lib/kobako/catalog.rb +3 -0
- data/lib/kobako/codec/{utils.rb → boundary.rb} +4 -2
- data/lib/kobako/codec/decoder.rb +4 -4
- data/lib/kobako/codec/ext_types.rb +3 -3
- data/lib/kobako/codec/handle_walk.rb +3 -43
- data/lib/kobako/codec/value_budget.rb +132 -40
- data/lib/kobako/codec.rb +1 -1
- data/lib/kobako/context.rb +24 -11
- data/lib/kobako/errors.rb +15 -12
- data/lib/kobako/extension.rb +3 -2
- data/lib/kobako/filesystem.rb +9 -2
- data/lib/kobako/handle.rb +2 -2
- data/lib/kobako/names.rb +28 -0
- data/lib/kobako/network.rb +210 -0
- data/lib/kobako/outcome.rb +7 -7
- data/lib/kobako/pool.rb +45 -23
- data/lib/kobako/runtime.rb +3 -2
- data/lib/kobako/sandbox.rb +92 -35
- data/lib/kobako/sandbox_options.rb +41 -106
- data/lib/kobako/transport/argument_wrap.rb +64 -0
- data/lib/kobako/transport/block_failure.rb +1 -1
- data/lib/kobako/transport/dispatcher.rb +6 -6
- data/lib/kobako/transport/exposure.rb +26 -15
- data/lib/kobako/transport/reflection.rb +21 -4
- data/lib/kobako/transport/run.rb +8 -23
- data/lib/kobako/transport/yielder.rb +2 -9
- data/lib/kobako/transport.rb +1 -0
- data/lib/kobako/version.rb +1 -1
- data/lib/kobako.rb +6 -2
- data/release-please-config.json +15 -0
- data/sig/core/thread.rbs +6 -0
- data/sig/kobako/catalog/extensions.rbs +2 -0
- data/sig/kobako/catalog/grants.rbs +7 -4
- data/sig/kobako/catalog/handles.rbs +0 -2
- data/sig/kobako/catalog/mount.rbs +3 -1
- data/sig/kobako/catalog/network.rbs +20 -0
- data/sig/kobako/catalog/replacements.rbs +14 -0
- data/sig/kobako/catalog/services.rbs +0 -4
- data/sig/kobako/catalog/snippets.rbs +0 -2
- data/sig/kobako/codec/{utils.rbs → boundary.rbs} +2 -2
- data/sig/kobako/codec/handle_walk.rbs +0 -6
- data/sig/kobako/codec/value_budget.rbs +47 -4
- data/sig/kobako/context.rbs +3 -1
- data/sig/kobako/errors.rbs +4 -4
- data/sig/kobako/filesystem.rbs +21 -3
- data/sig/kobako/network.rbs +115 -0
- data/sig/kobako/outcome.rbs +1 -1
- data/sig/kobako/pool.rbs +7 -3
- data/sig/kobako/runtime.rbs +32 -3
- data/sig/kobako/sandbox.rbs +19 -2
- data/sig/kobako/sandbox_options.rbs +29 -38
- data/sig/kobako/transport/argument_wrap.rbs +15 -0
- data/sig/kobako/transport/error.rbs +1 -1
- data/sig/kobako/transport/exposure.rbs +2 -4
- data/sig/kobako/transport/reflection.rbs +10 -0
- data/sig/kobako/transport/run.rbs +0 -2
- data/sig/kobako/transport/yielder.rbs +0 -3
- data/sig/kobako/transport.rbs +1 -1
- data/sig/kobako.rbs +13 -0
- metadata +84 -35
- data/crates/kobako-runtime/src/endpoint/capture.rs +0 -115
- data/crates/kobako-runtime/src/endpoint/memory_cap.rs +0 -238
- data/crates/kobako-runtime/src/filesystem/path.rs +0 -21
- data/crates/kobako-runtime/src/vfs/errno.rs +0 -153
- data/crates/kobako-runtime/tests/linux_baseline/calls.rs +0 -171
- data/crates/kobako-runtime/tests/linux_baseline/concurrent.rs +0 -276
- data/crates/kobako-runtime/tests/linux_baseline/kobako.rs +0 -323
- data/crates/kobako-runtime/tests/linux_baseline/linux-baseline-expected.txt +0 -16
- data/crates/kobako-runtime/tests/linux_baseline/linux.rs +0 -449
- data/crates/kobako-runtime/tests/linux_baseline/main.rs +0 -611
- data/crates/kobako-runtime/tests/linux_baseline/permissions.rs +0 -236
- data/crates/kobako-wasmtime/src/descriptors.rs +0 -200
- data/crates/kobako-wasmtime/tests/integration/compile_posture.rs +0 -43
- data/crates/kobako-wasmtime/tests/integration/guest_file.rs +0 -1085
- data/crates/kobako-wasmtime/tests/integration/main.rs +0 -29
- data/crates/kobako-wasmtime/tests/integration/preamble_flags.rs +0 -70
- data/crates/kobako-wasmtime/tests/integration/snippet_compile.rs +0 -95
- data/crates/kobako-wasmtime/tests/integration/support/mod.rs +0 -30
- data/crates/kobako-wasmtime/tests/integration/unanswered_call.rs +0 -86
- data/crates/kobako-wasmtime/tests/integration/unsupported_call.rs +0 -51
- data/ext/kobako/src/runtime/gvl.rs +0 -147
- data/lib/kobako/constant_name.rb +0 -8
- data/sig/kobako/constant_name.rbs +0 -3
- /data/ext/kobako/src/{runtime/pinned_value.rs → pinned_value.rs} +0 -0
|
@@ -32,8 +32,7 @@ impl<'a, 'm> GuestMemory<'a, 'm> {
|
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
-
/// Spend `count` elements of `size` bytes of this call's fuel
|
|
36
|
-
/// wasmtime-wasi spends it before it copies an array.
|
|
35
|
+
/// Spend `count` elements of `size` bytes of this call's fuel.
|
|
37
36
|
pub(crate) fn consume(&self, count: u32, size: u32) -> Answer {
|
|
38
37
|
let cost = u64::from(count) * u64::from(size);
|
|
39
38
|
let left = self.fuel.get().checked_sub(cost).ok_or(Errno::Nomem)?;
|
|
@@ -41,6 +40,13 @@ impl<'a, 'm> GuestMemory<'a, 'm> {
|
|
|
41
40
|
Ok(())
|
|
42
41
|
}
|
|
43
42
|
|
|
43
|
+
/// Spend the fuel `count` elements of `T` take, each sized as the host
|
|
44
|
+
/// holds it, as wasmtime-wasi's `consume_fuel_for_array` spends it
|
|
45
|
+
/// before it copies an array.
|
|
46
|
+
pub(crate) fn consume_array<T>(&self, count: u32) -> Answer {
|
|
47
|
+
self.consume(count, size_of::<T>() as u32)
|
|
48
|
+
}
|
|
49
|
+
|
|
44
50
|
pub(crate) fn bytes(&self, ptr: GuestPtr<[u8]>) -> Answer<&[u8]> {
|
|
45
51
|
require_unshared(self.memory.as_slice(ptr)?)
|
|
46
52
|
}
|
|
@@ -66,7 +72,7 @@ impl<'a, 'm> GuestMemory<'a, 'm> {
|
|
|
66
72
|
|
|
67
73
|
/// A guest path, which preview1 requires to be UTF-8, charged to the
|
|
68
74
|
/// call's fuel before it is read, as wasmtime-wasi charges it.
|
|
69
|
-
pub(crate) fn
|
|
75
|
+
pub(crate) fn read_path(&self, ptr: GuestPtr<str>) -> Answer<String> {
|
|
70
76
|
self.consume(ptr.len(), 1)?;
|
|
71
77
|
let bytes = self.memory.as_cow(ptr.as_bytes())?;
|
|
72
78
|
String::from_utf8(bytes.into_owned()).map_err(|_| Errno::Ilseq.into())
|
|
@@ -76,24 +82,27 @@ impl<'a, 'm> GuestMemory<'a, 'm> {
|
|
|
76
82
|
/// buffer is empty. Like wasmtime-wasi, kobako moves one buffer per call,
|
|
77
83
|
/// and the buffer itself is bounded only once the call has found its
|
|
78
84
|
/// descriptor.
|
|
79
|
-
pub(crate) fn
|
|
80
|
-
self
|
|
85
|
+
pub(crate) fn read_first_non_empty_iovec(
|
|
86
|
+
&self,
|
|
87
|
+
iovs: types::IovecArray,
|
|
88
|
+
) -> Answer<GuestPtr<[u8]>> {
|
|
89
|
+
self.read_first_non_empty(iovs, |iov: types::Iovec| (iov.buf, iov.buf_len))
|
|
81
90
|
}
|
|
82
91
|
|
|
83
|
-
/// The first non-empty buffer of `ciovs`, as `
|
|
84
|
-
pub(crate) fn
|
|
92
|
+
/// The first non-empty buffer of `ciovs`, as `read_first_non_empty_iovec`.
|
|
93
|
+
pub(crate) fn read_first_non_empty_ciovec(
|
|
85
94
|
&self,
|
|
86
95
|
ciovs: types::CiovecArray,
|
|
87
96
|
) -> Answer<GuestPtr<[u8]>> {
|
|
88
|
-
self.
|
|
97
|
+
self.read_first_non_empty(ciovs, |ciov: types::Ciovec| (ciov.buf, ciov.buf_len))
|
|
89
98
|
}
|
|
90
99
|
|
|
91
|
-
fn
|
|
100
|
+
fn read_first_non_empty<T: GuestType>(
|
|
92
101
|
&self,
|
|
93
102
|
array: GuestPtr<[T]>,
|
|
94
103
|
buffer: impl Fn(T) -> (GuestPtr<u8>, u32),
|
|
95
104
|
) -> Answer<GuestPtr<[u8]>> {
|
|
96
|
-
self.
|
|
105
|
+
self.consume_array::<T>(array.len())?;
|
|
97
106
|
for entry in array.iter() {
|
|
98
107
|
let (ptr, len) = buffer(self.memory.read(entry?)?);
|
|
99
108
|
if len != 0 {
|
|
@@ -129,7 +138,7 @@ mod tests {
|
|
|
129
138
|
}
|
|
130
139
|
let mut memory = wiggle::GuestMemory::Unshared(&mut bytes.0);
|
|
131
140
|
let taken = GuestMemory::new(&mut memory, HOSTCALL_FUEL)
|
|
132
|
-
.
|
|
141
|
+
.read_first_non_empty_iovec(GuestPtr::new((0, 3)))
|
|
133
142
|
.unwrap_or_else(|_| panic!("the iovecs must be read"));
|
|
134
143
|
assert_eq!(
|
|
135
144
|
(taken.offset_base(), taken.len()),
|
|
@@ -155,7 +164,7 @@ mod tests {
|
|
|
155
164
|
let answer = |bytes: &mut [u8], count: u32| {
|
|
156
165
|
let mut memory = wiggle::GuestMemory::Unshared(bytes);
|
|
157
166
|
GuestMemory::new(&mut memory, HOSTCALL_FUEL)
|
|
158
|
-
.
|
|
167
|
+
.read_first_non_empty_iovec(GuestPtr::new((0, count)))
|
|
159
168
|
.err()
|
|
160
169
|
.and_then(|err| err.downcast().ok())
|
|
161
170
|
};
|
|
@@ -12,34 +12,23 @@ use std::marker::PhantomData;
|
|
|
12
12
|
use std::sync::Arc;
|
|
13
13
|
|
|
14
14
|
use kobako_runtime::filesystem::{
|
|
15
|
-
DentryOperations, FileOperations, FileSystemType, Filesystem,
|
|
16
|
-
|
|
15
|
+
DentryOperations, FileOperations, FileSystemType, Filesystem, InodeOperations, Kstat, Lookup,
|
|
16
|
+
OpenHow, RenameFlag,
|
|
17
17
|
};
|
|
18
18
|
use kobako_runtime::vfs::{Dentry, Inode};
|
|
19
|
+
use kobako_runtime::Errno;
|
|
19
20
|
|
|
20
21
|
/// What a test changes of the Filesystem beneath it.
|
|
21
22
|
pub(super) trait Hook: Send + Sync + 'static {
|
|
22
|
-
fn getattr(
|
|
23
|
-
&self,
|
|
24
|
-
inner: &dyn InodeOperations,
|
|
25
|
-
dentry: &Dentry,
|
|
26
|
-
) -> Result<Kstat, FilesystemError> {
|
|
23
|
+
fn getattr(&self, inner: &dyn InodeOperations, dentry: &Dentry) -> Result<Kstat, Errno> {
|
|
27
24
|
inner.getattr(dentry)
|
|
28
25
|
}
|
|
29
26
|
|
|
30
|
-
fn lookup(
|
|
31
|
-
&self,
|
|
32
|
-
inner: &dyn InodeOperations,
|
|
33
|
-
dentry: &Dentry,
|
|
34
|
-
) -> Result<Lookup, FilesystemError> {
|
|
27
|
+
fn lookup(&self, inner: &dyn InodeOperations, dentry: &Dentry) -> Result<Lookup, Errno> {
|
|
35
28
|
inner.lookup(dentry)
|
|
36
29
|
}
|
|
37
30
|
|
|
38
|
-
fn fill_super(
|
|
39
|
-
&self,
|
|
40
|
-
fs: Arc<dyn FileSystemType>,
|
|
41
|
-
sb: &mut Filesystem,
|
|
42
|
-
) -> Result<(), FilesystemError> {
|
|
31
|
+
fn fill_super(&self, fs: Arc<dyn FileSystemType>, sb: &mut Filesystem) -> Result<(), Errno> {
|
|
43
32
|
fs.fill_super(sb)
|
|
44
33
|
}
|
|
45
34
|
|
|
@@ -48,31 +37,31 @@ pub(super) trait Hook: Send + Sync + 'static {
|
|
|
48
37
|
inner: &dyn InodeOperations,
|
|
49
38
|
dentry: &Dentry,
|
|
50
39
|
how: &OpenHow,
|
|
51
|
-
) -> Result<Box<dyn FileOperations>,
|
|
40
|
+
) -> Result<Box<dyn FileOperations>, Errno> {
|
|
52
41
|
inner.open(dentry, how)
|
|
53
42
|
}
|
|
54
43
|
|
|
55
|
-
fn mkdir(&self, inner: &dyn InodeOperations, dentry: &Dentry) -> Result<(),
|
|
44
|
+
fn mkdir(&self, inner: &dyn InodeOperations, dentry: &Dentry) -> Result<(), Errno> {
|
|
56
45
|
inner.mkdir(dentry)
|
|
57
46
|
}
|
|
58
47
|
|
|
59
|
-
fn rmdir(&self, inner: &dyn InodeOperations, dentry: &Dentry) -> Result<(),
|
|
48
|
+
fn rmdir(&self, inner: &dyn InodeOperations, dentry: &Dentry) -> Result<(), Errno> {
|
|
60
49
|
inner.rmdir(dentry)
|
|
61
50
|
}
|
|
62
51
|
|
|
63
|
-
fn unlink(&self, inner: &dyn InodeOperations, dentry: &Dentry) -> Result<(),
|
|
52
|
+
fn unlink(&self, inner: &dyn InodeOperations, dentry: &Dentry) -> Result<(), Errno> {
|
|
64
53
|
inner.unlink(dentry)
|
|
65
54
|
}
|
|
66
55
|
|
|
67
56
|
fn rename(
|
|
68
57
|
&self,
|
|
69
58
|
inner: &dyn InodeOperations,
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
) -> Result<(),
|
|
75
|
-
inner.rename(
|
|
59
|
+
old: &Dentry,
|
|
60
|
+
new_dir: &dyn InodeOperations,
|
|
61
|
+
new: &Dentry,
|
|
62
|
+
flags: Option<RenameFlag>,
|
|
63
|
+
) -> Result<(), Errno> {
|
|
64
|
+
inner.rename(old, new_dir, new, flags)
|
|
76
65
|
}
|
|
77
66
|
}
|
|
78
67
|
|
|
@@ -89,7 +78,7 @@ impl<H: Hook> Wrap<H> {
|
|
|
89
78
|
}
|
|
90
79
|
|
|
91
80
|
impl<H: Hook> FileSystemType for Wrap<H> {
|
|
92
|
-
fn fill_super(self: Arc<Self>, sb: &mut Filesystem) -> Result<(),
|
|
81
|
+
fn fill_super(self: Arc<Self>, sb: &mut Filesystem) -> Result<(), Errno> {
|
|
93
82
|
self.hook.fill_super(self.fs.clone(), sb)?;
|
|
94
83
|
if let Some(ops) = sb.d_op().cloned() {
|
|
95
84
|
sb.set_default_d_op(Arc::new(WrapDentry::<H> {
|
|
@@ -142,11 +131,7 @@ struct WrapDentry<H> {
|
|
|
142
131
|
}
|
|
143
132
|
|
|
144
133
|
impl<H: Hook> DentryOperations for WrapDentry<H> {
|
|
145
|
-
fn revalidate(
|
|
146
|
-
&self,
|
|
147
|
-
dir: &dyn InodeOperations,
|
|
148
|
-
dentry: &Dentry,
|
|
149
|
-
) -> Result<bool, FilesystemError> {
|
|
134
|
+
fn revalidate(&self, dir: &dyn InodeOperations, dentry: &Dentry) -> Result<bool, Errno> {
|
|
150
135
|
let dir = (dir as &dyn Any)
|
|
151
136
|
.downcast_ref::<WrapInode<H>>()
|
|
152
137
|
.map_or(dir, |wrap| wrap.inner.as_ref());
|
|
@@ -155,7 +140,7 @@ impl<H: Hook> DentryOperations for WrapDentry<H> {
|
|
|
155
140
|
}
|
|
156
141
|
|
|
157
142
|
impl<H: Hook> InodeOperations for WrapInode<H> {
|
|
158
|
-
fn getattr(&self, dentry: &Dentry) -> Result<Kstat,
|
|
143
|
+
fn getattr(&self, dentry: &Dentry) -> Result<Kstat, Errno> {
|
|
159
144
|
self.hook.getattr(self.inner.as_ref(), dentry)
|
|
160
145
|
}
|
|
161
146
|
|
|
@@ -163,49 +148,45 @@ impl<H: Hook> InodeOperations for WrapInode<H> {
|
|
|
163
148
|
&self,
|
|
164
149
|
dentry: &Dentry,
|
|
165
150
|
attr: &kobako_runtime::filesystem::Iattr,
|
|
166
|
-
) -> Result<(),
|
|
151
|
+
) -> Result<(), Errno> {
|
|
167
152
|
self.inner.setattr(dentry, attr)
|
|
168
153
|
}
|
|
169
154
|
|
|
170
|
-
fn lookup(&self, dentry: &Dentry) -> Result<Lookup,
|
|
155
|
+
fn lookup(&self, dentry: &Dentry) -> Result<Lookup, Errno> {
|
|
171
156
|
Ok(self.wrap(self.hook.lookup(self.inner.as_ref(), dentry)?))
|
|
172
157
|
}
|
|
173
158
|
|
|
174
|
-
fn open(
|
|
175
|
-
&self,
|
|
176
|
-
dentry: &Dentry,
|
|
177
|
-
how: &OpenHow,
|
|
178
|
-
) -> Result<Box<dyn FileOperations>, FilesystemError> {
|
|
159
|
+
fn open(&self, dentry: &Dentry, how: &OpenHow) -> Result<Box<dyn FileOperations>, Errno> {
|
|
179
160
|
self.hook.open(self.inner.as_ref(), dentry, how)
|
|
180
161
|
}
|
|
181
162
|
|
|
182
|
-
fn create(&self, dentry: &Dentry) -> Result<(),
|
|
163
|
+
fn create(&self, dentry: &Dentry) -> Result<(), Errno> {
|
|
183
164
|
self.inner.create(dentry)
|
|
184
165
|
}
|
|
185
166
|
|
|
186
|
-
fn mkdir(&self, dentry: &Dentry) -> Result<(),
|
|
167
|
+
fn mkdir(&self, dentry: &Dentry) -> Result<(), Errno> {
|
|
187
168
|
self.hook.mkdir(self.inner.as_ref(), dentry)
|
|
188
169
|
}
|
|
189
170
|
|
|
190
|
-
fn rmdir(&self, dentry: &Dentry) -> Result<(),
|
|
171
|
+
fn rmdir(&self, dentry: &Dentry) -> Result<(), Errno> {
|
|
191
172
|
self.hook.rmdir(self.inner.as_ref(), dentry)
|
|
192
173
|
}
|
|
193
174
|
|
|
194
|
-
fn unlink(&self, dentry: &Dentry) -> Result<(),
|
|
175
|
+
fn unlink(&self, dentry: &Dentry) -> Result<(), Errno> {
|
|
195
176
|
self.hook.unlink(self.inner.as_ref(), dentry)
|
|
196
177
|
}
|
|
197
178
|
|
|
198
179
|
fn rename(
|
|
199
180
|
&self,
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
) -> Result<(),
|
|
205
|
-
let target = (
|
|
181
|
+
old: &Dentry,
|
|
182
|
+
new_dir: &dyn InodeOperations,
|
|
183
|
+
new: &Dentry,
|
|
184
|
+
flags: Option<RenameFlag>,
|
|
185
|
+
) -> Result<(), Errno> {
|
|
186
|
+
let target = (new_dir as &dyn Any)
|
|
206
187
|
.downcast_ref::<Self>()
|
|
207
|
-
.ok_or(
|
|
188
|
+
.ok_or(Errno::CrossesDevices)?;
|
|
208
189
|
self.hook
|
|
209
|
-
.rename(self.inner.as_ref(),
|
|
190
|
+
.rename(self.inner.as_ref(), old, target.inner.as_ref(), new, flags)
|
|
210
191
|
}
|
|
211
192
|
}
|