Add fine-grained LLVM CFI support to the Rust compiler by rcvalle · Pull Request #95548 · rust-lang/rust

rcvalle · 2022-04-01T03:15:27Z

This PR improves the LLVM Control Flow Integrity (CFI) support in the Rust compiler by providing forward-edge control flow protection for Rust-compiled code only by aggregating function pointers in groups identified by their return and parameter types.

Forward-edge control flow protection for C or C++ and Rust -compiled code "mixed binaries" (i.e., for when C or C++ and Rust -compiled code share the same virtual address space) will be provided in later work as part of this project by identifying C char and integer type uses at the time types are encoded (see Type metadata in the design document in the tracking issue #89653).

LLVM CFI can be enabled with -Zsanitizer=cfi and requires LTO (i.e., -Clto).

Thank you again, @eddyb, @nagisa, @pcc, and @tmiasko for all the help!

rust-highfive · 2022-04-01T03:15:29Z

Some changes occured to rustc_codegen_gcc

cc @antoyo

rust-highfive · 2022-04-01T03:15:31Z

r? @davidtwco

(rust-highfive has picked a reviewer for you, use r? to override)

rcvalle · 2022-04-01T03:16:06Z

r? @nagisa

compiler/rustc_symbol_mangling/src/typeid/typeid_itanium_cxx_abi.rs

nagisa

Just a style pass. Too late for me to review the itanium thing but I imagine @tmiasko did a thorough pass through it already.

compiler/rustc_codegen_llvm/src/declare.rs

compiler/rustc_codegen_ssa/src/mir/block.rs

compiler/rustc_symbol_mangling/src/typeid.rs

nagisa · 2022-07-05T09:12:53Z

@bors try

bors · 2022-07-05T09:13:11Z

⌛ Trying commit 26e0e2fa35ec940179f6a6958695f5c983d9838f with merge f3b1bd9b4aaafaa85ca8ac59698ca6ac1b6c839d...

bors · 2022-07-05T10:40:54Z

💔 Test failed - checks-actions

bors · 2022-07-06T08:47:08Z

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

workingjubilee · 2022-07-06T10:14:59Z

@bors try

bors · 2022-07-06T10:15:07Z

⌛ Trying commit 7845e5af761b3bea8366f1f88ba10bc8e906cab0 with merge a607188a97cc5cd4d066808cbba3681a504ec3f0...

bors · 2022-07-06T11:45:33Z

☀️ Try build successful - checks-actions
Build commit: a607188a97cc5cd4d066808cbba3681a504ec3f0 (a607188a97cc5cd4d066808cbba3681a504ec3f0)

nagisa · 2022-07-06T20:43:59Z

@bors r+

bors · 2022-07-06T20:44:00Z

📌 Commit 7845e5af761b3bea8366f1f88ba10bc8e906cab0 has been approved by nagisa

bors · 2022-07-09T10:00:43Z

⌛ Testing commit 7845e5af761b3bea8366f1f88ba10bc8e906cab0 with merge b7043630dfadc284e196852738595393d6c541e7...

bors · 2022-07-09T10:22:54Z

💔 Test failed - checks-actions

Dylan-DPC · 2022-07-14T13:54:44Z

@bors rollup=iffy

bors · 2022-07-20T03:26:13Z

⌛ Testing commit 7845e5af761b3bea8366f1f88ba10bc8e906cab0 with merge 63a9c9d05059ba6cdb67b75bee1429c7166bb9fd...

bors · 2022-07-20T03:47:19Z

💔 Test failed - checks-actions

nagisa · 2022-07-23T12:27:07Z

@bors r+ rollup=never

bors · 2022-07-23T12:27:09Z

📌 Commit c8d90e270275f980ea42e76ccc3a52fe67d31cc4 has been approved by nagisa

It is now in the queue for this repository.

bors · 2022-07-23T13:03:06Z

⌛ Testing commit c8d90e270275f980ea42e76ccc3a52fe67d31cc4 with merge 5c514af3814b732c3702d4f9069e3bf8ae71aa85...

bors · 2022-07-23T13:33:50Z

💔 Test failed - checks-actions

This commit improves the LLVM Control Flow Integrity (CFI) support in the Rust compiler by providing forward-edge control flow protection for Rust-compiled code only by aggregating function pointers in groups identified by their return and parameter types. Forward-edge control flow protection for C or C++ and Rust -compiled code "mixed binaries" (i.e., for when C or C++ and Rust -compiled code share the same virtual address space) will be provided in later work as part of this project by identifying C char and integer type uses at the time types are encoded (see Type metadata in the design document in the tracking issue rust-lang#89653). LLVM CFI can be enabled with -Zsanitizer=cfi and requires LTO (i.e., -Clto).

This commit updates the documentation for the LLVM Control Flow Integrity (CFI) support in the Rust compiler (see rust-lang#95548 and rust-lang#89653).

nagisa · 2022-07-23T20:16:25Z

@bors r+

bors · 2022-07-23T20:16:27Z

📌 Commit f792f26 has been approved by nagisa

It is now in the queue for this repository.

bors · 2022-07-24T01:22:46Z

⌛ Testing commit f792f26 with merge db8086e...

bors · 2022-07-24T04:03:22Z

☀️ Test successful - checks-actions
Approved by: nagisa
Pushing db8086e to master...

rust-timer · 2022-07-24T05:18:52Z

Finished benchmarking commit (db8086e): comparison url.

Instruction count

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

Max RSS (memory usage)

Results

Primary benchmarks: no relevant changes found
Secondary benchmarks: 😿 relevant regressions found

	mean¹	max	count²
Regressions 😿 (primary)	N/A	N/A	0
Regressions 😿 (secondary)	3.6%	4.8%	2
Improvements 🎉 (primary)	N/A	N/A	0
Improvements 🎉 (secondary)	N/A	N/A	0
All 😿🎉 (primary)	N/A	N/A	0

Cycles

Results

Primary benchmarks: no relevant changes found
Secondary benchmarks: mixed results

	mean¹	max	count²
Regressions 😿 (primary)	N/A	N/A	0
Regressions 😿 (secondary)	3.4%	3.4%	1
Improvements 🎉 (primary)	N/A	N/A	0
Improvements 🎉 (secondary)	-3.1%	-3.1%	1
All 😿🎉 (primary)	N/A	N/A	0

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

the arithmetic mean of the percent change ↩ ↩²
number of relevant changes ↩ ↩²

rust-highfive assigned davidtwco Apr 1, 2022

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Apr 1, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 1, 2022

rust-highfive assigned nagisa and unassigned davidtwco Apr 1, 2022

This comment has been minimized.

Sign in to view

rcvalle force-pushed the rust-cfi-2 branch from 624e496 to d31336f Compare April 1, 2022 03:20

This comment has been minimized.

Sign in to view

rcvalle mentioned this pull request Apr 1, 2022

Tracking Issue for LLVM Control Flow Integrity (CFI) Support for Rust #89653

Open

6 tasks

rcvalle force-pushed the rust-cfi-2 branch from d31336f to 62a2e63 Compare April 1, 2022 04:32

rcvalle force-pushed the rust-cfi-2 branch from 62a2e63 to 0b21623 Compare April 1, 2022 04:47

rcvalle force-pushed the rust-cfi-2 branch from 0b21623 to 76de45c Compare April 1, 2022 05:18

rcvalle force-pushed the rust-cfi-2 branch from 76de45c to 576e955 Compare April 1, 2022 05:52

rcvalle force-pushed the rust-cfi-2 branch from 576e955 to 870052d Compare April 1, 2022 06:12

rcvalle force-pushed the rust-cfi-2 branch from 870052d to 7fead53 Compare April 1, 2022 06:17

rcvalle marked this pull request as ready for review April 1, 2022 16:37

rcvalle force-pushed the rust-cfi-2 branch from 7fead53 to 5789196 Compare April 2, 2022 19:44

tmiasko reviewed Apr 3, 2022

View reviewed changes

nagisa reviewed Apr 3, 2022

View reviewed changes

This comment has been minimized.

Sign in to view

rcvalle added 2 commits July 23, 2022 10:51

Update documentation for LLVM CFI support

f792f26

This commit updates the documentation for the LLVM Control Flow Integrity (CFI) support in the Rust compiler (see rust-lang#95548 and rust-lang#89653).

TaKO8Ki mentioned this pull request Aug 24, 2022

ICE: encode_const: unexpected type [usize; 1] with -Clto -Zsanitizer=cfi #100778

Closed

Uh oh!

Conversation

rcvalle commented Apr 1, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented Apr 1, 2022

Uh oh!

rust-highfive commented Apr 1, 2022

Uh oh!

rcvalle commented Apr 1, 2022

Uh oh!

This comment has been minimized.

This comment has been minimized.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nagisa left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nagisa commented Jul 5, 2022

Uh oh!

bors commented Jul 5, 2022

Uh oh!

bors commented Jul 5, 2022

Uh oh!

This comment has been minimized.

bors commented Jul 6, 2022

Uh oh!

workingjubilee commented Jul 6, 2022

Uh oh!

bors commented Jul 6, 2022

Uh oh!

bors commented Jul 6, 2022

Uh oh!

nagisa commented Jul 6, 2022

Uh oh!

bors commented Jul 6, 2022

Uh oh!

bors commented Jul 9, 2022

Uh oh!

bors commented Jul 9, 2022

Uh oh!

This comment has been minimized.

Dylan-DPC commented Jul 14, 2022

Uh oh!

bors commented Jul 20, 2022

Uh oh!

This comment has been minimized.

bors commented Jul 20, 2022

Uh oh!

nagisa commented Jul 23, 2022

Uh oh!

bors commented Jul 23, 2022

Uh oh!

bors commented Jul 23, 2022

Uh oh!

This comment has been minimized.

bors commented Jul 23, 2022

Uh oh!

nagisa commented Jul 23, 2022

Uh oh!

bors commented Jul 23, 2022

Uh oh!

bors commented Jul 24, 2022

Uh oh!

bors commented Jul 24, 2022

Uh oh!

rust-timer commented Jul 24, 2022

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

Uh oh!

rcvalle commented Apr 1, 2022 •

edited

Loading