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
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
|
|
4
4
|
use std::sync::Arc;
|
|
5
5
|
|
|
6
|
-
use super::super::super::{
|
|
6
|
+
use super::super::super::{Errno, FileType, InodeOperations, Kstat};
|
|
7
7
|
use super::super::inode::{ovl_inode_init, OverlayDirInode, OverlayFileInode};
|
|
8
8
|
use super::{entry, layer_dir, LayerEntry, Level, OverlayFs, Presence, UPPER};
|
|
9
9
|
use crate::vfs::{Dentry, Inode};
|
|
@@ -15,7 +15,7 @@ impl OverlayFs {
|
|
|
15
15
|
&self,
|
|
16
16
|
level: &Level,
|
|
17
17
|
name: &str,
|
|
18
|
-
) -> Result<Option<(usize, LayerEntry)>,
|
|
18
|
+
) -> Result<Option<(usize, LayerEntry)>, Errno> {
|
|
19
19
|
for (index, dir) in level.iter().enumerate() {
|
|
20
20
|
let Some(dir) = dir else {
|
|
21
21
|
continue;
|
|
@@ -38,7 +38,7 @@ impl OverlayFs {
|
|
|
38
38
|
level: &Level,
|
|
39
39
|
name: &str,
|
|
40
40
|
(at, top): (usize, LayerEntry),
|
|
41
|
-
) -> Result<Level,
|
|
41
|
+
) -> Result<Level, Errno> {
|
|
42
42
|
let mut merged = vec![None; level.len()];
|
|
43
43
|
let top = layer_dir(&level[at])?.beneath(top.dentry);
|
|
44
44
|
let opaque = top.is_opaque();
|
|
@@ -51,7 +51,7 @@ impl OverlayFs {
|
|
|
51
51
|
continue;
|
|
52
52
|
};
|
|
53
53
|
match entry(dir, name)? {
|
|
54
|
-
Presence::Entry(found) if found.
|
|
54
|
+
Presence::Entry(found) if found.file_type() == Ok(FileType::Dir) => {
|
|
55
55
|
let inner = dir.beneath(found.dentry);
|
|
56
56
|
let opaque = inner.is_opaque();
|
|
57
57
|
merged[index] = Some(inner);
|
|
@@ -70,9 +70,9 @@ impl OverlayFs {
|
|
|
70
70
|
/// reports a merged one: what its topmost Layer reports, under the identity
|
|
71
71
|
/// of the topmost lower Layer showing it, as `ovl_path_lower` finds it, so
|
|
72
72
|
/// copying it up leaves the identity as it was, and one name.
|
|
73
|
-
pub(in super::super) fn dir_getattr(&self, level: &Level) -> Result<Kstat,
|
|
73
|
+
pub(in super::super) fn dir_getattr(&self, level: &Level) -> Result<Kstat, Errno> {
|
|
74
74
|
let mut shown = level.iter().flatten();
|
|
75
|
-
let topmost = shown.next().ok_or(
|
|
75
|
+
let topmost = shown.next().ok_or(Errno::NotFound)?.getattr()?;
|
|
76
76
|
Ok(match shown.next() {
|
|
77
77
|
Some(lower) => {
|
|
78
78
|
let lower = lower.getattr()?;
|
|
@@ -93,8 +93,8 @@ impl OverlayFs {
|
|
|
93
93
|
name: &str,
|
|
94
94
|
(index, found): (usize, LayerEntry),
|
|
95
95
|
ops_of: impl Fn(FileType) -> Arc<dyn InodeOperations>,
|
|
96
|
-
) -> Result<Arc<Inode>,
|
|
97
|
-
let kind = found.
|
|
96
|
+
) -> Result<Arc<Inode>, Errno> {
|
|
97
|
+
let kind = found.file_type()?;
|
|
98
98
|
let ops = ops_of(kind);
|
|
99
99
|
if kind != FileType::Dir {
|
|
100
100
|
let inode = self.file_inode(index, &found.dentry, ops)?;
|
|
@@ -106,7 +106,7 @@ impl OverlayFs {
|
|
|
106
106
|
let inode = match merged.iter().flatten().count() {
|
|
107
107
|
1 => {
|
|
108
108
|
let real = layer_dir(&merged[index])?.dentry();
|
|
109
|
-
let found = real.inode().ok_or(
|
|
109
|
+
let found = real.inode().ok_or(Errno::NotFound)?;
|
|
110
110
|
found.with_ops(ops)
|
|
111
111
|
}
|
|
112
112
|
_ => Inode::new(&self.dir_getattr(&merged)?, ops),
|
|
@@ -124,11 +124,11 @@ impl OverlayFs {
|
|
|
124
124
|
index: usize,
|
|
125
125
|
real: &Dentry,
|
|
126
126
|
ops: Arc<dyn InodeOperations>,
|
|
127
|
-
) -> Result<Arc<Inode>,
|
|
128
|
-
let found = real.inode().ok_or(
|
|
127
|
+
) -> Result<Arc<Inode>, Errno> {
|
|
128
|
+
let found = real.inode().ok_or(Errno::NotFound)?;
|
|
129
129
|
let breaks = self.has_upper() && index != UPPER && real.getattr()?.nlink > 1;
|
|
130
130
|
Ok(match breaks {
|
|
131
|
-
true => Inode::new(&Kstat::new(found.
|
|
131
|
+
true => Inode::new(&Kstat::new(found.file_type(), 0), ops),
|
|
132
132
|
false => found.with_ops(ops),
|
|
133
133
|
})
|
|
134
134
|
}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
|
|
4
4
|
use std::collections::HashSet;
|
|
5
5
|
|
|
6
|
-
use super::super::super::{DirEntry,
|
|
6
|
+
use super::super::super::{DirEntry, Errno, FileType};
|
|
7
7
|
use super::{Level, OverlayFs, UPPER};
|
|
8
8
|
use crate::vfs::Dentry;
|
|
9
9
|
|
|
@@ -16,7 +16,7 @@ struct MergedEntries {
|
|
|
16
16
|
|
|
17
17
|
/// Each Layer's entries topmost first, a name a Layer above shows or whites
|
|
18
18
|
/// out taken once.
|
|
19
|
-
fn read_merged(level: &Level) -> Result<MergedEntries,
|
|
19
|
+
fn read_merged(level: &Level) -> Result<MergedEntries, Errno> {
|
|
20
20
|
let mut merged = MergedEntries {
|
|
21
21
|
entries: Vec::new(),
|
|
22
22
|
upper_whiteouts: false,
|
|
@@ -40,17 +40,14 @@ fn read_merged(level: &Level) -> Result<MergedEntries, FilesystemError> {
|
|
|
40
40
|
impl OverlayFs {
|
|
41
41
|
/// Each Layer's entries topmost first, a name a Layer above shows or
|
|
42
42
|
/// whites out taken once. A lookup left out what an opaque directory hides.
|
|
43
|
-
pub(in super::super) fn dir_read_merged(
|
|
44
|
-
&self,
|
|
45
|
-
level: &Level,
|
|
46
|
-
) -> Result<Vec<DirEntry>, FilesystemError> {
|
|
43
|
+
pub(in super::super) fn dir_read_merged(&self, level: &Level) -> Result<Vec<DirEntry>, Errno> {
|
|
47
44
|
Ok(read_merged(level)?.entries)
|
|
48
45
|
}
|
|
49
46
|
|
|
50
47
|
/// Whether the directory `dentry` names shows no entry, `None` where it
|
|
51
48
|
/// shows one, and otherwise whether its upper holds whiteouts to clear
|
|
52
49
|
/// first, as `ovl_check_empty_dir` hands `ovl_clear_empty` its list.
|
|
53
|
-
pub(super) fn check_empty_dir(&self, dentry: &Dentry) -> Result<Option<bool>,
|
|
50
|
+
pub(super) fn check_empty_dir(&self, dentry: &Dentry) -> Result<Option<bool>, Errno> {
|
|
54
51
|
let merged = read_merged(&self.dir(dentry)?.level())?;
|
|
55
52
|
Ok(merged.entries.is_empty().then_some(merged.upper_whiteouts))
|
|
56
53
|
}
|
|
@@ -19,13 +19,15 @@ mod namei;
|
|
|
19
19
|
mod readdir;
|
|
20
20
|
|
|
21
21
|
use std::sync::atomic::{AtomicU64, Ordering};
|
|
22
|
-
use std::sync::Arc;
|
|
22
|
+
use std::sync::{Arc, Mutex};
|
|
23
23
|
|
|
24
24
|
use super::inode::OverlayDirInode;
|
|
25
25
|
use super::path::OverlayPath;
|
|
26
26
|
|
|
27
|
-
use super::super::{FileOperations, FileType, Filesystem,
|
|
28
|
-
use crate::
|
|
27
|
+
use super::super::{Errno, FileOperations, FileType, Filesystem, Kiocb};
|
|
28
|
+
use crate::cred::Cred;
|
|
29
|
+
use crate::sched::fatal_signal_pending;
|
|
30
|
+
use crate::vfs::{Dentry, Identity};
|
|
29
31
|
|
|
30
32
|
/// The directories of the upper Tmpfs holding the view's changes and the
|
|
31
33
|
/// changes being built, as overlayfs's `upperdir` and `workdir`.
|
|
@@ -82,29 +84,27 @@ impl LayerEntry {
|
|
|
82
84
|
}
|
|
83
85
|
|
|
84
86
|
/// What kind of entry it is, as its lookup recorded it.
|
|
85
|
-
fn
|
|
86
|
-
self.dentry.
|
|
87
|
+
fn file_type(&self) -> Result<FileType, Errno> {
|
|
88
|
+
self.dentry.file_type()
|
|
87
89
|
}
|
|
88
90
|
}
|
|
89
91
|
|
|
90
92
|
impl Presence {
|
|
91
93
|
fn is_directory(&self) -> bool {
|
|
92
|
-
matches!(self, Self::Entry(found) if found.
|
|
94
|
+
matches!(self, Self::Entry(found) if found.file_type() == Ok(FileType::Dir))
|
|
93
95
|
}
|
|
94
96
|
}
|
|
95
97
|
|
|
96
98
|
/// What `dir` shows at `name`, read from one lookup, as `ovl_lookup_single` reads
|
|
97
99
|
/// `ovl_is_whiteout` and `d_is_dir` from the dentry it found.
|
|
98
|
-
fn entry(dir: &OverlayPath, name: &str) -> Result<Presence,
|
|
100
|
+
fn entry(dir: &OverlayPath, name: &str) -> Result<Presence, Errno> {
|
|
99
101
|
match dir.lookup_single(name) {
|
|
100
|
-
Ok(Some((
|
|
102
|
+
Ok(Some((stored_name, _))) if dir.is_whiteout(&stored_name) => Ok(Presence::Whiteout),
|
|
101
103
|
Ok(Some((stored_name, dentry))) => Ok(Presence::Entry(LayerEntry {
|
|
102
104
|
stored_name,
|
|
103
105
|
dentry,
|
|
104
106
|
})),
|
|
105
|
-
Ok(None) | Err(
|
|
106
|
-
Ok(Presence::Nothing)
|
|
107
|
-
}
|
|
107
|
+
Ok(None) | Err(Errno::NotFound | Errno::InvalidFilename) => Ok(Presence::Nothing),
|
|
108
108
|
Err(err) => Err(err),
|
|
109
109
|
}
|
|
110
110
|
}
|
|
@@ -123,42 +123,49 @@ fn ovl_lower_positive(level: &Level, name: &str) -> bool {
|
|
|
123
123
|
false
|
|
124
124
|
}
|
|
125
125
|
|
|
126
|
+
/// Copy the `len` bytes the lower file held when asked, a chunk at a time, as
|
|
127
|
+
/// `ovl_copy_up_file` does: a run past its deadline or interrupted stops
|
|
128
|
+
/// between chunks with EINTR, and a file that ended sooner stops the copy.
|
|
126
129
|
fn copy_whole(
|
|
127
130
|
source: &mut dyn FileOperations,
|
|
128
131
|
target: &mut dyn FileOperations,
|
|
129
|
-
|
|
132
|
+
len: u64,
|
|
133
|
+
) -> Result<(), Errno> {
|
|
130
134
|
let mut buf = vec![0; 64 * 1024];
|
|
131
|
-
let (mut from, mut to) = (Kiocb::
|
|
132
|
-
|
|
133
|
-
|
|
135
|
+
let (mut from, mut to) = (Kiocb::new(0), Kiocb::new(0));
|
|
136
|
+
let mut left = len;
|
|
137
|
+
while left > 0 {
|
|
138
|
+
if fatal_signal_pending() {
|
|
139
|
+
return Err(Errno::Interrupted);
|
|
140
|
+
}
|
|
141
|
+
let chunk = buf.len().min(usize::try_from(left).unwrap_or(usize::MAX));
|
|
142
|
+
let read = source.read_iter(&mut from, &mut buf[..chunk])?;
|
|
134
143
|
if read == 0 {
|
|
135
144
|
return Ok(());
|
|
136
145
|
}
|
|
146
|
+
left -= read as u64;
|
|
137
147
|
let mut written = 0;
|
|
138
148
|
while written < read {
|
|
139
149
|
match target.write_iter(&mut to, &buf[written..read])? {
|
|
140
|
-
0 =>
|
|
141
|
-
return Err(FilesystemError::Other(
|
|
142
|
-
"a copy up's write wrote nothing".to_string(),
|
|
143
|
-
))
|
|
144
|
-
}
|
|
150
|
+
0 => return Err(Errno::Other("a copy up's write wrote nothing".to_string())),
|
|
145
151
|
wrote => written += wrote,
|
|
146
152
|
}
|
|
147
153
|
}
|
|
148
154
|
}
|
|
155
|
+
Ok(())
|
|
149
156
|
}
|
|
150
157
|
|
|
151
158
|
/// The Layer's directory a level holds, which it holds wherever it shows
|
|
152
159
|
/// a name.
|
|
153
|
-
fn layer_dir(dir: &Option<OverlayPath>) -> Result<&OverlayPath,
|
|
154
|
-
dir.as_ref().ok_or(
|
|
160
|
+
fn layer_dir(dir: &Option<OverlayPath>) -> Result<&OverlayPath, Errno> {
|
|
161
|
+
dir.as_ref().ok_or(Errno::NotFound)
|
|
155
162
|
}
|
|
156
163
|
|
|
157
164
|
/// The directory `name` in `root`, made there first if it stands nowhere, as
|
|
158
165
|
/// overlayfs's `ovl_workdir_create` makes its upperdir's sibling.
|
|
159
|
-
fn ovl_workdir_create(root: &OverlayPath, name: &str) -> Result<OverlayPath,
|
|
166
|
+
fn ovl_workdir_create(root: &OverlayPath, name: &str) -> Result<OverlayPath, Errno> {
|
|
160
167
|
match root.do_mkdir(name) {
|
|
161
|
-
Ok(()) | Err(
|
|
168
|
+
Ok(()) | Err(Errno::AlreadyExists) => root.open_dir(name),
|
|
162
169
|
Err(err) => Err(err),
|
|
163
170
|
}
|
|
164
171
|
}
|
|
@@ -166,7 +173,7 @@ fn ovl_workdir_create(root: &OverlayPath, name: &str) -> Result<OverlayPath, Fil
|
|
|
166
173
|
/// Take `name` out of `dir`, a directory only once it is empty, as
|
|
167
174
|
/// overlayfs's `ovl_cleanup` takes away what a change left in its
|
|
168
175
|
/// workdir, so whatever another writer made in it meanwhile stays.
|
|
169
|
-
fn ovl_cleanup(dir: &OverlayPath, name: &str) -> Result<(),
|
|
176
|
+
fn ovl_cleanup(dir: &OverlayPath, name: &str) -> Result<(), Errno> {
|
|
170
177
|
match dir.getattr_at(name)?.file_type {
|
|
171
178
|
FileType::Dir => dir.do_rmdir(name),
|
|
172
179
|
_ => dir.do_unlink(name),
|
|
@@ -176,7 +183,7 @@ fn ovl_cleanup(dir: &OverlayPath, name: &str) -> Result<(), FilesystemError> {
|
|
|
176
183
|
/// Take the whiteouts out of the directory `name` in `dir`, and nothing
|
|
177
184
|
/// else, as overlayfs's `ovl_cleanup_whiteouts` does before it removes
|
|
178
185
|
/// one; anything else stands there leaves it holding that.
|
|
179
|
-
fn ovl_cleanup_whiteouts(dir: &OverlayPath, name: &str) -> Result<(),
|
|
186
|
+
fn ovl_cleanup_whiteouts(dir: &OverlayPath, name: &str) -> Result<(), Errno> {
|
|
180
187
|
if dir.getattr_at(name)?.file_type != FileType::Dir {
|
|
181
188
|
return Ok(());
|
|
182
189
|
}
|
|
@@ -191,7 +198,7 @@ fn ovl_cleanup_whiteouts(dir: &OverlayPath, name: &str) -> Result<(), Filesystem
|
|
|
191
198
|
|
|
192
199
|
/// Take `name` out of the workdir with all it holds, as overlayfs's
|
|
193
200
|
/// `ovl_workdir_cleanup` empties it of what an earlier mount left.
|
|
194
|
-
fn ovl_workdir_cleanup(dir: &OverlayPath, name: &str) -> Result<(),
|
|
201
|
+
fn ovl_workdir_cleanup(dir: &OverlayPath, name: &str) -> Result<(), Errno> {
|
|
195
202
|
let mut pending = vec![(dir.clone(), name.to_string())];
|
|
196
203
|
while let Some((dir, name)) = pending.last().cloned() {
|
|
197
204
|
if dir.getattr_at(&name)?.file_type != FileType::Dir {
|
|
@@ -221,6 +228,9 @@ pub(super) struct OverlayFs {
|
|
|
221
228
|
work: Option<OverlayPath>,
|
|
222
229
|
/// The next name a change built in `work` takes.
|
|
223
230
|
temp: Arc<AtomicU64>,
|
|
231
|
+
/// Names in `work` whose cleanup a run's end cut short, taken out before
|
|
232
|
+
/// the next change is built there.
|
|
233
|
+
unfinished: Arc<Mutex<Vec<String>>>,
|
|
224
234
|
}
|
|
225
235
|
|
|
226
236
|
impl OverlayFs {
|
|
@@ -230,7 +240,7 @@ impl OverlayFs {
|
|
|
230
240
|
pub(super) fn new(
|
|
231
241
|
lower: Vec<Arc<Filesystem>>,
|
|
232
242
|
upper: Option<Arc<Filesystem>>,
|
|
233
|
-
) -> Result<Self,
|
|
243
|
+
) -> Result<Self, Errno> {
|
|
234
244
|
let mut roots = vec![None];
|
|
235
245
|
let mut work = None;
|
|
236
246
|
let creator_cred = Cred::new(Vec::new());
|
|
@@ -252,6 +262,7 @@ impl OverlayFs {
|
|
|
252
262
|
roots,
|
|
253
263
|
work,
|
|
254
264
|
temp: Arc::default(),
|
|
265
|
+
unfinished: Arc::default(),
|
|
255
266
|
})
|
|
256
267
|
}
|
|
257
268
|
|
|
@@ -274,9 +285,9 @@ impl OverlayFs {
|
|
|
274
285
|
|
|
275
286
|
/// The directory of the view `dentry` names, its state found on the inode
|
|
276
287
|
/// its lookup, or the mount for the root, recorded.
|
|
277
|
-
pub(super) fn dir(&self, dentry: &Dentry) -> Result<ViewDir,
|
|
278
|
-
let inode = dentry.inode().ok_or(
|
|
279
|
-
let inode = OverlayDirInode::of(&inode).ok_or(
|
|
288
|
+
pub(super) fn dir(&self, dentry: &Dentry) -> Result<ViewDir, Errno> {
|
|
289
|
+
let inode = dentry.inode().ok_or(Errno::NotFound)?;
|
|
290
|
+
let inode = OverlayDirInode::of(&inode).ok_or(Errno::NotADirectory)?;
|
|
280
291
|
Ok(ViewDir {
|
|
281
292
|
dentry: dentry.get(),
|
|
282
293
|
inode,
|
|
@@ -284,18 +295,91 @@ impl OverlayFs {
|
|
|
284
295
|
}
|
|
285
296
|
|
|
286
297
|
/// The directory holding the entry `dentry` names.
|
|
287
|
-
pub(super) fn parent(&self, dentry: &Dentry) -> Result<ViewDir,
|
|
298
|
+
pub(super) fn parent(&self, dentry: &Dentry) -> Result<ViewDir, Errno> {
|
|
288
299
|
self.dir(&dentry.parent())
|
|
289
300
|
}
|
|
290
301
|
|
|
291
302
|
/// The workdir and a name in it no change has taken, as overlayfs's
|
|
292
303
|
/// `ovl_tempname` names one.
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
304
|
+
/// What a run's end left there is taken out first, so it never outlives
|
|
305
|
+
/// the next change.
|
|
306
|
+
fn tempname(&self) -> Result<(&OverlayPath, String), Errno> {
|
|
307
|
+
let work = self.work.as_ref().ok_or(Errno::ReadOnlyFilesystem)?;
|
|
308
|
+
let unfinished = std::mem::take(&mut *self.unfinished());
|
|
309
|
+
for temp in unfinished {
|
|
310
|
+
self.cleanup_temp(work, &temp);
|
|
311
|
+
}
|
|
298
312
|
let next = self.temp.fetch_add(1, Ordering::Relaxed);
|
|
299
313
|
Ok((work, format!("#{next:x}")))
|
|
300
314
|
}
|
|
315
|
+
|
|
316
|
+
/// Take `temp`, a change built in `work`, out with its whiteouts, as
|
|
317
|
+
/// overlayfs's `ovl_cleanup` does. Its locks wait as every wait does, so a
|
|
318
|
+
/// run that must end leaves it for the next `tempname`; anything else
|
|
319
|
+
/// keeping it, such as another writer's entry, leaves it as overlayfs
|
|
320
|
+
/// leaves a cleanup it cannot finish.
|
|
321
|
+
pub(super) fn cleanup_temp(&self, work: &OverlayPath, temp: &str) {
|
|
322
|
+
let cleaned = ovl_cleanup_whiteouts(work, temp).and_then(|()| ovl_cleanup(work, temp));
|
|
323
|
+
if cleaned == Err(Errno::Interrupted) {
|
|
324
|
+
self.unfinished().push(temp.to_string());
|
|
325
|
+
}
|
|
326
|
+
}
|
|
327
|
+
|
|
328
|
+
fn unfinished(&self) -> std::sync::MutexGuard<'_, Vec<String>> {
|
|
329
|
+
self.unfinished
|
|
330
|
+
.lock()
|
|
331
|
+
.unwrap_or_else(std::sync::PoisonError::into_inner)
|
|
332
|
+
}
|
|
333
|
+
}
|
|
334
|
+
|
|
335
|
+
#[cfg(test)]
|
|
336
|
+
mod tests {
|
|
337
|
+
use std::time::Instant;
|
|
338
|
+
|
|
339
|
+
use super::*;
|
|
340
|
+
use crate::filesystem::Tmpfs;
|
|
341
|
+
|
|
342
|
+
// Another thread holds the workdir's lock as this run's deadline passes,
|
|
343
|
+
// so its cleanup is cut short and only the next change takes it out.
|
|
344
|
+
// @behavior FS-215
|
|
345
|
+
#[test]
|
|
346
|
+
fn a_cleanup_a_runs_end_cut_short_is_finished_by_the_next_change() {
|
|
347
|
+
let upper = Filesystem::new(Tmpfs::new()).expect("the instance must stand");
|
|
348
|
+
let lower = Filesystem::new(Tmpfs::new()).expect("the instance must stand");
|
|
349
|
+
let fs = OverlayFs::new(vec![lower], Some(upper)).expect("the Overlay must stack");
|
|
350
|
+
let (work, temp) = fs.tempname().expect("the workdir must name a change");
|
|
351
|
+
work.do_mkdir(&temp).expect("the change must be built");
|
|
352
|
+
let (held, taken) = std::sync::mpsc::channel();
|
|
353
|
+
let (release, released) = std::sync::mpsc::channel::<()>();
|
|
354
|
+
std::thread::scope(|scope| {
|
|
355
|
+
let holder = scope.spawn(move || {
|
|
356
|
+
let _lock = work
|
|
357
|
+
.dentry()
|
|
358
|
+
.inode_lock()
|
|
359
|
+
.expect("the workdir lock must be taken");
|
|
360
|
+
held.send(()).expect("the test must wait for the lock");
|
|
361
|
+
released.recv().ok();
|
|
362
|
+
});
|
|
363
|
+
taken.recv().expect("the holder must take the lock");
|
|
364
|
+
crate::sched::run_task(Some(Instant::now()), || fs.cleanup_temp(work, &temp));
|
|
365
|
+
release
|
|
366
|
+
.send(())
|
|
367
|
+
.expect("the holder must wait for its release");
|
|
368
|
+
crate::sched::testing::join_scoped("the lock holder", holder);
|
|
369
|
+
});
|
|
370
|
+
let left = names_in(work);
|
|
371
|
+
fs.tempname()
|
|
372
|
+
.expect("the workdir must name the next change");
|
|
373
|
+
assert_eq!(
|
|
374
|
+
(left, names_in(work)),
|
|
375
|
+
(vec![temp], Vec::<String>::new()),
|
|
376
|
+
"a change in an Overlay's workdir whose cleanup a run's end cut short must stay only \
|
|
377
|
+
until the next change is named there"
|
|
378
|
+
);
|
|
379
|
+
}
|
|
380
|
+
|
|
381
|
+
fn names_in(dir: &OverlayPath) -> Vec<String> {
|
|
382
|
+
let entries = dir.entries().expect("the workdir must list");
|
|
383
|
+
entries.into_iter().map(|entry| entry.name).collect()
|
|
384
|
+
}
|
|
301
385
|
}
|