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.
Files changed (266) hide show
  1. checksums.yaml +4 -4
  2. data/.release-please-manifest.json +1 -1
  3. data/CHANGELOG.md +335 -0
  4. data/Cargo.lock +469 -11
  5. data/README.md +43 -3
  6. data/ROADMAP.md +1 -1
  7. data/crates/kobako-runtime/CHANGELOG.md +219 -0
  8. data/crates/kobako-runtime/Cargo.toml +51 -3
  9. data/crates/kobako-runtime/README.md +7 -4
  10. data/crates/kobako-runtime/src/cred.rs +124 -0
  11. data/crates/kobako-runtime/src/dispatch.rs +4 -5
  12. data/crates/kobako-runtime/src/endpoint/buffer.rs +153 -44
  13. data/crates/kobako-runtime/src/endpoint/dispatch.rs +80 -41
  14. data/crates/kobako-runtime/src/endpoint/invoke.rs +23 -36
  15. data/crates/kobako-runtime/src/endpoint.rs +137 -36
  16. data/crates/kobako-runtime/src/errno.rs +391 -0
  17. data/crates/kobako-runtime/src/error.rs +31 -10
  18. data/crates/kobako-runtime/src/filesystem/anon_inodes.rs +52 -0
  19. data/crates/kobako-runtime/src/filesystem/bind/lookup.rs +52 -14
  20. data/crates/kobako-runtime/src/filesystem/bind/walk.rs +19 -20
  21. data/crates/kobako-runtime/src/filesystem/bind.rs +437 -245
  22. data/crates/kobako-runtime/src/filesystem/overlay/file.rs +6 -6
  23. data/crates/kobako-runtime/src/filesystem/overlay/path.rs +43 -65
  24. data/crates/kobako-runtime/src/filesystem/overlay/stack/copy_up.rs +9 -16
  25. data/crates/kobako-runtime/src/filesystem/overlay/stack/dir.rs +47 -72
  26. data/crates/kobako-runtime/src/filesystem/overlay/stack/namei.rs +12 -12
  27. data/crates/kobako-runtime/src/filesystem/overlay/stack/readdir.rs +4 -7
  28. data/crates/kobako-runtime/src/filesystem/overlay/stack.rs +121 -37
  29. data/crates/kobako-runtime/src/filesystem/overlay.rs +302 -343
  30. data/crates/kobako-runtime/src/filesystem/pipe.rs +12 -9
  31. data/crates/kobako-runtime/src/filesystem/rdir.rs +15 -32
  32. data/crates/kobako-runtime/src/filesystem/tmpfs/seed.rs +32 -0
  33. data/crates/kobako-runtime/src/filesystem/tmpfs/tmpfile.rs +3 -3
  34. data/crates/kobako-runtime/src/filesystem/tmpfs/whiteout.rs +57 -35
  35. data/crates/kobako-runtime/src/filesystem/tmpfs/xattr.rs +2 -2
  36. data/crates/kobako-runtime/src/filesystem/tmpfs.rs +172 -160
  37. data/crates/kobako-runtime/src/filesystem/wrap.rs +36 -52
  38. data/crates/kobako-runtime/src/filesystem.rs +6 -3
  39. data/crates/kobako-runtime/src/fork.rs +96 -0
  40. data/crates/kobako-runtime/src/grant.rs +3 -0
  41. data/crates/kobako-runtime/src/hashtable.rs +4 -2
  42. data/crates/kobako-runtime/src/lib.rs +18 -7
  43. data/crates/kobako-runtime/src/limits.rs +195 -0
  44. data/crates/kobako-runtime/src/locking.rs +10 -0
  45. data/crates/kobako-runtime/src/memcg.rs +383 -0
  46. data/crates/kobako-runtime/src/mount.rs +67 -9
  47. data/crates/kobako-runtime/src/net/backends.rs +43 -0
  48. data/crates/kobako-runtime/src/net/connections.rs +179 -0
  49. data/crates/kobako-runtime/src/net/credential.rs +125 -0
  50. data/crates/kobako-runtime/src/net/egress.rs +160 -0
  51. data/crates/kobako-runtime/src/net/family.rs +181 -0
  52. data/crates/kobako-runtime/src/net/http.rs +2733 -0
  53. data/crates/kobako-runtime/src/net/lookup.rs +285 -0
  54. data/crates/kobako-runtime/src/net/mock.rs +251 -0
  55. data/crates/kobako-runtime/src/net/namespace.rs +1366 -0
  56. data/crates/kobako-runtime/src/net/reactor.rs +531 -0
  57. data/crates/kobako-runtime/src/net/resolv/darwin.rs +275 -0
  58. data/crates/kobako-runtime/src/net/resolv/stub/tests.rs +469 -0
  59. data/crates/kobako-runtime/src/net/resolv/stub.rs +536 -0
  60. data/crates/kobako-runtime/src/net/resolv/windows.rs +248 -0
  61. data/crates/kobako-runtime/src/net/resolv.rs +227 -0
  62. data/crates/kobako-runtime/src/net/socket.rs +870 -0
  63. data/crates/kobako-runtime/src/net/tcp.rs +1588 -0
  64. data/crates/kobako-runtime/src/net/tls.rs +58 -0
  65. data/crates/kobako-runtime/src/net/transport.rs +279 -0
  66. data/crates/kobako-runtime/src/net/udp.rs +1003 -0
  67. data/crates/kobako-runtime/src/net.rs +42 -0
  68. data/crates/kobako-runtime/src/network/builder.rs +177 -0
  69. data/crates/kobako-runtime/src/network/ruleset.rs +777 -0
  70. data/crates/kobako-runtime/src/network.rs +551 -0
  71. data/crates/kobako-runtime/src/policy.rs +16 -0
  72. data/crates/kobako-runtime/src/profile.rs +29 -144
  73. data/crates/kobako-runtime/src/runtime.rs +3 -5
  74. data/crates/kobako-runtime/src/sched.rs +130 -29
  75. data/crates/kobako-runtime/src/security/entry_policy.rs +22 -0
  76. data/crates/kobako-runtime/src/{vfs/cred.rs → security/hooks.rs} +52 -144
  77. data/crates/kobako-runtime/src/security/mount_policy.rs +158 -0
  78. data/crates/kobako-runtime/src/security.rs +101 -196
  79. data/crates/kobako-runtime/src/snapshot.rs +121 -2
  80. data/crates/kobako-runtime/src/vfs/attr.rs +5 -5
  81. data/crates/kobako-runtime/src/vfs/dentry.rs +143 -89
  82. data/crates/kobako-runtime/src/vfs/file.rs +199 -203
  83. data/crates/kobako-runtime/src/vfs/inode.rs +41 -45
  84. data/crates/kobako-runtime/src/vfs/kern_path.rs +38 -42
  85. data/crates/kobako-runtime/src/vfs/mount.rs +10 -9
  86. data/crates/kobako-runtime/src/vfs/namei.rs +829 -700
  87. data/crates/kobako-runtime/src/vfs/namespace.rs +162 -0
  88. data/crates/kobako-runtime/src/vfs/open_files.rs +69 -0
  89. data/crates/kobako-runtime/src/vfs/openat2.rs +3 -3
  90. data/crates/kobako-runtime/src/vfs/path.rs +6 -6
  91. data/crates/kobako-runtime/src/vfs/readdir.rs +6 -6
  92. data/crates/kobako-runtime/src/vfs/stat.rs +159 -23
  93. data/crates/kobako-runtime/src/vfs/super_block.rs +18 -14
  94. data/crates/kobako-runtime/src/vfs/utimes.rs +37 -27
  95. data/crates/kobako-runtime/src/vfs.rs +9 -6
  96. data/crates/kobako-runtime/src/wait.rs +356 -0
  97. data/crates/kobako-transport/CHANGELOG.md +31 -0
  98. data/crates/kobako-transport/Cargo.toml +1 -1
  99. data/crates/kobako-transport/README.md +3 -4
  100. data/crates/kobako-transport/src/abi.rs +78 -72
  101. data/crates/kobako-transport/src/envelope/bytes.rs +17 -6
  102. data/crates/kobako-transport/src/envelope/call.rs +32 -4
  103. data/crates/kobako-transport/src/envelope/error_record.rs +21 -0
  104. data/crates/kobako-transport/src/envelope/name.rs +99 -0
  105. data/crates/kobako-transport/src/envelope/outcome.rs +9 -9
  106. data/crates/kobako-transport/src/envelope/preamble.rs +24 -21
  107. data/crates/kobako-transport/src/envelope/reply.rs +27 -27
  108. data/crates/kobako-transport/src/envelope/unsupported.rs +10 -10
  109. data/crates/kobako-transport/src/envelope.rs +13 -8
  110. data/crates/kobako-wasmtime/CHANGELOG.md +161 -0
  111. data/crates/kobako-wasmtime/Cargo.toml +26 -7
  112. data/crates/kobako-wasmtime/README.md +3 -2
  113. data/crates/kobako-wasmtime/build/preview2.rs +1339 -0
  114. data/crates/kobako-wasmtime/build.rs +16 -0
  115. data/crates/kobako-wasmtime/src/abi.rs +17 -37
  116. data/crates/kobako-wasmtime/src/ambient.rs +33 -18
  117. data/crates/kobako-wasmtime/src/cache.rs +23 -15
  118. data/crates/kobako-wasmtime/src/config.rs +52 -68
  119. data/crates/kobako-wasmtime/src/driver.rs +48 -63
  120. data/crates/kobako-wasmtime/src/exports.rs +143 -17
  121. data/crates/kobako-wasmtime/src/guest.rs +12 -6
  122. data/crates/kobako-wasmtime/src/guest_binary.rs +14 -0
  123. data/crates/kobako-wasmtime/src/imports.rs +42 -18
  124. data/crates/kobako-wasmtime/src/instance_pre.rs +4 -4
  125. data/crates/kobako-wasmtime/src/invocation.rs +74 -12
  126. data/crates/kobako-wasmtime/src/lib.rs +5 -3
  127. data/crates/kobako-wasmtime/src/limiter.rs +70 -5
  128. data/crates/kobako-wasmtime/src/preview1/descriptors.rs +309 -0
  129. data/crates/kobako-wasmtime/src/preview1/differential/mount.rs +5 -15
  130. data/crates/kobako-wasmtime/src/preview1/differential.rs +27 -31
  131. data/crates/kobako-wasmtime/src/preview1/errno.rs +55 -66
  132. data/crates/kobako-wasmtime/src/preview1/fd.rs +327 -296
  133. data/crates/kobako-wasmtime/src/preview1/memory.rs +21 -12
  134. data/crates/kobako-wasmtime/src/preview1/mount_view/wrap.rs +34 -53
  135. data/crates/kobako-wasmtime/src/preview1/mount_view.rs +231 -217
  136. data/crates/kobako-wasmtime/src/preview1/path.rs +56 -121
  137. data/crates/kobako-wasmtime/src/preview1/poll.rs +244 -120
  138. data/crates/kobako-wasmtime/src/preview1/sock.rs +10 -8
  139. data/crates/kobako-wasmtime/src/preview1/testsuite.rs +5 -15
  140. data/crates/kobako-wasmtime/src/preview1.rs +46 -42
  141. data/crates/kobako-wasmtime/src/preview2/abi.rs +227 -0
  142. data/crates/kobako-wasmtime/src/preview2/error.rs +118 -0
  143. data/crates/kobako-wasmtime/src/preview2/filesystem.rs +122 -0
  144. data/crates/kobako-wasmtime/src/preview2/host.rs +3959 -0
  145. data/crates/kobako-wasmtime/src/preview2/http.rs +1503 -0
  146. data/crates/kobako-wasmtime/src/preview2/io.rs +315 -0
  147. data/crates/kobako-wasmtime/src/preview2/sockets.rs +379 -0
  148. data/crates/kobako-wasmtime/src/preview2/table.rs +305 -0
  149. data/crates/kobako-wasmtime/src/preview2.rs +57 -0
  150. data/crates/kobako-wasmtime/src/trap.rs +24 -9
  151. data/crates/kobako-wasmtime/src/wasi.rs +210 -81
  152. data/crates/kobako-wasmtime/wit/deps/cli.wit +233 -0
  153. data/crates/kobako-wasmtime/wit/deps/clocks.wit +162 -0
  154. data/crates/kobako-wasmtime/wit/deps/filesystem.wit +589 -0
  155. data/crates/kobako-wasmtime/wit/deps/http.wit +733 -0
  156. data/crates/kobako-wasmtime/wit/deps/io.wit +299 -0
  157. data/crates/kobako-wasmtime/wit/deps/random.wit +92 -0
  158. data/crates/kobako-wasmtime/wit/deps/sockets.wit +949 -0
  159. data/data/kobako.wasm +0 -0
  160. data/ext/kobako/Cargo.toml +1 -1
  161. data/ext/kobako/src/{runtime/errors.rs → errors.rs} +34 -26
  162. data/ext/kobako/src/{runtime/escape.rs → escape.rs} +42 -11
  163. data/ext/kobako/src/{runtime/filesystem → filesystem}/grants.rs +30 -26
  164. data/ext/kobako/src/{runtime/filesystem → filesystem}/ruby.rs +149 -168
  165. data/ext/kobako/src/{runtime/filesystem.rs → filesystem.rs} +24 -15
  166. data/ext/kobako/src/gvl.rs +306 -0
  167. data/ext/kobako/src/lib.rs +64 -3
  168. data/ext/kobako/src/network/mock.rs +187 -0
  169. data/ext/kobako/src/network.rs +591 -0
  170. data/ext/kobako/src/runtime/bridge.rs +30 -29
  171. data/ext/kobako/src/runtime/snapshot.rs +4 -4
  172. data/ext/kobako/src/runtime.rs +221 -143
  173. data/ext/kobako/src/wire.rs +42 -0
  174. data/lib/kobako/catalog/extensions.rb +14 -2
  175. data/lib/kobako/catalog/flags.rb +3 -5
  176. data/lib/kobako/catalog/grants.rb +5 -4
  177. data/lib/kobako/catalog/handles.rb +5 -27
  178. data/lib/kobako/catalog/mount.rb +11 -3
  179. data/lib/kobako/catalog/network.rb +35 -0
  180. data/lib/kobako/catalog/replacements.rb +28 -0
  181. data/lib/kobako/catalog/services.rb +5 -19
  182. data/lib/kobako/catalog/snippets.rb +3 -18
  183. data/lib/kobako/catalog.rb +3 -0
  184. data/lib/kobako/codec/{utils.rb → boundary.rb} +4 -2
  185. data/lib/kobako/codec/decoder.rb +4 -4
  186. data/lib/kobako/codec/ext_types.rb +3 -3
  187. data/lib/kobako/codec/handle_walk.rb +3 -43
  188. data/lib/kobako/codec/value_budget.rb +132 -40
  189. data/lib/kobako/codec.rb +1 -1
  190. data/lib/kobako/context.rb +24 -11
  191. data/lib/kobako/errors.rb +15 -12
  192. data/lib/kobako/extension.rb +3 -2
  193. data/lib/kobako/filesystem.rb +9 -2
  194. data/lib/kobako/handle.rb +2 -2
  195. data/lib/kobako/names.rb +28 -0
  196. data/lib/kobako/network.rb +210 -0
  197. data/lib/kobako/outcome.rb +7 -7
  198. data/lib/kobako/pool.rb +45 -23
  199. data/lib/kobako/runtime.rb +3 -2
  200. data/lib/kobako/sandbox.rb +92 -35
  201. data/lib/kobako/sandbox_options.rb +41 -106
  202. data/lib/kobako/transport/argument_wrap.rb +64 -0
  203. data/lib/kobako/transport/block_failure.rb +1 -1
  204. data/lib/kobako/transport/dispatcher.rb +6 -6
  205. data/lib/kobako/transport/exposure.rb +26 -15
  206. data/lib/kobako/transport/reflection.rb +21 -4
  207. data/lib/kobako/transport/run.rb +8 -23
  208. data/lib/kobako/transport/yielder.rb +2 -9
  209. data/lib/kobako/transport.rb +1 -0
  210. data/lib/kobako/version.rb +1 -1
  211. data/lib/kobako.rb +6 -2
  212. data/release-please-config.json +15 -0
  213. data/sig/core/thread.rbs +6 -0
  214. data/sig/kobako/catalog/extensions.rbs +2 -0
  215. data/sig/kobako/catalog/grants.rbs +7 -4
  216. data/sig/kobako/catalog/handles.rbs +0 -2
  217. data/sig/kobako/catalog/mount.rbs +3 -1
  218. data/sig/kobako/catalog/network.rbs +20 -0
  219. data/sig/kobako/catalog/replacements.rbs +14 -0
  220. data/sig/kobako/catalog/services.rbs +0 -4
  221. data/sig/kobako/catalog/snippets.rbs +0 -2
  222. data/sig/kobako/codec/{utils.rbs → boundary.rbs} +2 -2
  223. data/sig/kobako/codec/handle_walk.rbs +0 -6
  224. data/sig/kobako/codec/value_budget.rbs +47 -4
  225. data/sig/kobako/context.rbs +3 -1
  226. data/sig/kobako/errors.rbs +4 -4
  227. data/sig/kobako/filesystem.rbs +21 -3
  228. data/sig/kobako/network.rbs +115 -0
  229. data/sig/kobako/outcome.rbs +1 -1
  230. data/sig/kobako/pool.rbs +7 -3
  231. data/sig/kobako/runtime.rbs +32 -3
  232. data/sig/kobako/sandbox.rbs +19 -2
  233. data/sig/kobako/sandbox_options.rbs +29 -38
  234. data/sig/kobako/transport/argument_wrap.rbs +15 -0
  235. data/sig/kobako/transport/error.rbs +1 -1
  236. data/sig/kobako/transport/exposure.rbs +2 -4
  237. data/sig/kobako/transport/reflection.rbs +10 -0
  238. data/sig/kobako/transport/run.rbs +0 -2
  239. data/sig/kobako/transport/yielder.rbs +0 -3
  240. data/sig/kobako/transport.rbs +1 -1
  241. data/sig/kobako.rbs +13 -0
  242. metadata +84 -35
  243. data/crates/kobako-runtime/src/endpoint/capture.rs +0 -115
  244. data/crates/kobako-runtime/src/endpoint/memory_cap.rs +0 -238
  245. data/crates/kobako-runtime/src/filesystem/path.rs +0 -21
  246. data/crates/kobako-runtime/src/vfs/errno.rs +0 -153
  247. data/crates/kobako-runtime/tests/linux_baseline/calls.rs +0 -171
  248. data/crates/kobako-runtime/tests/linux_baseline/concurrent.rs +0 -276
  249. data/crates/kobako-runtime/tests/linux_baseline/kobako.rs +0 -323
  250. data/crates/kobako-runtime/tests/linux_baseline/linux-baseline-expected.txt +0 -16
  251. data/crates/kobako-runtime/tests/linux_baseline/linux.rs +0 -449
  252. data/crates/kobako-runtime/tests/linux_baseline/main.rs +0 -611
  253. data/crates/kobako-runtime/tests/linux_baseline/permissions.rs +0 -236
  254. data/crates/kobako-wasmtime/src/descriptors.rs +0 -200
  255. data/crates/kobako-wasmtime/tests/integration/compile_posture.rs +0 -43
  256. data/crates/kobako-wasmtime/tests/integration/guest_file.rs +0 -1085
  257. data/crates/kobako-wasmtime/tests/integration/main.rs +0 -29
  258. data/crates/kobako-wasmtime/tests/integration/preamble_flags.rs +0 -70
  259. data/crates/kobako-wasmtime/tests/integration/snippet_compile.rs +0 -95
  260. data/crates/kobako-wasmtime/tests/integration/support/mod.rs +0 -30
  261. data/crates/kobako-wasmtime/tests/integration/unanswered_call.rs +0 -86
  262. data/crates/kobako-wasmtime/tests/integration/unsupported_call.rs +0 -51
  263. data/ext/kobako/src/runtime/gvl.rs +0 -147
  264. data/lib/kobako/constant_name.rb +0 -8
  265. data/sig/kobako/constant_name.rbs +0 -3
  266. /data/ext/kobako/src/{runtime/pinned_value.rs → pinned_value.rs} +0 -0
