linux-like: add OPEN_TREE_CLONE and OPEN_TREE_CLOEXEC #3048

lucab · 2022-12-23T17:46:23Z

This adds the OPEN_TREE_CLONE and OPEN_TREE_CLOEXEC constants on Linux and Android.
Those are used by the open_tree() syscall and defined in mount.h:

https://github.com/torvalds/linux/blob/v6.1/include/uapi/linux/mount.h#L61-L65

rustbot · 2022-12-23T17:46:27Z

r? @JohnTitor

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

lucab · 2023-01-04T12:18:35Z

src/unix/linux_like/mod.rs

@@ -616,6 +616,8 @@ pub const MS_LAZYTIME: ::c_ulong = 0x2000000;
 pub const MS_ACTIVE: ::c_ulong = 0x40000000;
 pub const MS_MGC_VAL: ::c_ulong = 0xc0ed0000;
 pub const MS_MGC_MSK: ::c_ulong = 0xffff0000;
+pub const OPEN_TREE_CLONE: ::c_uint = 0x01;
+pub const OPEN_TREE_CLOEXEC: ::c_uint = O_CLOEXEC as ::c_uint;


Note for reviewers: these constants are typed as uint because they are used in the corresponding open_tree() syscall, which is defined with an unsigned flags argument:

SYSCALL_DEFINE3(open_tree, int, dfd, const char __user *, filename, unsigned, flags)

src/unix/linux_like/mod.rs

JohnTitor · 2023-01-06T10:34:22Z

Thanks! @bors r+

bors · 2023-01-06T10:34:24Z

📌 Commit c578f2f has been approved by JohnTitor

It is now in the queue for this repository.

bors · 2023-01-06T10:34:32Z

⌛ Testing commit c578f2f with merge 472875e...

linux-like: add OPEN_TREE_CLONE and OPEN_TREE_CLOEXEC This adds the `OPEN_TREE_CLONE` and `OPEN_TREE_CLOEXEC` constants on Linux and Android. Those are used by the `open_tree()` syscall and defined in `mount.h`: * https://github.com/torvalds/linux/blob/v6.1/include/uapi/linux/mount.h#L61-L65

bors · 2023-01-06T10:45:51Z

💔 Test failed - checks-actions

lucab · 2023-01-06T18:48:30Z

Amended to add missing linux/mount.h includes in libc-test logic.

JohnTitor · 2023-01-07T12:25:13Z

@bors r+

bors · 2023-01-07T12:25:14Z

📌 Commit 2fd7e81 has been approved by JohnTitor

It is now in the queue for this repository.

bors · 2023-01-07T12:25:23Z

⌛ Testing commit 2fd7e81 with merge d4a917e...

linux-like: add OPEN_TREE_CLONE and OPEN_TREE_CLOEXEC This adds the `OPEN_TREE_CLONE` and `OPEN_TREE_CLOEXEC` constants on Linux and Android. Those are used by the `open_tree()` syscall and defined in `mount.h`: * https://github.com/torvalds/linux/blob/v6.1/include/uapi/linux/mount.h#L61-L65

bors · 2023-01-07T12:36:13Z

💔 Test failed - checks-actions

lucab · 2023-01-08T12:11:21Z

CI failure:

/checkout/target/i686-unknown-linux-musl/debug/build/libc-test-edac14eb712d5cd2/out/main.c:120:10: fatal error: linux/mount.h: No such file or directory
120 | #include <linux/mount.h>
    |          ^~~~~~~~~~~~~~~

I'm a bit out of clues about why it cannot find linux/mount.h specifically, while all the other linux/*.h kernel headers seem fine. Is there some weird setup for kernel headers in CI? How can I trigger bors tests myself to dig into this?

JohnTitor · 2023-01-08T18:56:10Z

Hmm, our kernel version on musl is indeed quite old, IIUC but mount.h is more senior than it and I'm not sure why that happens.
You can find our CI structure here: https://github.com/rust-lang/libc/tree/master/ci
You're also now able to use @bors try, feel free to test on bors!
@bors delegate+

JohnTitor · 2023-01-08T18:56:48Z

@bors delegate+

bors · 2023-01-08T18:56:50Z

✌️ @lucab can now approve this pull request

lucab · 2023-01-09T10:45:53Z

@bors try

This adds the `OPEN_TREE_CLONE` and `OPEN_TREE_CLOEXEC` constants on Linux and Android. Those are used by the `open_tree()` syscall and defined in `mount.h`: * https://github.com/torvalds/linux/blob/v6.1/include/uapi/linux/mount.h#L61-L65

lucab · 2023-01-09T11:25:06Z

@bors try

bors · 2023-01-09T11:25:14Z

⌛ Trying commit 82ded69 with merge 87ed483...

linux-like: add OPEN_TREE_CLONE and OPEN_TREE_CLOEXEC This adds the `OPEN_TREE_CLONE` and `OPEN_TREE_CLOEXEC` constants on Linux and Android. Those are used by the `open_tree()` syscall and defined in `mount.h`: * https://github.com/torvalds/linux/blob/v6.1/include/uapi/linux/mount.h#L61-L65

