extending filesystem support for Hermit #115984

stlankes · 2023-09-19T20:56:21Z

Extending std to create, change and read a directory for Hermit.

Hermit is a tier 3 platform and this PR changes only files, wich are related to the tier 3 platform.

rustbot · 2023-09-19T20:56:28Z

(rustbot has picked a reviewer for you, use r? to override)

rustbot · 2023-09-19T20:56:31Z

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

stlankes · 2023-09-20T19:54:45Z

Cc: @mkroening

thomcc

I'll give it a more thorough pass later this weekend. It mostly looks fine.

thomcc · 2023-09-19T21:47:14Z

library/std/src/sys/hermit/fs.rs

+
+                macro_rules! offset_ptr {
+                    ($entry_ptr:expr, $field:ident) => {{
+                        const OFFSET: isize = {


I think you can use https://doc.rust-lang.org/nightly/std/mem/macro.offset_of.html here.

thomcc · 2023-09-21T00:13:01Z

library/std/src/sys/hermit/fs.rs

+                        } else {
+                            #[allow(deref_nullptr)]
+                            {
+                                ptr::addr_of!((*ptr::null::<dirent>()).$field)


This is very gnarly, even if the branch is never taken....

thomcc · 2023-09-24T15:24:37Z

library/std/src/sys/hermit/fs.rs

+                    }
+                };
+
+                macro_rules! offset_ptr {


I'm not sure why this macro exists. Most/all of the use sites could be fine with another construct (either addr_of, or just (*p).field), no?

The only place I see something like it being needed is for the name field of the dirent (since it might not be entirely there) but at that point you can just use offset_of and casting, no?

stlankes · 2023-09-24T17:45:57Z

Hm, you are right. I will revise it.

mkroening · 2023-09-24T18:00:34Z

The offset_of macro seems to have its origin and explanation here: sys/unix/fs.rs#L705-L736.

Since we control both sides of this API, we might be able to avoid having to use it.

thomcc · 2023-09-24T18:02:26Z

I see, so that code is mostly copied from sys::unix? Hm... That's probably fine, then. It would be nice if it could be somehow reused, admittedly.

bors · 2023-09-25T13:08:31Z

☔ The latest upstream changes (presumably #116029) made this pull request unmergeable. Please resolve the merge conflicts.

stlankes · 2023-09-26T10:38:22Z

Hm, I agree, that this will be useful. However, the handling of error numbers are different and also a few system calls (e.g. readdir) have a different interface. Maybe I overlook something. But I think that this isn't so easy.

bors · 2023-10-22T06:30:33Z

☔ The latest upstream changes (presumably #116956) made this pull request unmergeable. Please resolve the merge conflicts.

mkroening · 2023-10-26T19:53:05Z

Rebased on latest master.

@thomcc, are you okay with the macro for now?

bors · 2023-11-18T23:33:45Z

☔ The latest upstream changes (presumably #118046) made this pull request unmergeable. Please resolve the merge conflicts.

bors · 2024-01-13T16:38:17Z

☔ The latest upstream changes (presumably #117285) made this pull request unmergeable. Please resolve the merge conflicts.

stlankes · 2024-01-17T19:27:40Z

@thomcc We revised the system call to read directory entries. I hope that interface is now more understandable.

thomcc · 2024-02-01T22:52:36Z

I'm going to be away for a few months, so I'm rerolling my PRs so that folks don't have to wait for me. Sorry/thanks.

r? libs

bors · 2024-02-29T16:19:34Z

☔ The latest upstream changes (presumably #121800) made this pull request unmergeable. Please resolve the merge conflicts.

rustbot · 2024-03-01T08:19:35Z

Some changes occurred in engine.rs, potentially modifying the public API of ObligationCtxt.

cc @lcnr, @compiler-errors

triagebot.toml has been modified, there may have been changes to the review queue.

cc @davidtwco, @wesleywiser

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

The new interface has some similarities to Linux system call getdents64. The system call reads several dirent64 structures. At the end of each dirent64 is stored the name of the file. The length of file name is implictly part of dirent64 because d_reclen contains size of dirent64 plus the length of the file name.

workingjubilee · 2024-03-06T21:42:42Z

library/std/src/sys/pal/hermit/fd.rs

@@ -48,6 +48,11 @@ impl FileDesc {
    pub fn set_nonblocking(&self, _nonblocking: bool) -> io::Result<()> {
        unsupported()
    }
+
+    pub fn fstat(&self, stat: *mut abi::stat) -> io::Result<()> {
+        cvt(unsafe { abi::fstat(self.fd.as_raw_fd(), stat) })?;


...Why did I have to trace through three different directories just to discover that this is referring to the hermit_abi crate? That is so confusing.

Excuse me for my late response.

I am a little bit confused. Why do you have trace three different directories? Do you mean I should move fstat from from fd.rs to fs.rs?

Or do you want that rename abi to hermit-abi? Maybe it is easier to understand...

Ah, I was a bit confused by the levels of indirection in general, but yes, I think probably using hermit_abi might be a bit clearer.

Ok, I would prefer to create an additional PR for these changes because I have to touch every file in library/std/src/sys/pal/hermit/. In addition, it doesn't belong to this PR.

m-ou-se · 2024-04-08T12:21:17Z

@bors r+ rollup

bors · 2024-04-08T12:21:20Z

📌 Commit b1c7804 has been approved by m-ou-se

It is now in the queue for this repository.

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#115984 (extending filesystem support for Hermit) - rust-lang#120144 (privacy: Stabilize lint `unnameable_types`) - rust-lang#122807 (Add consistency with phrases "meantime" and "mean time") - rust-lang#123089 (Add invariant to VecDeque::pop_* that len < cap if pop successful) - rust-lang#123595 (Documentation fix) - rust-lang#123625 (Stop exporting `TypeckRootCtxt` and `FnCtxt`.) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#115984 - hermit-os:fuse, r=m-ou-se extending filesystem support for Hermit Extending `std` to create, change and read a directory for Hermit. Hermit is a tier 3 platform and this PR changes only files, wich are related to the tier 3 platform.

Take up suggestion from the discussions within rust-lang#115984 to increase readability.

revise the interpretation of ReadDir for HermitOS HermitOS supports getdents64. As under Linux, the dirent64 entry `d_off` is not longer used, because its definition is not clear. Instead of `d_off` the entry `d_reclen` is used to determine the end of the dirent64 entry. In addition, take up `@workingjubilee` suggestion from the discussions in rust-lang#115984 to increase the readability. Hermit is a tier 3 platform and this PR changes only files, wich are related to the tier 3 platform.

Rollup merge of rust-lang#124304 - hermit-os:fuse, r=joboet revise the interpretation of ReadDir for HermitOS HermitOS supports getdents64. As under Linux, the dirent64 entry `d_off` is not longer used, because its definition is not clear. Instead of `d_off` the entry `d_reclen` is used to determine the end of the dirent64 entry. In addition, take up `@workingjubilee` suggestion from the discussions in rust-lang#115984 to increase the readability. Hermit is a tier 3 platform and this PR changes only files, wich are related to the tier 3 platform.

rustbot assigned thomcc Sep 19, 2023

rustbot added O-hermit Operating System: Hermit S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Sep 19, 2023

thomcc reviewed Sep 21, 2023

View reviewed changes

thomcc reviewed Sep 24, 2023

View reviewed changes

stlankes force-pushed the fuse branch from 41907fb to d577cb6 Compare September 26, 2023 10:31

This comment has been minimized.

Sign in to view

stlankes force-pushed the fuse branch from d577cb6 to 259c3cc Compare September 26, 2023 10:58

mkroening force-pushed the fuse branch from 259c3cc to 66e44a7 Compare October 26, 2023 19:52

stlankes force-pushed the fuse branch from 66e44a7 to d385e07 Compare November 20, 2023 19:20

stlankes force-pushed the fuse branch from d385e07 to f461c4a Compare January 17, 2024 19:25

This comment has been minimized.

Sign in to view

stlankes force-pushed the fuse branch 2 times, most recently from 2e7dba1 to f461c4a Compare January 18, 2024 12:40

rustbot assigned m-ou-se Feb 1, 2024

stlankes mentioned this pull request Feb 5, 2024

Unable to read directory entries hermit-os/hermit-rs#528

Closed

stlankes force-pushed the fuse branch from f461c4a to d145e4a Compare February 5, 2024 20:27

stlankes force-pushed the fuse branch from 1f390e1 to 18bfa2d Compare March 1, 2024 08:19

rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Mar 1, 2024

simonschoening and others added 2 commits March 1, 2024 09:20

Extending filesystem support for hermit-os

aa11bf6

stlankes force-pushed the fuse branch from 18bfa2d to b1c7804 Compare March 1, 2024 08:20

workingjubilee reviewed Mar 6, 2024

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 8, 2024

m-ou-se removed T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) A-meta Area: Issues & PRs about the rust-lang/rust repository itself labels Apr 8, 2024

matthiaskrgr mentioned this pull request Apr 8, 2024

Rollup of 6 pull requests #123628

Merged

bors merged commit beaca9c into rust-lang:master Apr 8, 2024
11 checks passed

rustbot added this to the 1.79.0 milestone Apr 8, 2024

stlankes deleted the fuse branch April 21, 2024 18:43

stlankes added a commit to hermit-os/rust that referenced this pull request Apr 23, 2024

increase the readability by using the unique name for the hermit-abi

3a73dfb

Take up suggestion from the discussions within rust-lang#115984 to increase readability.

stlankes added a commit to hermit-os/rust that referenced this pull request Apr 23, 2024

increase the readability by using the unique name for the hermit-abi

5aa779f

Take up suggestion from the discussions within rust-lang#115984 to increase readability.

stlankes mentioned this pull request Apr 23, 2024

revise the interpretation of ReadDir for HermitOS #124304

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

extending filesystem support for Hermit #115984

extending filesystem support for Hermit #115984

stlankes commented Sep 19, 2023 •

edited

Loading

rustbot commented Sep 19, 2023

rustbot commented Sep 19, 2023

stlankes commented Sep 20, 2023

thomcc left a comment

thomcc Sep 19, 2023

thomcc Sep 21, 2023

thomcc Sep 24, 2023

stlankes commented Sep 24, 2023

mkroening commented Sep 24, 2023 •

edited

Loading

thomcc commented Sep 24, 2023

bors commented Sep 25, 2023

stlankes commented Sep 26, 2023 •

edited

Loading

This comment has been minimized.

bors commented Oct 22, 2023

mkroening commented Oct 26, 2023

bors commented Nov 18, 2023

bors commented Jan 13, 2024

stlankes commented Jan 17, 2024

This comment has been minimized.

thomcc commented Feb 1, 2024

bors commented Feb 29, 2024

rustbot commented Mar 1, 2024

workingjubilee Mar 6, 2024

stlankes Mar 17, 2024 •

edited

Loading

stlankes Mar 24, 2024

workingjubilee Mar 25, 2024

stlankes Mar 26, 2024

m-ou-se commented Apr 8, 2024

bors commented Apr 8, 2024

extending filesystem support for Hermit #115984

extending filesystem support for Hermit #115984

Conversation

stlankes commented Sep 19, 2023 • edited Loading

rustbot commented Sep 19, 2023

rustbot commented Sep 19, 2023

stlankes commented Sep 20, 2023

thomcc left a comment

Choose a reason for hiding this comment

thomcc Sep 19, 2023

Choose a reason for hiding this comment

thomcc Sep 21, 2023

Choose a reason for hiding this comment

thomcc Sep 24, 2023

Choose a reason for hiding this comment

stlankes commented Sep 24, 2023

mkroening commented Sep 24, 2023 • edited Loading

thomcc commented Sep 24, 2023

bors commented Sep 25, 2023

stlankes commented Sep 26, 2023 • edited Loading

This comment has been minimized.

bors commented Oct 22, 2023

mkroening commented Oct 26, 2023

bors commented Nov 18, 2023

bors commented Jan 13, 2024

stlankes commented Jan 17, 2024

This comment has been minimized.

thomcc commented Feb 1, 2024

bors commented Feb 29, 2024

rustbot commented Mar 1, 2024

workingjubilee Mar 6, 2024

Choose a reason for hiding this comment

stlankes Mar 17, 2024 • edited Loading

Choose a reason for hiding this comment

stlankes Mar 24, 2024

Choose a reason for hiding this comment

workingjubilee Mar 25, 2024

Choose a reason for hiding this comment

stlankes Mar 26, 2024

Choose a reason for hiding this comment

m-ou-se commented Apr 8, 2024

bors commented Apr 8, 2024

stlankes commented Sep 19, 2023 •

edited

Loading

mkroening commented Sep 24, 2023 •

edited

Loading

stlankes commented Sep 26, 2023 •

edited

Loading

stlankes Mar 17, 2024 •

edited

Loading