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
|
@@ -0,0 +1,305 @@
|
|
|
1
|
+
//! The resource table preview2 hands the guest its handles from, as
|
|
2
|
+
//! wasmtime's `ResourceTable` is: it numbers its own, apart from preview1's
|
|
3
|
+
//! descriptors, holds every file either encoding opens and counts each
|
|
4
|
+
//! against the open files, and charges every entry the guest makes to the
|
|
5
|
+
//! Invocation's memory, as Linux's `filp` cache is accounted to the memory
|
|
6
|
+
//! cgroup of the task that allocates it.
|
|
7
|
+
|
|
8
|
+
use std::any::Any;
|
|
9
|
+
use std::collections::BTreeMap;
|
|
10
|
+
use std::sync::Arc;
|
|
11
|
+
|
|
12
|
+
use kobako_runtime::memcg::{MemoryBudget, MemoryCharge};
|
|
13
|
+
use kobako_runtime::vfs::OpenFiles;
|
|
14
|
+
use kobako_runtime::Errno;
|
|
15
|
+
|
|
16
|
+
/// A guest's handle to one kind of resource, as wasmtime's `Resource<T>`
|
|
17
|
+
/// names the host type `T` its index stands for. The bindings implement it
|
|
18
|
+
/// for each WIT resource, as `bindgen!` takes `with:`.
|
|
19
|
+
pub(crate) trait Handle: Copy {
|
|
20
|
+
type Host: Any + Send;
|
|
21
|
+
|
|
22
|
+
fn new(index: u32) -> Self;
|
|
23
|
+
|
|
24
|
+
fn index(self) -> u32;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
/// The most entries the resource table holds, as wasmtime's
|
|
28
|
+
/// `ResourceTable::max_capacity` bounds a table.
|
|
29
|
+
pub(crate) const MAX_TABLE_ENTRIES: usize = 1_000_000;
|
|
30
|
+
|
|
31
|
+
/// The memory one entry holding a resource of kind `H` takes.
|
|
32
|
+
fn bytes_of<H: Handle>() -> usize {
|
|
33
|
+
size_of::<Entry>() + size_of::<H::Host>()
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
/// One handle's resource, and the handle it is a child of, as wasmtime's
|
|
37
|
+
/// `ResourceTable` keeps each entry's parent.
|
|
38
|
+
struct Entry {
|
|
39
|
+
resource: Box<dyn Any + Send>,
|
|
40
|
+
parent: Option<u32>,
|
|
41
|
+
children: usize,
|
|
42
|
+
/// The lends out on it, as the Canonical ABI counts a handle's lends;
|
|
43
|
+
/// its drop traps while any is out.
|
|
44
|
+
lends: usize,
|
|
45
|
+
/// Whether it counts against the open files, as a host-side producer
|
|
46
|
+
/// does and a view does not.
|
|
47
|
+
counted: bool,
|
|
48
|
+
/// What the entry and its resource hold, against the Invocation's
|
|
49
|
+
/// memory, as each `struct file` is charged through `SLAB_ACCOUNT`.
|
|
50
|
+
_memory: MemoryCharge,
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
/// The room one file takes in the table before it opens, as Linux's
|
|
54
|
+
/// `get_unused_fd_flags` counts it and `alloc_empty_file` charges it before
|
|
55
|
+
/// the walk. Dropped unused, it gives both back.
|
|
56
|
+
pub(crate) struct FileRoom {
|
|
57
|
+
count: FileCount,
|
|
58
|
+
memory: MemoryCharge,
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
/// One file counted against the open files until the table takes it over.
|
|
62
|
+
struct FileCount(Option<OpenFiles>);
|
|
63
|
+
|
|
64
|
+
impl Drop for FileCount {
|
|
65
|
+
fn drop(&mut self) {
|
|
66
|
+
if let Some(open_files) = self.0.take() {
|
|
67
|
+
open_files.close();
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
pub(crate) struct Table {
|
|
73
|
+
entries: BTreeMap<u32, Entry>,
|
|
74
|
+
/// The numbers given back, the latest taken first, as wasmtime's
|
|
75
|
+
/// `ResourceTable` reuses its free list.
|
|
76
|
+
free: Vec<u32>,
|
|
77
|
+
/// The number past every one handed out so far.
|
|
78
|
+
next: u32,
|
|
79
|
+
open_files: OpenFiles,
|
|
80
|
+
memory: Arc<MemoryBudget>,
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
impl Table {
|
|
84
|
+
/// A table holding nothing, counting its files against `open_files` and
|
|
85
|
+
/// its entries against `memory`. Numbers start at 1, as the Canonical ABI
|
|
86
|
+
/// keeps 0 for no handle.
|
|
87
|
+
pub(crate) fn new(open_files: OpenFiles, memory: Arc<MemoryBudget>) -> Self {
|
|
88
|
+
Self {
|
|
89
|
+
entries: BTreeMap::new(),
|
|
90
|
+
free: Vec::new(),
|
|
91
|
+
next: 1,
|
|
92
|
+
open_files,
|
|
93
|
+
memory,
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
/// The room a host-side producer's file takes, as a socket's, a
|
|
98
|
+
/// lookup's, or an exchange's does: none past the open file limit, which
|
|
99
|
+
/// each WIT answers with its own code, as Linux's `socket()` answers
|
|
100
|
+
/// EMFILE; a trap past the Invocation's memory, since no WIT constructor
|
|
101
|
+
/// has an error for it.
|
|
102
|
+
pub(crate) fn reserve_producer<H: Handle>(&self) -> wasmtime::Result<Option<FileRoom>> {
|
|
103
|
+
match self.reserve_file::<H>() {
|
|
104
|
+
Ok(room) => Ok(Some(room)),
|
|
105
|
+
Err(Errno::OutOfMemory) => Err(wasmtime::Error::msg(
|
|
106
|
+
"the guest's resources outgrow its memory",
|
|
107
|
+
)),
|
|
108
|
+
Err(_) => Ok(None),
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
/// The room a file of kind `H` takes, refused as EMFILE past the open
|
|
113
|
+
/// file limit or a full table, and as ENOMEM past the Invocation's
|
|
114
|
+
/// memory, both before the file opens.
|
|
115
|
+
pub(crate) fn reserve_file<H: Handle>(&self) -> Result<FileRoom, Errno> {
|
|
116
|
+
self.reserve(bytes_of::<H>())
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
/// The room a file the Driver opened before the guest runs takes: counted
|
|
120
|
+
/// against the open files, and charged to none of the guest's memory, as
|
|
121
|
+
/// Linux charges a `struct file` to the task that allocates it.
|
|
122
|
+
pub(crate) fn reserve_inherited_file(&self) -> Result<FileRoom, Errno> {
|
|
123
|
+
self.reserve(0)
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
fn reserve(&self, bytes: usize) -> Result<FileRoom, Errno> {
|
|
127
|
+
if self.is_full() {
|
|
128
|
+
return Err(Errno::TooManyOpenFiles);
|
|
129
|
+
}
|
|
130
|
+
self.open_files.open()?;
|
|
131
|
+
let count = FileCount(Some(self.open_files.clone()));
|
|
132
|
+
let memory = MemoryCharge::new(&self.memory, bytes)?;
|
|
133
|
+
Ok(FileRoom { count, memory })
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
/// Hand out a handle for `resource`, a file opened into `room`.
|
|
137
|
+
pub(crate) fn install<H: Handle>(&mut self, room: FileRoom, resource: H::Host) -> H {
|
|
138
|
+
let FileRoom { mut count, memory } = room;
|
|
139
|
+
count.0 = None;
|
|
140
|
+
H::new(self.place(Box::new(resource), None, true, memory))
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
/// Hand out a handle for `resource`, a view that holds no file of its
|
|
144
|
+
/// own; refused past `MAX_TABLE_ENTRIES`.
|
|
145
|
+
pub(crate) fn push<H: Handle>(&mut self, resource: H::Host) -> wasmtime::Result<H> {
|
|
146
|
+
self.insert::<H>(resource, None).map(H::new)
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
/// Hand out a handle for `resource` as a child of `parent`, which cannot
|
|
150
|
+
/// be dropped while it lives, as the WIT has a parent's drop trap.
|
|
151
|
+
pub(crate) fn push_child<H: Handle>(
|
|
152
|
+
&mut self,
|
|
153
|
+
resource: H::Host,
|
|
154
|
+
parent: impl Handle,
|
|
155
|
+
) -> wasmtime::Result<H> {
|
|
156
|
+
let parent = parent.index();
|
|
157
|
+
self.entry(parent)?;
|
|
158
|
+
let handle = self.insert::<H>(resource, Some(parent))?;
|
|
159
|
+
self.entries
|
|
160
|
+
.get_mut(&parent)
|
|
161
|
+
.expect("the parent was just found")
|
|
162
|
+
.children += 1;
|
|
163
|
+
Ok(H::new(handle))
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
/// Number `resource` from the free list, else past every number handed
|
|
167
|
+
/// out; refused past `MAX_TABLE_ENTRIES`, and past the Invocation's
|
|
168
|
+
/// memory as a trap, since no WIT constructor has an error for it.
|
|
169
|
+
fn insert<H: Handle>(
|
|
170
|
+
&mut self,
|
|
171
|
+
resource: H::Host,
|
|
172
|
+
parent: Option<u32>,
|
|
173
|
+
) -> wasmtime::Result<u32> {
|
|
174
|
+
if self.is_full() {
|
|
175
|
+
return Err(wasmtime::Error::msg(
|
|
176
|
+
"the guest holds as many resources as a table may",
|
|
177
|
+
));
|
|
178
|
+
}
|
|
179
|
+
let memory = MemoryCharge::new(&self.memory, bytes_of::<H>())
|
|
180
|
+
.map_err(|_| wasmtime::Error::msg("the guest's resources outgrow its memory"))?;
|
|
181
|
+
Ok(self.place(Box::new(resource), parent, false, memory))
|
|
182
|
+
}
|
|
183
|
+
|
|
184
|
+
/// Whether the table holds as many entries as it may.
|
|
185
|
+
fn is_full(&self) -> bool {
|
|
186
|
+
self.entries.len() >= MAX_TABLE_ENTRIES
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
/// Number `resource` from the free list, else past every number handed
|
|
190
|
+
/// out.
|
|
191
|
+
fn place(
|
|
192
|
+
&mut self,
|
|
193
|
+
resource: Box<dyn Any + Send>,
|
|
194
|
+
parent: Option<u32>,
|
|
195
|
+
counted: bool,
|
|
196
|
+
memory: MemoryCharge,
|
|
197
|
+
) -> u32 {
|
|
198
|
+
let handle = self.free.pop().unwrap_or_else(|| {
|
|
199
|
+
self.next += 1;
|
|
200
|
+
self.next - 1
|
|
201
|
+
});
|
|
202
|
+
let entry = Entry {
|
|
203
|
+
resource,
|
|
204
|
+
parent,
|
|
205
|
+
children: 0,
|
|
206
|
+
lends: 0,
|
|
207
|
+
counted,
|
|
208
|
+
_memory: memory,
|
|
209
|
+
};
|
|
210
|
+
self.entries.insert(handle, entry);
|
|
211
|
+
handle
|
|
212
|
+
}
|
|
213
|
+
|
|
214
|
+
/// Whether `parent` still has a child of kind `H`, as wasmtime's
|
|
215
|
+
/// `iter_children` answers.
|
|
216
|
+
pub(crate) fn has_child<H: Handle>(&self, parent: impl Handle) -> bool {
|
|
217
|
+
let parent = Some(parent.index());
|
|
218
|
+
self.entries
|
|
219
|
+
.values()
|
|
220
|
+
.any(|entry| entry.parent == parent && entry.resource.is::<H::Host>())
|
|
221
|
+
}
|
|
222
|
+
|
|
223
|
+
fn entry(&self, handle: u32) -> wasmtime::Result<&Entry> {
|
|
224
|
+
self.entries
|
|
225
|
+
.get(&handle)
|
|
226
|
+
.ok_or_else(|| wasmtime::Error::msg("the guest named a handle it does not hold"))
|
|
227
|
+
}
|
|
228
|
+
|
|
229
|
+
/// The resource `handle` stands for. A handle of another kind traps, as
|
|
230
|
+
/// the Canonical ABI traps on a handle of the wrong type.
|
|
231
|
+
pub(crate) fn get<H: Handle>(&self, handle: H) -> wasmtime::Result<&H::Host> {
|
|
232
|
+
self.entry(handle.index())?
|
|
233
|
+
.resource
|
|
234
|
+
.downcast_ref()
|
|
235
|
+
.ok_or_else(|| wasmtime::Error::msg("the guest named a handle of another kind"))
|
|
236
|
+
}
|
|
237
|
+
|
|
238
|
+
pub(crate) fn get_mut<H: Handle>(&mut self, handle: H) -> wasmtime::Result<&mut H::Host> {
|
|
239
|
+
self.entries
|
|
240
|
+
.get_mut(&handle.index())
|
|
241
|
+
.ok_or_else(|| wasmtime::Error::msg("the guest named a handle it does not hold"))?
|
|
242
|
+
.resource
|
|
243
|
+
.downcast_mut()
|
|
244
|
+
.ok_or_else(|| wasmtime::Error::msg("the guest named a handle of another kind"))
|
|
245
|
+
}
|
|
246
|
+
|
|
247
|
+
/// Lend `handle` out, so the guest cannot drop it until the lend ends,
|
|
248
|
+
/// as the Canonical ABI lends a handle.
|
|
249
|
+
pub(crate) fn lend(&mut self, handle: impl Handle) {
|
|
250
|
+
self.lent(handle).lends += 1;
|
|
251
|
+
}
|
|
252
|
+
|
|
253
|
+
/// End one lend out on `handle`.
|
|
254
|
+
pub(crate) fn end_lend(&mut self, handle: impl Handle) {
|
|
255
|
+
self.lent(handle).lends -= 1;
|
|
256
|
+
}
|
|
257
|
+
|
|
258
|
+
fn lent(&mut self, handle: impl Handle) -> &mut Entry {
|
|
259
|
+
self.entries
|
|
260
|
+
.get_mut(&handle.index())
|
|
261
|
+
.expect("a handle lent out stays in the table")
|
|
262
|
+
}
|
|
263
|
+
|
|
264
|
+
/// Take `handle` out of the table. A handle of another kind, one whose
|
|
265
|
+
/// children still live, or one lent out traps, as the Canonical ABI traps
|
|
266
|
+
/// on a handle of the wrong type or with lends out, and the WIT on a
|
|
267
|
+
/// parent dropped first.
|
|
268
|
+
pub(crate) fn delete<H: Handle>(&mut self, handle: H) -> wasmtime::Result<H::Host> {
|
|
269
|
+
let index = handle.index();
|
|
270
|
+
let entry = self.entry(index)?;
|
|
271
|
+
if !entry.resource.is::<H::Host>() {
|
|
272
|
+
return Err(wasmtime::Error::msg(
|
|
273
|
+
"the guest named a handle of another kind",
|
|
274
|
+
));
|
|
275
|
+
}
|
|
276
|
+
if entry.children > 0 {
|
|
277
|
+
return Err(wasmtime::Error::msg(
|
|
278
|
+
"the guest dropped or gave up a resource while a child of it lives",
|
|
279
|
+
));
|
|
280
|
+
}
|
|
281
|
+
if entry.lends > 0 {
|
|
282
|
+
return Err(wasmtime::Error::msg(
|
|
283
|
+
"the guest dropped or gave up a resource while it is lent out",
|
|
284
|
+
));
|
|
285
|
+
}
|
|
286
|
+
let entry = self
|
|
287
|
+
.entries
|
|
288
|
+
.remove(&index)
|
|
289
|
+
.expect("the entry was just found");
|
|
290
|
+
self.free.push(index);
|
|
291
|
+
if entry.counted {
|
|
292
|
+
self.open_files.close();
|
|
293
|
+
}
|
|
294
|
+
if let Some(parent) = entry
|
|
295
|
+
.parent
|
|
296
|
+
.and_then(|parent| self.entries.get_mut(&parent))
|
|
297
|
+
{
|
|
298
|
+
parent.children -= 1;
|
|
299
|
+
}
|
|
300
|
+
Ok(*entry
|
|
301
|
+
.resource
|
|
302
|
+
.downcast()
|
|
303
|
+
.expect("the entry was just found to be of this kind"))
|
|
304
|
+
}
|
|
305
|
+
}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
//! The WASI 0.2 imports a Guest Binary links as a core module, encoded onto
|
|
2
|
+
//! `kobako-runtime` as preview1's are. `build.rs` generates each import's
|
|
3
|
+
//! glue from the vendored WIT; the Wasm Driver answers one host trait per WIT
|
|
4
|
+
//! package.
|
|
5
|
+
|
|
6
|
+
pub(crate) mod abi;
|
|
7
|
+
mod error;
|
|
8
|
+
pub(crate) mod filesystem;
|
|
9
|
+
mod host;
|
|
10
|
+
mod http;
|
|
11
|
+
pub(crate) mod io;
|
|
12
|
+
mod sockets;
|
|
13
|
+
pub(crate) mod table;
|
|
14
|
+
|
|
15
|
+
pub(crate) use bindings::add_to_linker;
|
|
16
|
+
#[cfg(test)]
|
|
17
|
+
pub(crate) use error::IntoAnswer;
|
|
18
|
+
pub(crate) use io::Pollable;
|
|
19
|
+
pub(crate) use table::Table;
|
|
20
|
+
|
|
21
|
+
/// The most bytes one read hands the guest, one `check-write` offers a file,
|
|
22
|
+
/// and about the most one datagram `receive` answers, as wasmtime-wasi's
|
|
23
|
+
/// one read allocation limit bounds each.
|
|
24
|
+
const MAX_READ_SIZE_ALLOC: usize = 64 * 1024;
|
|
25
|
+
|
|
26
|
+
/// `duration` as the nanoseconds a WASI `duration`, `instant`, or preview1
|
|
27
|
+
/// `timestamp` counts, refused for a time past what it holds.
|
|
28
|
+
pub(crate) fn try_to_nanos(
|
|
29
|
+
duration: std::time::Duration,
|
|
30
|
+
) -> Result<u64, std::num::TryFromIntError> {
|
|
31
|
+
u64::try_from(duration.as_nanos())
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
/// `duration` as `try_to_nanos` counts it, the largest one for a time past
|
|
35
|
+
/// what it holds, as a clock reads or a wait lasts.
|
|
36
|
+
pub(crate) fn to_nanos(duration: std::time::Duration) -> u64 {
|
|
37
|
+
try_to_nanos(duration).unwrap_or(u64::MAX)
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
#[allow(clippy::all, unused_parens)]
|
|
41
|
+
pub(crate) mod bindings {
|
|
42
|
+
include!(concat!(env!("OUT_DIR"), "/preview2_bindings.rs"));
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
impl bindings::Host for crate::invocation::Invocation {
|
|
46
|
+
fn abandonment(&self) -> Option<wasmtime::Error> {
|
|
47
|
+
crate::invocation::Invocation::abandonment(self)
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
fn lift_handle<H: table::Handle>(&mut self, handle: H) -> wasmtime::Result<H> {
|
|
51
|
+
self.table_mut().get(handle).map(|_| handle)
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
fn take_handle<H: table::Handle>(&mut self, handle: H) -> wasmtime::Result<H::Host> {
|
|
55
|
+
self.table_mut().delete(handle)
|
|
56
|
+
}
|
|
57
|
+
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
//! Trap classification for the run path
|
|
1
|
+
//! Trap classification for the run path, and the setup fault a template's
|
|
2
|
+
//! instantiation answers.
|
|
2
3
|
//!
|
|
3
4
|
//! Classifies a `wasmtime` run error into the engine-neutral `Trap`
|
|
4
5
|
//! kind (`Timeout` / `MemoryLimit` / `Other`) that each frontend maps
|
|
@@ -12,8 +13,8 @@ use std::time::{Duration, Instant};
|
|
|
12
13
|
use wasmtime::{Store, StoreHookState, UpdateDeadline};
|
|
13
14
|
|
|
14
15
|
use crate::invocation::Invocation;
|
|
15
|
-
use kobako_runtime::endpoint::MemoryLimitExceeded;
|
|
16
16
|
use kobako_runtime::error::{SetupError, Trap};
|
|
17
|
+
use kobako_runtime::memcg::MemoryLimitExceeded;
|
|
17
18
|
|
|
18
19
|
/// Marker error returned from the epoch-deadline callback when the
|
|
19
20
|
/// wall-clock deadline is exceeded. Downcast from the wasmtime trap
|
|
@@ -29,6 +30,20 @@ impl std::fmt::Display for TimeoutTrap {
|
|
|
29
30
|
|
|
30
31
|
impl std::error::Error for TimeoutTrap {}
|
|
31
32
|
|
|
33
|
+
/// Marker error a host-side wait ends with when the frontend interrupts its
|
|
34
|
+
/// thread before the deadline: preview1 answers it EINTR, as a signal ends
|
|
35
|
+
/// Linux's `poll`, and preview2, which has no EINTR, traps with it.
|
|
36
|
+
#[derive(Debug)]
|
|
37
|
+
pub(crate) struct Interrupted;
|
|
38
|
+
|
|
39
|
+
impl std::fmt::Display for Interrupted {
|
|
40
|
+
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
41
|
+
write!(f, "the guest's wait was interrupted")
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
impl std::error::Error for Interrupted {}
|
|
46
|
+
|
|
32
47
|
/// Epoch delta that keeps the deadline effectively unreachable when no
|
|
33
48
|
/// wall-clock cap is configured. Half the epoch range rather than
|
|
34
49
|
/// `u64::MAX`: wasmtime adds the delta to the engine's current epoch,
|
|
@@ -54,7 +69,7 @@ pub(crate) fn epoch_deadline_callback(
|
|
|
54
69
|
/// attach the caller's verb instead. A cap trap carries its own message,
|
|
55
70
|
/// since wasmtime's backtrace framing is noise there.
|
|
56
71
|
pub(crate) fn to_trap(err: wasmtime::Error) -> Trap {
|
|
57
|
-
|
|
72
|
+
cap_trap_of(&err).unwrap_or_else(|| Trap::Other(other_trap_message(&err)))
|
|
58
73
|
}
|
|
59
74
|
|
|
60
75
|
/// Arm a Store's wall-clock deadline `limit` from now, or none. Epoch
|
|
@@ -74,7 +89,7 @@ pub(crate) fn arm_deadline(store: &mut Store<Invocation>, limit: Option<Duration
|
|
|
74
89
|
|
|
75
90
|
/// The cap trap `err` carries, if a cap fired: a setup step that fails
|
|
76
91
|
/// for any other reason words its own message instead.
|
|
77
|
-
pub(crate) fn
|
|
92
|
+
pub(crate) fn cap_trap_of(err: &wasmtime::Error) -> Option<Trap> {
|
|
78
93
|
if let Some(t) = err.downcast_ref::<TimeoutTrap>() {
|
|
79
94
|
Some(Trap::Timeout(t.to_string()))
|
|
80
95
|
} else {
|
|
@@ -97,18 +112,18 @@ fn other_trap_message(err: &wasmtime::Error) -> String {
|
|
|
97
112
|
}
|
|
98
113
|
|
|
99
114
|
/// The template is built before any invocation, so no invocation cap can
|
|
100
|
-
/// fire: the memory
|
|
115
|
+
/// fire: the memory budget is not yet armed, and the probe's own setup
|
|
101
116
|
/// deadline is told apart where it fires. Every failure here is a setup
|
|
102
117
|
/// fault, not a trap.
|
|
103
|
-
pub(crate) fn
|
|
118
|
+
pub(crate) fn to_setup_error(err: wasmtime::Error) -> SetupError {
|
|
104
119
|
SetupError::Dead(format!("instantiate: {err}"))
|
|
105
120
|
}
|
|
106
121
|
|
|
107
122
|
#[cfg(test)]
|
|
108
123
|
mod tests {
|
|
109
124
|
use super::{other_trap_message, to_trap, TimeoutTrap, NO_TIMEOUT_EPOCH_DELTA};
|
|
110
|
-
use kobako_runtime::endpoint::MemoryLimitExceeded;
|
|
111
125
|
use kobako_runtime::error::Trap;
|
|
126
|
+
use kobako_runtime::memcg::MemoryLimitExceeded;
|
|
112
127
|
|
|
113
128
|
// The no-timeout priming delta is added to the engine's current
|
|
114
129
|
// epoch inside wasmtime, and the process-wide ticker advances that
|
|
@@ -161,11 +176,11 @@ mod tests {
|
|
|
161
176
|
let msg = other_trap_message(&err);
|
|
162
177
|
assert!(
|
|
163
178
|
msg.contains("indirect call type mismatch"),
|
|
164
|
-
"a non-cap trap surfaced
|
|
179
|
+
"a non-cap trap surfaced to the host must carry the root trap reason, not only the backtrace framing; got: {msg}"
|
|
165
180
|
);
|
|
166
181
|
assert!(
|
|
167
182
|
msg.contains("error while executing"),
|
|
168
|
-
"a non-cap trap surfaced
|
|
183
|
+
"a non-cap trap surfaced to the host must keep the wasm backtrace framing; got: {msg}"
|
|
169
184
|
);
|
|
170
185
|
}
|
|
171
186
|
|