bors · 2023-01-09T12:30:14Z

☀️ Try build successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Build commit: 87ed483 (87ed48351296c2d24fe8c5ee3d36d5d9dd3e9bd8)

lucab · 2023-01-09T13:56:08Z

Ok, so the problem with musl tests is that the headers snapshot at https://github.com/sabotage-linux/kernel-headers is from version 4.19.88. There has been a rework/split of kernel headers after that, but anyway the OPEN_TREE_* constants are more recent than that version.

I've reworked the tests to take that into account, and bors CI is green now.
This PR should be ready for stamping and merging now.

JohnTitor · 2023-01-09T14:07:17Z

Thank you! @bors r+

bors · 2023-01-09T14:07:20Z

📌 Commit 82ded69 has been approved by JohnTitor

It is now in the queue for this repository.

bors · 2023-01-09T14:07:30Z

⌛ Testing commit 82ded69 with merge 68ad935...

bors · 2023-01-09T15:10:13Z

☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: JohnTitor
Pushing 68ad935 to master...

rustbot assigned JohnTitor Dec 23, 2022

rustbot added the S-waiting-on-review label Dec 23, 2022

lucab commented Jan 4, 2023

View reviewed changes

JohnTitor reviewed Jan 5, 2023

View reviewed changes

src/unix/linux_like/mod.rs Outdated Show resolved Hide resolved

lucab force-pushed the ups/linux-open-tree-flags branch 2 times, most recently from 23bdd08 to c578f2f Compare January 6, 2023 09:54

JohnTitor approved these changes Jan 6, 2023

View reviewed changes

bors added S-waiting-on-bors and removed S-waiting-on-review labels Jan 6, 2023

bors added S-waiting-on-review and removed S-waiting-on-bors labels Jan 6, 2023

lucab force-pushed the ups/linux-open-tree-flags branch from c578f2f to 2fd7e81 Compare January 6, 2023 14:41

bors added S-waiting-on-bors and removed S-waiting-on-review labels Jan 7, 2023

bors added S-waiting-on-review and removed S-waiting-on-bors labels Jan 7, 2023

lucab force-pushed the ups/linux-open-tree-flags branch from 2fd7e81 to a24de67 Compare January 9, 2023 10:04

lucab force-pushed the ups/linux-open-tree-flags branch from a24de67 to 82ded69 Compare January 9, 2023 11:14

bors added S-waiting-on-bors and removed S-waiting-on-review labels Jan 9, 2023

bors merged commit 68ad935 into rust-lang:master Jan 9, 2023

lucab deleted the ups/linux-open-tree-flags branch January 9, 2023 16:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

linux-like: add OPEN_TREE_CLONE and OPEN_TREE_CLOEXEC #3048

linux-like: add OPEN_TREE_CLONE and OPEN_TREE_CLOEXEC #3048

lucab commented Dec 23, 2022

rustbot commented Dec 23, 2022

lucab Jan 4, 2023

JohnTitor commented Jan 6, 2023

bors commented Jan 6, 2023

bors commented Jan 6, 2023

bors commented Jan 6, 2023

lucab commented Jan 6, 2023 •

edited

JohnTitor commented Jan 7, 2023

bors commented Jan 7, 2023

bors commented Jan 7, 2023

bors commented Jan 7, 2023

lucab commented Jan 8, 2023

JohnTitor commented Jan 8, 2023

JohnTitor commented Jan 8, 2023

bors commented Jan 8, 2023

lucab commented Jan 9, 2023

lucab commented Jan 9, 2023

bors commented Jan 9, 2023

bors commented Jan 9, 2023

lucab commented Jan 9, 2023

JohnTitor commented Jan 9, 2023

bors commented Jan 9, 2023

bors commented Jan 9, 2023

bors commented Jan 9, 2023

linux-like: add OPEN_TREE_CLONE and OPEN_TREE_CLOEXEC #3048

linux-like: add OPEN_TREE_CLONE and OPEN_TREE_CLOEXEC #3048

Conversation

lucab commented Dec 23, 2022

rustbot commented Dec 23, 2022

lucab Jan 4, 2023

Choose a reason for hiding this comment

JohnTitor commented Jan 6, 2023

bors commented Jan 6, 2023

bors commented Jan 6, 2023

bors commented Jan 6, 2023

lucab commented Jan 6, 2023 • edited

JohnTitor commented Jan 7, 2023

bors commented Jan 7, 2023

bors commented Jan 7, 2023

bors commented Jan 7, 2023

lucab commented Jan 8, 2023

JohnTitor commented Jan 8, 2023

JohnTitor commented Jan 8, 2023

bors commented Jan 8, 2023

lucab commented Jan 9, 2023

lucab commented Jan 9, 2023

bors commented Jan 9, 2023

bors commented Jan 9, 2023

lucab commented Jan 9, 2023

JohnTitor commented Jan 9, 2023

bors commented Jan 9, 2023

bors commented Jan 9, 2023

bors commented Jan 9, 2023

lucab commented Jan 6, 2023 •

edited