Skip to content

Extends AArch64 branch protection support to include GCS - #146338

Merged
bors merged 3 commits into
rust-lang:masterfrom
CrooseGit:dev/reucru01/AArch64-enable-GCS
Sep 24, 2025
Merged

Extends AArch64 branch protection support to include GCS#146338
bors merged 3 commits into
rust-lang:masterfrom
CrooseGit:dev/reucru01/AArch64-enable-GCS

Conversation

@CrooseGit

@CrooseGitCrooseGit commented Sep 8, 2025

Copy link
Copy Markdown
Contributor

Extends existing support for AArch64 branch protection to include support for Guarded Control Stacks.

@rustbot

rustbot commented Sep 8, 2025

Copy link
Copy Markdown
Collaborator

r? @davidtwco

rustbot has assigned @davidtwco.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbotrustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-run-make Area: port run-make Makefiles to rmake.rs PG-exploit-mitigations Project group: Exploit mitigations S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 8, 2025
@rustbot

rustbot commented Sep 8, 2025

Copy link
Copy Markdown
Collaborator

Some changes occurred in src/doc/unstable-book/src/compiler-flags/branch-protection.md

cc @rust-lang/project-exploit-mitigations, @rcvalle

@davidtwco

davidtwco commented Sep 8, 2025

Copy link
Copy Markdown
Member

I've reviewed this internally so will reroll. GCS is exposed in Clang through their -mbranch-protection flag, so this just mirrors that like the rest of this flag.

r? compiler

@rustbotrustbot assigned nnethercote and unassigned davidtwcoSep 8, 2025
Urgau
Urgau approved these changes Sep 8, 2025
View reviewed changes

@UrgauUrgau left a comment •
edited by rustbot
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems pretty straightforward, and looks consistent with clang.

View changes since this review

Comment threadtests/ui/invalid-compile-flags/branch-protection-missing-pac-ret.BADFLAGS.stderr Outdated
@Urgau

Urgau commented Sep 8, 2025

Copy link
Copy Markdown
Member

r=me with the updated test output and CI green

r? Urgau
@bors delegate+

@bors

bors commented Sep 8, 2025

Copy link
Copy Markdown
Collaborator

✌️ @CrooseGit, you can now approve this pull request!

If @Urgau told you to "r=me" after making some further change, please make that change, then do @bors r=@Urgau

@rust-log-analyzer

This comment has been minimized.

Sign in to view
nnethercote
nnethercote reviewed Sep 8, 2025
View reviewed changes

@nnethercotennethercote left a comment •
edited by rustbot
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @Urgau!

View changes since this review

@CrooseGit
CrooseGitforce-pushed the dev/reucru01/AArch64-enable-GCS branch from b50c4db to d949360CompareSeptember 9, 2025 10:11
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@CrooseGit

This comment was marked as resolved.

Sign in to view
@Urgau

Urgau commented Sep 9, 2025

Copy link
Copy Markdown
Member

Does your local rustc uses LLVM 19 (like the job)? Or are you building LLVM locally/with download-ci-llvm?

@davidtwco

davidtwco commented Sep 9, 2025

Copy link
Copy Markdown
Member

Checked locally and it's the LLVM version that is causing this, just add a //@ min-llvm-version: 21 directive only for the GCS revision (or //@ min-llvm-version: 20 if it works with that version).

@CrooseGit
CrooseGitforce-pushed the dev/reucru01/AArch64-enable-GCS branch from d949360 to 7ade636CompareSeptember 10, 2025 10:25
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbotrustbot added A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Sep 10, 2025
@CrooseGit

CrooseGit commented Sep 11, 2025

Copy link
Copy Markdown
ContributorAuthor

@bors r=@Urgau

Thank you

@bors

bors commented Sep 11, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit 661289b has been approved by Urgau

It is now in the queue for this repository.

@CrooseGit
CrooseGitforce-pushed the dev/reucru01/AArch64-enable-GCS branch from f043fb8 to e02bd51CompareSeptember 19, 2025 14:06
@Urgau

Urgau commented Sep 19, 2025

Copy link
Copy Markdown
Member

@bors try jobs=aarch64

@rust-bors

This comment has been minimized.

Sign in to view
rust-borsBot added a commit that referenced this pull request Sep 19, 2025
@rust-bors
Auto merge of#146338- CrooseGit:dev/reucru01/AArch64-enable-GCS, r=…
c3587c9
…<try>
Extends AArch64 branch protection support to include GCS
try-job: *aarch64*
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-bors

rust-borsBot commented Sep 19, 2025