@@ -0,0 +1,162 @@
1
+ //! Which mount stands on which dentry, as Linux's mount namespace holds the
2
+ //! tree `__lookup_mnt` answers from, so a walk reaching a mount point by any
3
+ //! spelling or through any link steps onto what is mounted there.
4
+
5
+ use std::sync::Arc;
6
+
7
+ use super::dentry::Dentry;
8
+ use super::mount::VfsMount;
9
+ use super::namei::walk_mountpoint;
10
+ use super::path::Path;
11
+ use crate::cred::Cred;
12
+ use crate::filesystem::FileType;
13
+ use crate::mount::{outermost_holder_of, UnplacedMountError};
14
+ use crate::Errno;
15
+
16
+ /// One mount standing on a dentry of another, as Linux's `struct mount` keeps
17
+ /// `mnt_parent` and `mnt_mountpoint`. The mount point is held while the mount
18
+ /// stands, so a walk finds that one dentry and no other. The dentries its path
19
+ /// led through are kept too, as each Invocation places it by that path again.
20
+ struct Mounted {
21
+ parent: Arc<VfsMount>,
22
+ mountpoint: Arc<Dentry>,
23
+ mnt: Arc<VfsMount>,
24
+ trail: Vec<Arc<Dentry>>,
25
+ }
26
+
27
+ impl Drop for Mounted {
28
+ fn drop(&mut self) {
29
+ self.mountpoint.unpin_mountpoint();
30
+ }
31
+ }
32
+
33
+ /// Where a mount is to stand, as Linux's `pinned_mountpoint` holds the parent
34
+ /// and the mount point: and each dentry its path led through.
35
+ struct PinnedMountpoint {
36
+ parent: Arc<VfsMount>,
37
+ mountpoint: Arc<Dentry>,
38
+ trail: Vec<Arc<Dentry>>,
39
+ }
40
+
41
+ /// The mounts one Invocation reaches beneath the outermost ones, each standing
42
+ /// on a dentry as Linux's `mnt_namespace` links each mount to its parent.
43
+ #[derive(Default, Clone)]
44
+ pub(crate) struct MntNamespace {
45
+ mounted: Vec<Arc<Mounted>>,
46
+ }
47
+
48
+ impl MntNamespace {
49
+ /// The tree the mounts at their absolute guest paths make, each placed as
50
+ /// Linux's `mount` places it: its path walked from the root of the
51
+ /// outermost mount holding it, through the mounts placed before it,
52
+ /// following a link at its last name too, as `do_mount` looks its target
53
+ /// up with `LOOKUP_FOLLOW`, never above that root. Shallower paths go
54
+ /// first, as a container runtime mounts a parent before its children, and
55
+ /// of two landing where one stands, the later stands over the earlier and
56
+ /// hides it. A mount Linux's `mount` refuses, its walk failing or landing
57
+ /// on no directory, refuses the whole tree, as a container fails to start.
58
+ pub(crate) fn new<'a>(
59
+ cred: &Arc<Cred>,
60
+ mounts: impl IntoIterator<Item = (&'a str, &'a Arc<VfsMount>)>,
61
+ ) -> Result<Self, UnplacedMountError> {
62
+ let mut mounts: Vec<_> = mounts.into_iter().collect();
63
+ mounts.sort_by_key(|(at, _)| at.split('/').filter(|name| !name.is_empty()).count());
64
+ let mut namespace = Self::default();
65
+ for &(at, mnt) in &mounts {
66
+ let Some((root_at, root)) = outermost_holder_of(at, mounts.iter().copied()) else {
67
+ continue;
68
+ };
69
+ let path = at[root_at.len()..].trim_start_matches('/');
70
+ let walker = cred.with_mnt_ns(Arc::new(namespace.clone()));
71
+ let root = Path::root(&namespace.topmost_overmount(root));
72
+ let pinned = namespace
73
+ .where_to_mount(&walker, &root, path)
74
+ .map_err(|errno| UnplacedMountError {
75
+ at: at.to_string(),
76
+ errno,
77
+ })?;
78
+ namespace.mount(pinned, mnt);
79
+ }
80
+ Ok(namespace)
81
+ }
82
+
83
+ /// Stand `mnt` on `pinned`, marking its dentry a mount point.
84
+ fn mount(&mut self, pinned: PinnedMountpoint, mnt: &Arc<VfsMount>) {
85
+ pinned.mountpoint.d_set_mounted();
86
+ self.mounted.push(Arc::new(Mounted {
87
+ parent: pinned.parent,
88
+ mountpoint: pinned.mountpoint,
89
+ mnt: Arc::clone(mnt),
90
+ trail: pinned.trail,
91
+ }));
92
+ }
93
+
94
+ /// Where a mount at `path` beneath `root` stands as `cred` walks it, as
95
+ /// `do_mount` looks its target up and `where_to_mount` stacks it: on the
96
+ /// dentry the walk lands on, which on a mounted name is the root of the
97
+ /// topmost mount there, so the new one stands over it. A walk that fails
98
+ /// answers its error, and one landing on no directory ENOTDIR, as
99
+ /// `graft_tree` refuses it.
100
+ fn where_to_mount(
101
+ &self,
102
+ cred: &Arc<Cred>,
103
+ root: &Path,
104
+ path: &str,
105
+ ) -> Result<PinnedMountpoint, Errno> {
106
+ let nd = walk_mountpoint(cred, root, path)?;
107
+ let dentry = nd.path()?;
108
+ if dentry.file_type() != Ok(FileType::Dir) {
109
+ return Err(Errno::NotADirectory);
110
+ }
111
+ Ok(PinnedMountpoint {
112
+ parent: nd.mnt.clone(),
113
+ mountpoint: dentry,
114
+ trail: nd.trail,
115
+ })
116
+ }
117
+
118
+ /// The mount standing over the root of `mnt`, and over that one's, to the
119
+ /// last, as Linux's `topmost_overmount` follows each `overmount`; `mnt`
120
+ /// itself when none does.
121
+ pub(crate) fn topmost_overmount(&self, mnt: &Arc<VfsMount>) -> Arc<VfsMount> {
122
+ let mut top = Arc::clone(mnt);
123
+ while let Some(over) = self.__lookup_mnt(&top, top.root()) {
124
+ top = over;
125
+ }
126
+ top
127
+ }
128
+
129
+ /// The mount standing on `dentry` beneath `mnt`, as Linux's `__lookup_mnt`.
130
+ /// One stands there at most, as a later mount stacks on its root.
131
+ pub(crate) fn __lookup_mnt(
132
+ &self,
133
+ mnt: &Arc<VfsMount>,
134
+ dentry: &Arc<Dentry>,
135
+ ) -> Option<Arc<VfsMount>> {
136
+ self.mounted
137
+ .iter()
138
+ .find(|child| Arc::ptr_eq(&child.parent, mnt) && Arc::ptr_eq(&child.mountpoint, dentry))
139
+ .map(|child| Arc::clone(&child.mnt))
140
+ }
141
+
142
+ /// Whether a mount of this namespace pins `dentry`, its path leading
143
+ /// through it: the mount stands on it or beneath it, or the walk placing
144
+ /// the mount stepped onto it or beneath it. A removal or a move asks it
145
+ /// where Linux asks `is_local_mountpoint`: each Invocation places a mount
146
+ /// again by its path, so a pinned name going would open what the mount
147
+ /// hides to the next.
148
+ pub(crate) fn pins(&self, dentry: &Arc<Dentry>) -> bool {
149
+ self.mounted.iter().any(|child| {
150
+ child.mountpoint.is_subdir(dentry)
151
+ || child.trail.iter().any(|stepped| stepped.is_subdir(dentry))
152
+ })
153
+ }
154
+
155
+ /// Whether any mount stands beneath `mnt`, as Linux finds its `mnt_mounts`
156
+ /// not empty.
157
+ pub(crate) fn has_children(&self, mnt: &Arc<VfsMount>) -> bool {
158
+ self.mounted
159
+ .iter()
160
+ .any(|child| Arc::ptr_eq(&child.parent, mnt))
161
+ }
162
+ }
@@ -0,0 +1,69 @@
1
+ //! How many files one Invocation holds open across every table it has, as a
2
+ //! Linux process's `RLIMIT_NOFILE` counts each descriptor it holds. A socket
3
+ //! is a file too, so the preview1 descriptor table and preview2's resource
4
+ //! table share one count.
5
+
6
+ use std::sync::atomic::{AtomicUsize, Ordering};
7
+ use std::sync::Arc;
8
+
9
+ use super::Errno;
10
+
11
+ /// The files an Invocation holds, against its limit; each table holding one
12
+ /// shares the count.
13
+ #[derive(Clone, Debug, Default)]
14
+ pub struct OpenFiles {
15
+ held: Arc<AtomicUsize>,
16
+ limit: Option<usize>,
17
+ }
18
+
19
+ impl OpenFiles {
20
+ /// No file held yet, at most `limit` at once; `None` lifts the limit.
21
+ pub fn new(limit: Option<usize>) -> Self {
22
+ Self {
23
+ held: Arc::default(),
24
+ limit,
25
+ }
26
+ }
27
+
28
+ /// Whether one more would pass the limit.
29
+ pub fn is_full(&self) -> bool {
30
+ self.limit
31
+ .is_some_and(|limit| self.held.load(Ordering::SeqCst) >= limit)
32
+ }
33
+
34
+ /// Hold one more, refused as EMFILE at the limit, as `get_unused_fd_flags`
35
+ /// refuses one past `RLIMIT_NOFILE`.
36
+ pub fn open(&self) -> Result<(), Errno> {
37
+ match self.is_full() {
38
+ true => Err(Errno::TooManyOpenFiles),
39
+ false => {
40
+ self.held.fetch_add(1, Ordering::SeqCst);
41
+ Ok(())
42
+ }
43
+ }
44
+ }
45
+
46
+ /// Give one back, as closing a descriptor does.
47
+ pub fn close(&self) {
48
+ self.held.fetch_sub(1, Ordering::SeqCst);
49
+ }
50
+ }
51
+
52
+ #[cfg(test)]
53
+ mod tests {
54
+ use super::*;
55
+
56
+ #[test]
57
+ fn two_tables_sharing_the_count_meet_one_limit() {
58
+ let preview1 = OpenFiles::new(Some(2));
59
+ let preview2 = preview1.clone();
60
+ let answers = (preview1.open(), preview2.open(), preview1.open());
61
+ preview2.close();
62
+ assert_eq!(
63
+ (answers, preview1.open()),
64
+ ((Ok(()), Ok(()), Err(Errno::TooManyOpenFiles)), Ok(())),
65
+ "OpenFiles cloned for two tables must refuse the third file as EMFILE against a \
66
+ limit of two, and take one again once either closes"
67
+ );
68
+ }
69
+ }
@@ -1,7 +1,7 @@
1
1
  //! What an open asks for, as Linux's `openat2` takes an `open_how`.
