update Miri #106121

RalfJung · 2022-12-24T12:52:28Z

Noteworthy PRs:

…plus test case

add graceful shim for the custom `O_TMPFILE` file opening flag plus test case I'm trying if I can get the [`tempfile`](https://crates.io/crates/tempfile) crate to work nicely with miri. Right now miri errors out due to an unsupported flag `O_TMPFILE` (= `0x410000`) passed to [`OpenOptions::custom_flags`](https://github.com/Stebalien/tempfile/blob/92ae3e9d6e82bdcfcf114be459d234d3602be2d4/src/file/imp/unix.rs#L71-L86). Interestingly, `tempfile` has a fallback in case the underlying file system does not support the `O_TMPFILE` flag, in which case `open`/`open64` is expected to return the error code `EOPNOTSUPP` (= `95`). This PR adds support for this scenario and also includes a test case (relevant [zulip](https://rust-lang.zulipchat.com/#narrow/stream/269128-miri/topic/miri.20and.20the.20.60tempfile.60.20crate) discussion).

Rustup

Allow configurable and platform-specific page sizes This fixes rust-lang#2644 by setting platform-default page sizes along with a command line flag to override size to a specific value (e.g. in the case of aarch64 Linux on M1 silicon). There's still some code cleanup to be done and tests need to be added but I'm opening this for now.

add provenance-related test One of the cases in rust-lang/miri#2182 actually works as intended since rust-lang#104054 (or maybe even earlier); make sure we test that.

make flag checks reobust against multi-bit flags and make eval_libc functions ICE on any problem

- test that the tmpdir Miri tests see is absolute and a directory - test that current_dir returns an absolute path

make unix path handling on Windows hosts (and vice versa) preserve absoluteness Also adds a magic Miri extern function so this conversion can be invoked by the program. That avoids having to duplicate that logic.

implement minimal epoll_create1 shim Implements minimal shim for rust-lang#602

Rustup

…ter sees them

Data race spans Fixes rust-lang/miri#2205 This adds output to data race errors very similar to the spans we emit for Stacked Borrows errors. For example, from our test suite: ``` help: The Atomic Load on thread `<unnamed>` is here --> tests/fail/data_race/atomic_read_na_write_race1.rs:23:13 | 23 | ... (&*c.0).load(Ordering::SeqCst) //~ ERROR: Data race detected between Atomic Load on thread `<unnamed>` and Write o... | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: The Write on thread `<unnamed>` is here --> tests/fail/data_race/atomic_read_na_write_race1.rs:19:13 | 19 | *(c.0 as *mut usize) = 32; | ^^^^^^^^^^^^^^^^^^^^^^^^^``` ``` Because of rust-lang/miri#2647 this comes without a perf regression, according to our benchmarks.

Rustup

rustbot · 2022-12-24T12:52:33Z

r? @Mark-Simulacrum

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

rustbot · 2022-12-24T12:52:36Z

The Miri subtree was changed

cc @rust-lang/miri

RalfJung · 2022-12-24T13:09:32Z

Strange, we have -D warnings in the Miri build but that lint did not fire...

 error: lifetime parameter `'tcx` never used
  --> src/tools/miri/src/shims/unix/linux/fd/socketpair.rs:18:12
   |
18 |     fn dup<'tcx>(&mut self) -> io::Result<Box<dyn FileDescriptor>> {
   |           -^^^^- help: elide the unused lifetime

gimbling-away · 2022-12-24T15:35:10Z

Is it just mine or does the Rustbot message not seem to actually ping rust-lang/miri? usually it's in bold

Mark-Simulacrum · 2022-12-24T15:41:03Z

Strange, we have -D warnings in the Miri build but that lint did not fire...

 error: lifetime parameter `'tcx` never used
  --> src/tools/miri/src/shims/unix/linux/fd/socketpair.rs:18:12
   |
18 |     fn dup<'tcx>(&mut self) -> io::Result<Box<dyn FileDescriptor>> {
   |           -^^^^- help: elide the unused lifetime

I don't think the lint is on by default, perhaps? rustbuild turns it on for in-tree things here: https://github.com/rust-lang/rust/blob/master/src/bootstrap/builder.rs#L1666

RalfJung · 2022-12-24T15:52:38Z

Ah... So we have to keep those flags in sync with our own CI then to avoid such issues.

enable some warnings that rustc bootstrap enables also use cargo-install to install josh-proxy, since the docker version cannot access SSH keys (needed for pushing)

RalfJung · 2022-12-25T14:42:17Z

Is it just mine or does the Rustbot message not seem to actually ping rust-lang/miri? usually it's in bold

It is bold here. 🤷

RalfJung · 2022-12-25T15:15:42Z

@bors r+ p=1

bors · 2022-12-25T15:15:43Z

📌 Commit d8b48d4 has been approved by RalfJung

It is now in the queue for this repository.

bors · 2022-12-25T17:39:09Z

⌛ Testing commit d8b48d4 with merge 298d763...

bors · 2022-12-25T20:51:31Z

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing 298d763 to master...

rust-timer · 2022-12-25T22:11:52Z