Copy link
Copy Markdown
Contributor

💔 Test for c3587c9 failed: CI. Failed jobs:

jieyouxu
jieyouxu reviewed Sep 20, 2025
View reviewed changes
Comment threadsrc/ci/docker/host-aarch64/aarch64-gnu-debug/Dockerfile Outdated
Comment threadsrc/ci/docker/host-aarch64/aarch64-gnu-debug/Dockerfile Outdated
@CrooseGit
CrooseGitforce-pushed the dev/reucru01/AArch64-enable-GCS branch from e02bd51 to bb893dfCompareSeptember 22, 2025 10:39
@CrooseGit
Changes some aarch64 CIs g++ install & ubuntu ver.
08020de
GCS support was added to GCC in version 15, thus the rmake test for this
patch requires GCC15
Similarly, the ubuntu version is updated so the newer clang version is
available, and/or GCC15 is the default.
@CrooseGit
CrooseGitforce-pushed the dev/reucru01/AArch64-enable-GCS branch from bb893df to 08020deCompareSeptember 23, 2025 12:59
@davidtwco

davidtwco commented Sep 23, 2025

Copy link
Copy Markdown
Member

@bors r=Urgau,davidtwco rollup-

@CrooseGit thinks that the CI failures should be resolved now and this will be able to be merged

@bors

bors commented Sep 23, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit 08020de has been approved by Urgau,davidtwco

It is now in the queue for this repository.

@borsbors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 23, 2025
Zalathar added a commit to Zalathar/rust that referenced this pull request Sep 24, 2025
@Zalathar
Rollup merge ofrust-lang#146338- CrooseGit:dev/reucru01/AArch64-ena…
b3d6a2d
…ble-GCS, r=Urgau,davidtwco
Extends AArch64 branch protection support to include GCS
Extends existing support for AArch64 branch protection to include support for [Guarded Control Stacks](https://community.arm.com/arm-community-blogs/b/architectures-and-processors-blog/posts/arm-a-profile-architecture-2022#guarded-control-stack-gcs:~:text=Extraction%20or%20tracking.-,Guarded%20Control%20Stack%20(GCS),-With%20the%202022).
@ZalatharZalathar mentioned this pull request Sep 24, 2025
Closed
@davidtwco

davidtwco commented Sep 24, 2025

Copy link
Copy Markdown
Member

@bors rollup=never

Failed in rollups a bunch previously

@bors

bors commented Sep 24, 2025

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 08020de with merge 15283f6...

@bors

bors commented Sep 24, 2025

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: Urgau,davidtwco
Pushing 15283f6 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Sep 24, 2025
@bors
bors merged commit 15283f6 into rust-lang:masterSep 24, 2025
11 checks passed
@rustbotrustbot added this to the 1.92.0 milestone Sep 24, 2025
@github-actions

github-actionsBot commented Sep 24, 2025

Copy link
Copy Markdown
Contributor
What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing e9385f9 (parent) -> 15283f6 (this PR)

Test differences

Show 30 test diffs

Stage 1

  • [assembly] tests/assembly-llvm/aarch64-pointer-auth.rs#GCS: [missing] -> ignore (ignored when the LLVM version 20.1.2 is older than 21.0.0) (J0)
  • [codegen] tests/codegen-llvm/branch-protection.rs#GCS: [missing] -> pass (J0)

Stage 2

  • [assembly] tests/assembly-llvm/aarch64-pointer-auth.rs#GCS: [missing] -> ignore (ignored when the LLVM version 20.1.8 is older than 21.0.0) (J1)
  • [assembly] tests/assembly-llvm/nvptx-safe-naming.rs#LLVM21: ignore (ignored when the LLVM version 20.1.2 is older than 21.0.0) -> ignore (ignored when the LLVM version 20.1.8 is older than 21.0.0) (J1)
  • [assembly] tests/assembly-llvm/sanitizer/kcfi/emit-arity-indicator.rs#x86_64: ignore (ignored when the LLVM version 20.1.2 is older than 21.0.0) -> ignore (ignored when the LLVM version 20.1.8 is older than 21.0.0) (J1)
  • [codegen] tests/codegen-llvm/dead_on_return.rs: ignore (ignored when the LLVM version 20.1.2 is older than 21.0.0) -> ignore (ignored when the LLVM version 20.1.8 is older than 21.0.0) (J1)
  • [codegen] tests/codegen-llvm/enum/enum-discriminant-eq.rs#LLVM21: ignore (ignored when the LLVM version 20.1.2 is older than 21.0.0) -> ignore (ignored when the LLVM version 20.1.8 is older than 21.0.0) (J1)
  • [codegen] tests/codegen-llvm/issues/issue-101082.rs#x86-64-v3: ignore (ignored when the LLVM version 20.1.2 is older than 21.0.0) -> ignore (ignored when the LLVM version 20.1.8 is older than 21.0.0) (J1)
  • [codegen] tests/codegen-llvm/issues/issue-122734-match-eq.rs: ignore (ignored when the LLVM version 20.1.2 is older than 21.0.0) -> ignore (ignored when the LLVM version 20.1.8 is older than 21.0.0) (J1)
  • [codegen] tests/codegen-llvm/issues/matches-logical-or-141497.rs: ignore (ignored when the LLVM version 20.1.2 is older than 21.0.0) -> ignore (ignored when the LLVM version 20.1.8 is older than 21.0.0) (J1)
  • [codegen] tests/codegen-llvm/issues/saturating-sub-index-139759.rs: ignore (ignored when the LLVM version 20.1.2 is older than 21.0.0) -> ignore (ignored when the LLVM version 20.1.8 is older than 21.0.0) (J1)
  • [codegen] tests/codegen-llvm/option-niche-eq.rs#LLVM21: ignore (ignored when the LLVM version 20.1.2 is older than 21.0.0) -> ignore (ignored when the LLVM version 20.1.8 is older than 21.0.0) (J1)
  • [codegen] tests/codegen-llvm/read-only-capture-opt.rs: ignore (ignored when the LLVM version 20.1.2 is older than 21.0.0) -> ignore (ignored when the LLVM version 20.1.8 is older than 21.0.0) (J1)
  • [codegen] tests/codegen-llvm/sanitizer/kcfi/add-kcfi-arity-flag.rs#x86_64: ignore (ignored when the LLVM version 20.1.2 is older than 21.0.0) -> ignore (ignored when the LLVM version 20.1.8 is older than 21.0.0) (J1)
  • [debuginfo-gdb] tests/debuginfo/include_string.rs: pass -> ignore (ignored when the GDB version is between 15.0 - 99.0) (J2)
  • [debuginfo-gdb] tests/debuginfo/macro-stepping.rs: ignore (ignored when the GDB version is lower than 13.0) -> ignore (ignored when the architecture is aarch64) (J2)
  • [debuginfo-gdb] tests/debuginfo/method-on-enum.rs: ignore (ignored when the GDB version is lower than 13.0) -> pass (J2)
  • [debuginfo-gdb] tests/debuginfo/multiline-calls.rs: ignore (ignored when the GDB version is lower than 16.0) -> pass (J2)
  • [debuginfo-gdb] tests/debuginfo/option-like-enum.rs: ignore (ignored when the GDB version is lower than 13.0) -> pass (J2)
  • [debuginfo-gdb] tests/debuginfo/strings-and-strs.rs: ignore (ignored when the GDB version is lower than 14.0) -> pass (J2)
  • [debuginfo-gdb] tests/debuginfo/unsized.rs: pass -> ignore (ignored when the GDB version is between 13.1 - 99.0) (J2)
  • [debuginfo-gdb] tests/debuginfo/vec-slices.rs: pass -> ignore (ignored when the GDB version is between 15.0 - 99.0) (J2)
  • [assembly] tests/assembly-llvm/aarch64-pointer-auth.rs#GCS: [missing] -> pass (J3)
  • [assembly] tests/assembly-llvm/aarch64-pointer-auth.rs#GCS: [missing] -> ignore (ignored when the target vendor is Apple ((XCode version needs updating))) (J4)
  • [run-make] tests/run-make/pointer-auth-link-with-c: pass -> ignore (ignored when the target vendor is Apple) (J4)
  • [run-make] tests/run-make/pointer-auth-link-with-c-lto-clang: ignore (ignored when RUSTBUILD_FORCE_CLANG_BASED_TESTS is not set) -> ignore (ignored when the target vendor is Apple) (J4)
  • [assembly] tests/assembly-llvm/aarch64-pointer-auth.rs#GCS: [missing] -> ignore (ignored when the LLVM version 20.1.2 is older than 21.0.0) (J5)
  • [codegen] tests/codegen-llvm/branch-protection.rs#GCS: [missing] -> pass (J6)

Additionally, 2 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
test-dashboard 15283f6fe95e5b604273d13a428bab5fc0788f5a --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. aarch64-gnu-debug: 4081.5s -> 9697.6s (137.6%)
  2. aarch64-gnu: 6710.2s -> 8865.2s (32.1%)
  3. pr-check-1: 1474.0s -> 1857.3s (26.0%)
  4. aarch64-gnu-llvm-20-2: 2154.5s -> 2626.6s (21.9%)
  5. x86_64-gnu-llvm-20: 2361.1s -> 2789.7s (18.2%)
  6. dist-apple-various: 3663.1s -> 4259.5s (16.3%)
  7. aarch64-gnu-llvm-20-1: 3383.6s -> 3921.4s (15.9%)
  8. pr-check-2: 2180.3s -> 2478.9s (13.7%)
  9. i686-gnu-nopt-1: 7277.3s -> 8090.1s (11.2%)
  10. i686-gnu-2: 5482.1s -> 6011.9s (9.7%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer

rust-timer commented Sep 24, 2025

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (15283f6): comparison URL.

Overall result: ❌✅ regressions and improvements - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

meanrangecount
Regressions ❌
(primary)		--0
Regressions ❌
(secondary)		0.2%[0.2%, 0.2%]1
Improvements ✅
(primary)		--0
Improvements ✅
(secondary)		-0.3%[-0.3%, -0.3%]1
All ❌✅ (primary)--0

Max RSS (memory usage)

Results (primary -0.7%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)		2.1%[2.1%, 2.1%]1
Regressions ❌
(secondary)		--0
Improvements ✅
(primary)		-3.5%[-3.5%, -3.5%]1
Improvements ✅
(secondary)		--0
All ❌✅ (primary)-0.7%[-3.5%, 2.1%]2

Cycles

Results (secondary -3.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)		--0
Regressions ❌
(secondary)		--0
Improvements ✅
(primary)		--0
Improvements ✅
(secondary)		-3.1%[-3.5%, -2.7%]2
All ❌✅ (primary)--0

Binary size

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

Bootstrap: 471.559s -> 471.213s (-0.07%)
Artifact size: 387.91 MiB -> 387.83 MiB (-0.02%)

@borsbors mentioned this pull request Sep 24, 2025
Merged
@ZalatharZalathar mentioned this pull request Oct 11, 2025
Merged
makai410 pushed a commit to makai410/rust that referenced this pull request Nov 8, 2025
@bors
Auto merge ofrust-lang#146338- CrooseGit:dev/reucru01/AArch64-enabl…
8d9b614
…e-GCS, r=Urgau,davidtwco
Extends AArch64 branch protection support to include GCS
Extends existing support for AArch64 branch protection to include support for [Guarded Control Stacks](https://community.arm.com/arm-community-blogs/b/architectures-and-processors-blog/posts/arm-a-profile-architecture-2022#guarded-control-stack-gcs:~:text=Extraction%20or%20tracking.-,Guarded%20Control%20Stack%20(GCS),-With%20the%202022).
makai410 pushed a commit to makai410/rust that referenced this pull request Nov 10, 2025
@bors
Auto merge ofrust-lang#146338- CrooseGit:dev/reucru01/AArch64-enabl…
8f1b8bf
…e-GCS, r=Urgau,davidtwco
Extends AArch64 branch protection support to include GCS
Extends existing support for AArch64 branch protection to include support for [Guarded Control Stacks](https://community.arm.com/arm-community-blogs/b/architectures-and-processors-blog/posts/arm-a-profile-architecture-2022#guarded-control-stack-gcs:~:text=Extraction%20or%20tracking.-,Guarded%20Control%20Stack%20(GCS),-With%20the%202022).
@davidtwcodavidtwco mentioned this pull request Mar 25, 2026
Open
4 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RalfJungRalfJungRalfJung left review comments
@davidtwcodavidtwcodavidtwco left review comments
@nnethercotennethercotennethercote left review comments
@UrgauUrgauUrgau approved these changes
@jieyouxujieyouxujieyouxu left review comments

Assignees

@UrgauUrgau

Labels

A-CIArea: Our Github Actions CIA-LLVMArea: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues.A-run-makeArea: port run-make Makefiles to rmake.rsA-testsuiteArea: The testsuite used to check the correctness of rustcmerged-by-borsThis PR was explicitly merged by bors.PG-exploit-mitigationsProject group: Exploit mitigationsS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-infraRelevant to the infrastructure team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.92.0

Development

Successfully merging this pull request may close these issues.

12 participants

@CrooseGit@rustbot@davidtwco@Urgau@bors@rust-log-analyzer@Zalathar@matthiaskrgr@rust-timer@RalfJung@nnethercote@jieyouxu