2
2
 
3
3
  use super::inode::Mask;
4
- use super::FilesystemError;
4
+ use super::Errno;
5
5
 
6
6
  /// How to open a path, as Linux's `struct open_how` carries `openat2`'s
7
7
  /// flags.
@@ -78,7 +78,7 @@ impl OpenFlags {
78
78
  /// only `O_PATH_FLAGS` and asks nothing of the entry. An ABI asks it once,
79
79
  /// before it reserves a descriptor, and hands what it made to `do_file_open`,
80
80
  /// as `do_sys_openat2` does.
81
- pub fn build_open_flags(how: &OpenHow) -> Result<OpenFlags, FilesystemError> {
81
+ pub fn build_open_flags(how: &OpenHow) -> Result<OpenFlags, Errno> {
82
82
  if !how.read && !how.write {
83
83
  return Ok(OpenFlags {
84
84
  open_flag: OpenHow {
@@ -92,7 +92,7 @@ pub fn build_open_flags(how: &OpenHow) -> Result<OpenFlags, FilesystemError> {
92
92
  });
93
93
  }
94
94
  if how.directory && how.create {
95
- return Err(FilesystemError::InvalidInput);
95
+ return Err(Errno::InvalidInput);
96
96
  }
97
97
  let mut acc_mode = Mask::NONE;
98
98
  if how.read {
@@ -5,24 +5,24 @@ use std::sync::Arc;
5
5
 
6
6
  use super::dentry::Dentry;
7
7
  use super::mount::VfsMount;
8
- use super::FilesystemError;
8
+ use super::Errno;
9
9
 
10
10
  /// Where a walk starts, found once the call has taken its name, as Linux's
11
11
  /// `path_init` takes the directory a descriptor names only after the name. A
12
12
  /// caller holding a table of descriptors hands how to find it, so a call with
13
13
  /// two names answers for the first before it looks at the second's start.
14
14
  pub trait Start {
15
- fn path_init(&self) -> Result<Path, FilesystemError>;
15
+ fn path_init(&self) -> Result<Path, Errno>;
16
16
  }
17
17
 
18
18
  impl Start for Path {
19
- fn path_init(&self) -> Result<Path, FilesystemError> {
19
+ fn path_init(&self) -> Result<Path, Errno> {
20
20
  Ok(self.clone())
21
21
  }
22
22
  }
23
23
 
24
- impl<F: Fn() -> Result<Path, FilesystemError>> Start for F {
25
- fn path_init(&self) -> Result<Path, FilesystemError> {
24
+ impl<F: Fn() -> Result<Path, Errno>> Start for F {
25
+ fn path_init(&self) -> Result<Path, Errno> {
26
26
  self()
27
27
  }
28
28
  }
@@ -40,7 +40,7 @@ impl Path {
40
40
  /// The root of `mnt`.
41
41
  pub fn root(mnt: &Arc<VfsMount>) -> Self {
42
42
  Self {
43
- dentry: mnt.mnt_root().clone(),
43
+ dentry: mnt.root().clone(),
44
44
  mnt: mnt.clone(),
45
45
  }
46
46
  }
@@ -4,10 +4,10 @@
4
4
 
5
5
  use std::sync::Arc;
6
6
 
7
- use super::cred::Cred;
8
7
  use super::dentry::Dentry;
9
8
  use super::inode::Identity;
10
- use super::{FileType, FilesystemError, Kstat, PATH_MAX};
9
+ use super::{Errno, FileType, Kstat, PATH_MAX};
10
+ use crate::cred::Cred;
11
11
 
12
12
  #[derive(Clone, Debug, PartialEq, Eq)]
13
13
  #[non_exhaustive]
@@ -145,17 +145,17 @@ pub fn dir_emit_dots(dentry: &Dentry, ctx: &mut DirContext<'_>) -> bool {
145
145
 
146
146
  /// What a directory's read answers, as Linux's `generic_read_dir` is every
147
147
  /// directory's `f_op->read`.
148
- pub fn generic_read_dir() -> Result<usize, FilesystemError> {
149
- Err(FilesystemError::IsADirectory)
148
+ pub fn generic_read_dir() -> Result<usize, Errno> {
149
+ Err(Errno::IsADirectory)
150
150
  }
151
151
 
152
152
  /// Refuse a name no directory can hold, as Linux's `verify_dirent_name` refuses
153
153
  /// what a Filesystem hands it, so whoever walks a listing is never handed a
154
154
  /// path where it was promised one name. A Filesystem that asks about each name
155
155
  /// before it lists them asks this first.
156
- pub fn verify_dirent_name(name: &str) -> Result<(), FilesystemError> {
156
+ pub fn verify_dirent_name(name: &str) -> Result<(), Errno> {
157
157
  if name.is_empty() || name.len() >= PATH_MAX || name.contains('/') {
158
- return Err(FilesystemError::Other(
158
+ return Err(Errno::Other(
159
159
  "a Filesystem listed a name no directory can hold".to_string(),
160
160
  ));
161
161
  }
@@ -1,14 +1,17 @@
1
1
  //! Looking at what stands at a path, as Linux's `fstatat` and
2
2
  //! `readlinkat` do.
3
3
 
4
+ use std::hash::{BuildHasher, RandomState};
4
5
  use std::sync::atomic::{AtomicU64, Ordering};
5
- use std::sync::Arc;
6
- use std::time::SystemTime;
6
+ use std::sync::{Arc, LazyLock};
7
+ use std::time::{SystemTime, UNIX_EPOCH};
7
8
 
8
- use super::cred::Cred;
9
+ use super::inode::Identity;
9
10
  use super::namei::{filename_lookup, retry_estale};
10
11
  use super::path::Start;
11
- use super::FilesystemError;
12
+ use super::Errno;
13
+ use crate::cred::Cred;
14
+ use crate::profile::Profile;
12
15
 
13
16
  /// What a path names, as Linux's file types `FT_*` name each kind.
14
17
  #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -101,14 +104,15 @@ impl Kstat {
101
104
  ..self
102
105
  }
103
106
  }
107
+ }
104
108
 
105
- /// A device number for a Filesystem with none of its own, as each
106
- /// tmpfs mount takes one: no earlier call returned it, and its top bit,
107
- /// which no host's `st_dev` sets, keeps it apart from a host's.
108
- pub fn unique_device() -> u64 {
109
- static NEXT: AtomicU64 = AtomicU64::new(1);
110
- (1 << 63) | NEXT.fetch_add(1, Ordering::Relaxed)
111
- }
109
+ /// Take a device number for a Filesystem with none of its own, as each
110
+ /// tmpfs mount takes one through Linux's `get_anon_bdev`: no earlier call
111
+ /// returned it, and its top bit, which no host's `st_dev` sets, keeps it
112
+ /// apart from a host's.
113
+ pub fn get_anon_bdev() -> u64 {
114
+ static NEXT: AtomicU64 = AtomicU64::new(1);
115
+ (1 << 63) | NEXT.fetch_add(1, Ordering::Relaxed)
112
116
  }
113
117
 
114
118
  /// What `path` beneath `start` names, as Linux's `vfs_fstatat` answers: a
@@ -120,7 +124,7 @@ pub fn vfs_fstatat(
120
124
  start: &impl Start,
121
125
  path: &str,
122
126
  follow: bool,
123
- ) -> Result<Kstat, FilesystemError> {
127
+ ) -> Result<Kstat, Errno> {
124
128
  retry_estale(
125
129
  || filename_lookup(cred, start, path, follow),
126
130
  |nd| nd.getattr(),
@@ -132,26 +136,158 @@ pub fn vfs_fstatat(
132
136
  /// It takes the name with `LOOKUP_EMPTY`, so an empty one names `start`
133
137
  /// itself, and anything but a link there is not found. The caller's buffer is
134
138
  /// the ABI's to judge, as only its syscall has one.
135
- pub fn do_readlinkat(
136
- cred: &Arc<Cred>,
137
- start: &impl Start,
138
- path: &str,
139
- ) -> Result<String, FilesystemError> {
139
+ pub fn do_readlinkat(cred: &Arc<Cred>, start: &impl Start, path: &str) -> Result<String, Errno> {
140
140
  let walk = || match path.is_empty() {
141
- true => Ok((
142
- start.path_init()?.dentry().clone(),
143
- FilesystemError::NotFound,
144
- )),
141
+ true => Ok((start.path_init()?.dentry().clone(), Errno::NotFound)),
145
142
  false => Ok((
146
143
  filename_lookup(cred, start, path, false)?.path()?,
147
- FilesystemError::InvalidInput,
144
+ Errno::InvalidInput,
148
145
  )),
149
146
  };
150
147
  retry_estale(walk, |(target, refusal)| {
151
- if target.kind()? != FileType::Symlink {
148
+ if target.file_type()? != FileType::Symlink {
152
149
  return Err(refusal);
153
150
  }
154
151
  cred.security_inode_readlink(&target)?;
155
152
  target.get_link()
156
153
  })
157
154
  }
155
+
156
+ /// `stat` as the caller `cred` is made for sees it, whichever ABI a Wasm
157
+ /// Driver encodes it into, as Linux's `cp_new_stat` reports an owner in the
158
+ /// caller's user namespace. A Filesystem records the host's real time whatever
159
+ /// the invocation writing to it runs under, so one shared across invocations
160
+ /// keeps one record; a hermetic caller sees every time at the Unix epoch,
161
+ /// where its wall clock stands, so a time a write left behind is no clock it
162
+ /// can read. A link reports no size, so nothing of where it points reaches the
163
+ /// caller, and an entry is told apart only by what `ino_of` answers.
164
+ pub fn cp_new_stat(cred: &Cred, stat: Kstat) -> Kstat {
165
+ let ino = ino_of(cred, Identity::of(&stat));
166
+ let masked = match cred.profile() {
167
+ Profile::Permissive => stat,
168
+ Profile::Hermetic => {
169
+ let epoch = |time: Option<SystemTime>| time.map(|_| UNIX_EPOCH);
170
+ stat.with_times(epoch(stat.atime), epoch(stat.mtime), epoch(stat.ctime))
171
+ }
172
+ };
173
+ Kstat {
174
+ size: match masked.file_type {
175
+ FileType::Symlink => 0,
176
+ _ => masked.size,
177
+ },
178
+ ..masked.with_identity(0, ino)
179
+ }
180
+ }
181
+
182
+ /// The inode number the caller `cred` is made for sees for `identity`, in a
183
+ /// stat or a listing. A hermetic caller sees none, as a Filesystem's device
184
+ /// number depends on how many were made before it in the process. Any other
185
+ /// sees a hash of it under a key the process draws once, so it can tell
186
+ /// entries apart and cannot work back to a host's inode number.
187
+ pub fn ino_of(cred: &Cred, identity: Option<Identity>) -> u64 {
188
+ static KEY: LazyLock<RandomState> = LazyLock::new(RandomState::new);
189
+ match (cred.profile(), identity) {
190
+ (Profile::Hermetic, _) | (_, None) => 0,
191
+ (Profile::Permissive, Some(identity)) => KEY.hash_one(identity),
192
+ }
193
+ }
194
+
195
+ #[cfg(test)]
196
+ mod tests {
197
+ use std::time::{SystemTime, UNIX_EPOCH};
198
+
199
+ use super::{cp_new_stat, ino_of, FileType, Kstat};
200
+ use crate::cred::Cred;
201
+ use crate::profile::Profile;
202
+ use crate::vfs::Identity;
203
+
204
+ fn seen_by(profile: Profile, stat: Kstat) -> Kstat {
205
+ cp_new_stat(&Cred::default().with_profile(profile), stat)
206
+ }
207
+
208
+ // The Wasm Driver only encodes this, so another one shows the same, and a
209
+ // guest reads a link's size and a time here or nowhere.
210
+ // @behavior RT-173 RT-183
211
+ #[test]
212
+ fn a_guest_sees_no_size_for_a_link_and_only_what_its_profile_allows() {
213
+ let reported = Kstat::new(FileType::Symlink, 42)
214
+ .with_identity(7, 9)
215
+ .with_times(Some(SystemTime::now()), None, None);
216
+ let (hermetic, permissive) = (
217
+ seen_by(Profile::Hermetic, reported),
218
+ seen_by(Profile::Permissive, reported),
219
+ );
220
+ assert_eq!(
221
+ (hermetic.size, permissive.size, hermetic.ino, hermetic.atime),
222
+ (0, 0, 0, Some(UNIX_EPOCH)),
223
+ "a link's stat through cp_new_stat must report no size on any profile, and on the \
224
+ hermetic profile no inode number and every time at the Unix epoch"
225
+ );
226
+ assert!(
227
+ permissive.ino != 0 && permissive.ino != 9 && permissive.atime == reported.atime,
228
+ "a stat through cp_new_stat on the permissive profile must hash the inode number and \
229
+ keep the time"
230
+ );
231
+ }
232
+
233
+ // A device number depends on how many Filesystems the process made before,
234
+ // so the inode number a guest reads folds it in and the device stays out.
235
+ // @behavior RT-283
236
+ #[test]
237
+ fn a_guest_sees_one_device_for_every_entry() {
238
+ let reported = Kstat::new(FileType::RegFile, 1).with_identity(7, 9);
239
+ assert_eq!(
240
+ [Profile::Hermetic, Profile::Permissive].map(|profile| seen_by(profile, reported).dev),
241
+ [0, 0],
242
+ "the stat through cp_new_stat of an entry a Filesystem reports on device 7 must \
243
+ report device 0 on either profile"
244
+ );
245
+ }
246
+
247
+ // An unkeyed hash answers what anyone can compute from a host's numbers,
248
+ // so the hash a guest reads must differ from it.
249
+ // @behavior RT-194
250
+ #[test]
251
+ fn a_guest_cannot_compute_the_inode_number_it_reads() {
252
+ use std::collections::hash_map::DefaultHasher;
253
+ use std::hash::{Hash, Hasher};
254
+
255
+ let reported = Kstat::new(FileType::RegFile, 0).with_identity(7, 9);
256
+ let identity = Identity::of(&reported);
257
+ let mut unkeyed = DefaultHasher::new();
258
+ identity
259
+ .expect("an inode number names an identity")
260
+ .hash(&mut unkeyed);
261
+ let permissive = Cred::default().with_profile(Profile::Permissive);
262
+ let seen = ino_of(&permissive, identity);
263
+ assert_eq!(
264
+ seen,
265
+ ino_of(&permissive, identity),
266
+ "ino_of one identity must answer one number within a process"
267
+ );
268
+ assert_ne!(
269
+ seen,
270
+ unkeyed.finish(),
271
+ "ino_of on the permissive profile must not answer a hash anyone can compute from the \
272
+ device and inode numbers"
273
+ );
274
+ }
275
+
276
+ // A guest reads the count on any ABI, so the count starts in the runtime
277
+ // rather than in what a Wasm Driver encodes.
278
+ // @behavior RT-193
279
+ #[test]
280
+ fn an_entry_whose_filesystem_keeps_no_count_is_named_once() {
281
+ let reported = Kstat::new(FileType::RegFile, 0);
282
+ assert_eq!(
283
+ (
284
+ seen_by(Profile::Hermetic, reported).nlink,
285
+ seen_by(Profile::Permissive, reported).nlink,
286
+ seen_by(Profile::Permissive, reported.with_nlink(3)).nlink,
287
+ ),
288
+ (1, 1, 3),
289
+ "the stat through cp_new_stat of an entry reporting no count must show one name on \
290
+ each profile, and of one reporting three must show three"
291
+ );
292
+ }
293
+ }
@@ -3,9 +3,12 @@
3
3
  use std::sync::Arc;
4
4
 
5
5
  use super::dentry::{Dentries, Dentry, DentryOperations};
6
- use super::errno::FilesystemError;
7
6
  use super::inode::Inode;
8
7
  use crate::locking::RwSemaphore;
8
+ use crate::Errno;
9
+
10
+ /// Why an instance `new` made has its root: `new` refuses one without.
11
+ pub(crate) const MADE_ROOT: &str = "SuperBlock::new refuses an instance with no root";
9
12
 
10
13
  /// What makes an instance of a Filesystem, as Linux's `file_system_type`.
11
14
  /// Every lock beneath it waits through the one `Blocking` its process
@@ -18,7 +21,15 @@ pub trait FileSystemType: Send + Sync + 'static {
18
21
  /// Filesystem changed outside the runtime, whether nothing beneath it
19
22
  /// changes, and whether a name goes once unused. An instance that cannot
20
23
  /// stand answers why, and none is made.
21
- fn fill_super(self: Arc<Self>, sb: &mut SuperBlock) -> Result<(), FilesystemError>;
24
+ fn fill_super(self: Arc<Self>, sb: &mut SuperBlock) -> Result<(), Errno>;
25
+ }
26
+
27
+ /// A shared kind sets up an instance as the kind it shares, so a caller that
28
+ /// keeps its own `Arc` hands that `Arc` to `SuperBlock::new`.
29
+ impl<T: FileSystemType + ?Sized> FileSystemType for Arc<T> {
30
+ fn fill_super(self: Arc<Self>, sb: &mut SuperBlock) -> Result<(), Errno> {
31
+ T::fill_super(Arc::clone(&*self), sb)
32
+ }
22
33
  }
23
34
 
24
35
  /// One Filesystem instance, with the directories of it a walk reaches. Every
@@ -26,7 +37,7 @@ pub trait FileSystemType: Send + Sync + 'static {
26
37
  /// block, so a directory moved or removed beneath one is moved or removed
27
38
  /// beneath every other.
28
39
  pub struct SuperBlock {
29
- /// The root dentry `fill_super` made, as `s_root`.
40
+ /// The root dentry `fill_super` made, as Linux's `s_root`.
30
41
  root: Option<Arc<Dentry>>,
31
42
  dentries: Dentries,
32
43
  /// Held by a move between two directories, as Linux's
@@ -44,7 +55,7 @@ pub struct SuperBlock {
44
55
  impl SuperBlock {
45
56
  /// The instance `fs` makes, set up as its `fill_super` asks, or why it cannot
46
57
  /// stand. One whose `fill_super` made no root answers EINVAL.
47
- pub fn new(fs: Arc<dyn FileSystemType>) -> Result<Arc<Self>, FilesystemError> {
58
+ pub fn new(fs: impl FileSystemType) -> Result<Arc<Self>, Errno> {
48
59
  let mut sb = Self {
49
60
  root: None,
50
61
  dentries: Dentries::new(None),
@@ -52,8 +63,8 @@ impl SuperBlock {
52
63
  rdonly: false,
53
64
  dontcache: false,
54
65
  };
55
- fs.fill_super(&mut sb)?;
56
- sb.root.as_ref().ok_or(FilesystemError::InvalidInput)?;
66
+ Arc::new(fs).fill_super(&mut sb)?;
67
+ sb.root.as_ref().ok_or(Errno::InvalidInput)?;
57
68
  Ok(Arc::new(sb))
58
69
  }
59
70
 
@@ -63,13 +74,6 @@ impl SuperBlock {
63
74
  self.root = Some(self.dentries.make_root(root));
64
75
  }
65
76
 
66
- /// This instance's root dentry, which `new` refuses an instance without.
67
- pub(crate) fn s_root(&self) -> Arc<Dentry> {
68
- self.root
69
- .clone()
70
- .expect("SuperBlock::new refuses an instance with no root")
71
- }
72
-
73
77
  /// Have every dentry of this instance made from now on answer through
74
78
  /// `ops`, as a driver's `fill_super` calls `set_default_d_op` before
75
79
  /// `d_make_root`. Without it the runtime trusts every name it holds, as
@@ -78,7 +82,7 @@ impl SuperBlock {
78
82
  self.dentries.set_ops(ops);
79
83
  }
80
84
 
81
- /// What every dentry of this instance answers through, as `s_d_op`.
85
+ /// What every dentry of this instance answers through, as `__s_d_op`.
82
86
  pub fn d_op(&self) -> Option<&Arc<dyn DentryOperations>> {
83
87
  self.dentries.ops()
84
88
  }