Finished benchmarking commit (298d763): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.5%	[-1.5%, -1.5%]	1
All ❌✅ (primary)	-	-	0

Cycles

This benchmark run did not return any relevant results for this metric.

update Miri Noteworthy PRs: - rust-lang/miri#2357 - rust-lang/miri#2646 - rust-lang/miri#2718 - rust-lang/miri#2721 - rust-lang/miri#2725

Pointerbender and others added 30 commits December 8, 2022 20:56

add graceful shim for the custom O_TMPFILE linux file opening flag …

20a4c73

…plus test case

Preparing for merge from rustc

4e9f839

Merge from rustc

aab3bce

fmt and clippy

3ba51ac

Auto merge of rust-lang#2719 - RalfJung:rustup, r=RalfJung

17b5fda

Rustup

Preparing for merge from rustc

30e4359

Merge from rustc

f25d8a6

Auto merge of rust-lang#2723 - RalfJung:rustup, r=RalfJung

6d4dd6e

Rustup

add support for variable page sizes to miri

7949f21

add provenance-related test

a4b966a

Auto merge of rust-lang#2726 - RalfJung:provenance-test, r=RalfJung

0876519

add provenance-related test One of the cases in rust-lang/miri#2182 actually works as intended since rust-lang#104054 (or maybe even earlier); make sure we test that.

make flag checks reobust against multi-bit flags

c905ef4

make eval_libc functions ICE on any problem

f0bb7c7

Auto merge of rust-lang#2727 - RalfJung:flags-and-libc, r=RalfJung

b8f972f

make flag checks reobust against multi-bit flags and make eval_libc functions ICE on any problem

expose host-to-target path conversion to interpreted program

c19ca08

More host/target path conversion tests:

a66780b

- test that the tmpdir Miri tests see is absolute and a directory - test that current_dir returns an absolute path

make unix path handling on Windows hosts preserve absoluteness

802987d

Windows targets: make sure current_dir is absolute

2949702

Auto merge of rust-lang#2725 - RalfJung:host-to-target-path, r=RalfJung

8b19af0

make unix path handling on Windows hosts (and vice versa) preserve absoluteness Also adds a magic Miri extern function so this conversion can be invoked by the program. That avoids having to duplicate that logic.

implement minimal epoll_create1 shim

1b51f37

Auto merge of rust-lang#2357 - DebugSteven:epoll_create1-shim, r=oli-obk

7893132

implement minimal epoll_create1 shim Implements minimal shim for rust-lang#602

Preparing for merge from rustc

33e5b95

Merge from rustc

3d67703

fmt

39bb865

Auto merge of rust-lang#2731 - RalfJung:rustup, r=RalfJung

e82a604

Rustup

Include a Span in VClock

d1184ae

Fix span management

d2e1c37

Re-enable the VClock ordering tests

749b2b0

saethlin and others added 6 commits December 23, 2022 13:45

Mention and number the components of a race in the order the interpre…

81fe37a

…ter sees them

Preparing for merge from rustc

0c14ad4

Merge from rustc

9c01e9f

fix warnings

e52e0d8

Auto merge of rust-lang#2738 - RalfJung:rustup, r=RalfJung

d23554f

Rustup

rustbot assigned Mark-Simulacrum Dec 24, 2022

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 24, 2022

RalfJung and others added 3 commits December 25, 2022 14:16

use cargo-install to install josh-proxy

fed7e2c

enable some warnings that rustc bootstrap enables

92b6562

Auto merge of rust-lang#2739 - RalfJung:misc, r=RalfJung

d8b48d4

enable some warnings that rustc bootstrap enables also use cargo-install to install josh-proxy, since the docker version cannot access SSH keys (needed for pushing)

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 Dec 25, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 25, 2022

bors merged commit 298d763 into rust-lang:master Dec 25, 2022

rustbot added this to the 1.68.0 milestone Dec 25, 2022

RalfJung deleted the miri branch December 27, 2022 11:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update Miri #106121

update Miri #106121

RalfJung commented Dec 24, 2022

rustbot commented Dec 24, 2022

rustbot commented Dec 24, 2022

RalfJung commented Dec 24, 2022

gimbling-away commented Dec 24, 2022

Mark-Simulacrum commented Dec 24, 2022

RalfJung commented Dec 24, 2022 via email

RalfJung commented Dec 25, 2022

RalfJung commented Dec 25, 2022

bors commented Dec 25, 2022

bors commented Dec 25, 2022

bors commented Dec 25, 2022

rust-timer commented Dec 25, 2022

update Miri #106121

update Miri #106121

Conversation

RalfJung commented Dec 24, 2022

rustbot commented Dec 24, 2022

rustbot commented Dec 24, 2022

RalfJung commented Dec 24, 2022

gimbling-away commented Dec 24, 2022

Mark-Simulacrum commented Dec 24, 2022

RalfJung commented Dec 24, 2022 via email

RalfJung commented Dec 25, 2022

RalfJung commented Dec 25, 2022

bors commented Dec 25, 2022

bors commented Dec 25, 2022

bors commented Dec 25, 2022

rust-timer commented Dec 25, 2022

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles