FreeBSD: ucontext/mcontext, aarch64 fixes, librt linking, etc #1630

valpackett · 2019-12-30T00:31:28Z

adds mcontext/ucontext structs, needed for lucet
- on amd64 and aarch64 because that's what I have… (well I technically have armv7 but it's not set up properly)
fixes all tests on aarch64 (because I wanted to test mcontext)
- Add u128/i128 == __uint128_t/__int128_t gnzlbg/ctest#89 necessary to handle u128
  - I haven't noticed [Draft] Add __int128 to unix targets #1414… hmm?? is that the better approach?

rust-highfive · 2019-12-30T00:31:31Z

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

valpackett · 2020-05-09T12:58:07Z

ping. this is really needed for Lucet, which is in pretty good shape now.

we could leave FreeBSD/aarch64 untested because the tests currently don't work in master anyway. or I could split the aarch64 mcontext into a separate PR that would wait for proper 128 bit support in tests or whatever is needed.

JohnTitor · 2020-05-09T13:02:38Z

Sorry for the delay, I'll check it later.
r? @JohnTitor

JohnTitor · 2020-05-10T09:00:00Z

Hm, CI fails: nightly x86_64-unknown-freebsd-10. Also needs to fix style issues.

valpackett · 2020-05-16T22:25:39Z

CI fails: nightly x86_64-unknown-freebsd-10

Added ucontext.h to libc-test headers. (On newer versions it was picked up transitively).

Now docs for i686 fail to generate??

cannot find type ucontext_t in this scope

but.. I see there's plenty of target_arch usage and I think this particular CI didn't fail on the previous push o_0

valpackett · 2020-06-18T15:16:30Z

Fixed style
Moved the cfg outside of the s_no_extra_traits!, now docs don't fail
Added new fix: aio_* and mq_* functions need linking to librt! How did no one notice this o_0

Now all CI failures seem unrelated

valpackett · 2020-06-26T08:30:50Z

ping

JohnTitor · 2020-06-30T23:29:04Z

Oh, sorry for the delay! Unfortunately, the build log has been gone, re-triggering CI.

valpackett · 2020-07-03T18:21:37Z

Do you want us to ship this ASAP?

Yes, that would be very good.

JohnTitor · 2020-07-04T17:02:35Z

CI still fails with importing and Copy trait issues.

valpackett · 2020-07-04T18:36:35Z

That looks like some really ancient rustcs not being able to apply cfg to a macro invocation >_<

I guess I can move the whole ucontext_t to x86_64 for now, and deal with making it multi platform later..

JohnTitor · 2020-07-05T20:09:20Z

src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs

@@ -78,6 +80,16 @@ s_no_extra_traits! {
        pub xmm_reg: [[u8; 16]; 8],
        pub xmm_pad: [u8; 224],
    }
+
+    #[cfg_attr(feature = "extra_traits", derive(Debug))]


This is unnecessary since s! macro already derives it.

No, this is s_no_extra_traits!

I guess since we implement everything on mcontext, ucontext could go into s..

upd: well after adding Hash we do

JohnTitor · 2020-07-05T20:10:47Z

src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs

+    #[cfg_attr(feature = "extra_traits", derive(Debug))]
+    pub struct ucontext_t {
+        pub uc_sigmask: ::sigset_t,
+        pub uc_mcontext: ::mcontext_t,


This causes importing failure:

error[E0412]: cannot find type `mcontext_t` in the crate root --> src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs:87:28 | 87 | pub uc_mcontext: ::mcontext_t, | ^^^^^^^^^^ did you mean `ucontext_t`?

I guess these ancient rustcs were single pass and the pub use self::align::* at the bottom doesn't bring it into this scope?!

Screw it, moving ucontext_t into the align module too.

JohnTitor · 2020-07-06T06:08:35Z

Okay, now looks fine to me!
Remaining CI failures are spurious and #1812 fixed one of them, could you rebase?

I just got 'libxul.so: Undefined symbol "mq_close"' when rebuilding Firefox.. How did no one catch this before?? This is correct for both FreeBSD and DragonFly: https://github.com/freebsd/freebsd/blob/master/lib/librt/Symbol.map https://github.com/DragonFlyBSD/DragonFlyBSD/blob/e7ab884bd49753f8884eb597d10d6569a08fa0df/lib/librt/mq.c https://github.com/DragonFlyBSD/DragonFlyBSD/blob/e7ab884bd49753f8884eb597d10d6569a08fa0df/lib/librt/aio.c

sys/stat.h is a machine-independent header, but it has ifdefs for i386. The version that was called x86_64.rs should be used on powerpc64 too, but I don't have a machine to test that on.

Wide chars are unsigned when normal chars are

It was picked up transitively on >10, but tests failed on 10

…renames Plus, add new constants for sysctls that give names to existing magic numbers. https://reviews.freebsd.org/rS350749 https://reviews.freebsd.org/rS352486

https://reviews.freebsd.org/rS357382

valpackett · 2020-07-06T14:59:29Z

Done!

JohnTitor

Thanks!

asomers · 2021-01-03T17:23:51Z

For the case of aio_ functions, nobody noticed the lack of librt before because it isn't required. Linking to librt is only required if you wish to use SIGEV_THREAD completion notifications. Everything else requires only libc. That requirement is documented in the sigevent(3) man page.

Using SIGEV_THREAD is very rare in practice, because the performance is not so good. In fact, due to Rust's originally poor support for C unions, libc's definition for struct sigevent doesn't even allow you to set the fields needed by SIGEV_THREAD! So we shouldn't link those functions to librt.

Your change was of course correct as regards mq_ functions.

On FreeBSD, the aio_ functions require librt _only_ if they use SIGEV_THREAD completion notification. However, due to Rust's originally poor support for C unions, libc doesn't even expose some of the fields of struct sigevent that SIGEV_THREAD requires. Accordingly, there is no need to link librt to programs using aio via libc. This change partially reverts 8c23f77 from PR rust-lang#1630 .

On FreeBSD, the aio_ functions require librt _only_ if they use SIGEV_THREAD completion notification. However, due to Rust's originally poor support for C unions, libc doesn't even expose some of the fields of struct sigevent that SIGEV_THREAD requires. Accordingly, there is no need to link librt to programs using aio via libc. This change partially reverts 8c23f77 from PR rust-lang#1630 . While I'm here, fix the linkage of lio_listio on DragonflyBSD. It _does_ require librt.

aio functions do not require librt on FreeBSD On FreeBSD, the aio_ functions require librt _only_ if they use SIGEV_THREAD completion notification. However, due to Rust's originally poor support for C unions, libc doesn't even expose some of the fields of struct sigevent that SIGEV_THREAD requires. Accordingly, there is no need to link librt to programs using aio via libc. This change partially reverts 8c23f77 from PR #1630 . While I'm here, fix the linkage of lio_listio on DragonflyBSD. It _does_ require librt.

rust-highfive assigned gnzlbg Dec 30, 2019

valpackett force-pushed the freebsd-mcontext branch 3 times, most recently from d65b0da to 2481232 Compare December 30, 2019 14:20

MikaelUrankar mentioned this pull request Jan 25, 2020

Port to FreeBSD wasmerio/wasmer#1120

Merged

1 task

valpackett force-pushed the freebsd-mcontext branch from 2481232 to 8ea285d Compare April 14, 2020 22:07

valpackett force-pushed the freebsd-mcontext branch from 8ea285d to 67e42ab Compare May 9, 2020 12:43

valpackett mentioned this pull request May 9, 2020

Support FreeBSD bytecodealliance/lucet#419

Closed

valpackett force-pushed the freebsd-mcontext branch from 67e42ab to fd1a77d Compare May 9, 2020 12:59

rust-highfive assigned JohnTitor and unassigned gnzlbg May 9, 2020

valpackett force-pushed the freebsd-mcontext branch from fd1a77d to c86b93b Compare May 16, 2020 16:25

valpackett mentioned this pull request Jun 8, 2020

Add FreeBSD x86-64 support to runtime trap handler bytecodealliance/wasmtime#1675

Closed

valpackett force-pushed the freebsd-mcontext branch 7 times, most recently from 3867299 to 009b1e8 Compare June 18, 2020 14:13

JohnTitor closed this Jun 30, 2020

JohnTitor reopened this Jun 30, 2020

valpackett force-pushed the freebsd-mcontext branch from 8531a0c to af0442b Compare July 3, 2020 18:20

valpackett force-pushed the freebsd-mcontext branch from af0442b to 6c68110 Compare July 4, 2020 18:52

JohnTitor reviewed Jul 5, 2020

View reviewed changes

valpackett force-pushed the freebsd-mcontext branch 4 times, most recently from c638821 to 443cf7b Compare July 5, 2020 22:41

JohnTitor mentioned this pull request Jul 6, 2020

SYS_ftruncate is missing on Arm64 #1803

Closed

valpackett added 8 commits July 6, 2020 15:31

FreeBSD: use stat header in freebsd11/freebsd12 on aarch64

e9a75dd

sys/stat.h is a machine-independent header, but it has ifdefs for i386. The version that was called x86_64.rs should be used on powerpc64 too, but I don't have a machine to test that on.

FreeBSD: fix SIGSTKSZ on arm/aarch64 / add MINSIGSTKSZ

45e7b8b

FreeBSD: make wchar_t unsigned on arm/aarch64

1366bda

Wide chars are unsigned when normal chars are

FreeBSD: add mcontext_t/ucontext_t (only amd64 for now)

9340bb3

FreeBSD: add ucontext.h to libc-test

1e66be9

It was picked up transitively on >10, but tests failed on 10

FreeBSD: chase CTL_UNSPEC to CTL_SYSCTL, IPPROTO_SEP to IPPROTO_DCCP …

9fc2574

…renames Plus, add new constants for sysctls that give names to existing magic numbers. https://reviews.freebsd.org/rS350749 https://reviews.freebsd.org/rS352486

FreeBSD: new rand()/srand() ABI in 13

962b984

https://reviews.freebsd.org/rS357382

valpackett force-pushed the freebsd-mcontext branch from 443cf7b to 962b984 Compare July 6, 2020 12:31

valpackett changed the title ~~FreeBSD: ucontext/mcontext, aarch64 fixes~~ FreeBSD: ucontext/mcontext, aarch64 fixes, librt linking, etc Jul 6, 2020

JohnTitor approved these changes Jul 6, 2020

View reviewed changes

JohnTitor merged commit 4fc045c into rust-lang:master Jul 6, 2020

asomers mentioned this pull request Jan 3, 2021

aio functions do not require librt on FreeBSD #2018

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FreeBSD: ucontext/mcontext, aarch64 fixes, librt linking, etc #1630

FreeBSD: ucontext/mcontext, aarch64 fixes, librt linking, etc #1630

valpackett commented Dec 30, 2019

rust-highfive commented Dec 30, 2019

valpackett commented May 9, 2020

JohnTitor commented May 9, 2020

JohnTitor commented May 10, 2020

valpackett commented May 16, 2020

valpackett commented Jun 18, 2020

valpackett commented Jun 26, 2020

JohnTitor commented Jun 30, 2020

valpackett commented Jul 3, 2020

JohnTitor commented Jul 4, 2020

valpackett commented Jul 4, 2020

JohnTitor Jul 5, 2020

valpackett Jul 5, 2020 •

edited

Loading

JohnTitor Jul 5, 2020

valpackett Jul 5, 2020

JohnTitor commented Jul 6, 2020

valpackett commented Jul 6, 2020

JohnTitor left a comment

asomers commented Jan 3, 2021

FreeBSD: ucontext/mcontext, aarch64 fixes, librt linking, etc #1630

FreeBSD: ucontext/mcontext, aarch64 fixes, librt linking, etc #1630

Conversation

valpackett commented Dec 30, 2019

rust-highfive commented Dec 30, 2019

valpackett commented May 9, 2020

JohnTitor commented May 9, 2020

JohnTitor commented May 10, 2020

valpackett commented May 16, 2020

valpackett commented Jun 18, 2020

valpackett commented Jun 26, 2020

JohnTitor commented Jun 30, 2020

valpackett commented Jul 3, 2020

JohnTitor commented Jul 4, 2020

valpackett commented Jul 4, 2020

JohnTitor Jul 5, 2020

Choose a reason for hiding this comment

valpackett Jul 5, 2020 • edited Loading

Choose a reason for hiding this comment

JohnTitor Jul 5, 2020

Choose a reason for hiding this comment

valpackett Jul 5, 2020

Choose a reason for hiding this comment

JohnTitor commented Jul 6, 2020

valpackett commented Jul 6, 2020

JohnTitor left a comment

Choose a reason for hiding this comment

asomers commented Jan 3, 2021

valpackett Jul 5, 2020 •

edited

Loading