Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

android{12|13}-5.10 branches failing due to SRSO mitigations #635

Closed
nickdesaulniers opened this issue Sep 28, 2023 · 1 comment
Closed
Assignees

Comments

@nickdesaulniers
Copy link
Member

nickdesaulniers commented Sep 28, 2023

I have an internal bug filed to track this. Dumping its contents:

aosp/2736406 and aosp/2736405 upgraded our android13 and android12 linux-5.10.y based branches to v5.10.189. These contain the SRSO mitigations which broke the x86_64 build for LLD users.

At least one fix cb1eefc0463491ee09ce79acc44dc764e5269224 is in v5.10.191. If we're not planning another LTS uprev soon, then we should plan to cherry-pick the fixes from linux-5.10.y into the downstream android branches.

IIRC, there were three breakages from that SRSO mitigation series. All were resolved in stable; let me try to track down the necessary cherry-picks.

An interested question posed by GKH that I don't yet have an answer for:

How come TH didn't catch this.

Looking at the TH logs for the android12-5.10 merge, I can see that:

LLVM=1 was set, so LLD is being used.
the build succeeded.
Looking again at my CI dashboard, https://github.com/ClangBuiltLinux/continuous-integration2#readme, initially it looks like it may be [linker] version related, but it's more so the case that the CI jobs for older toolchains are run less frequently. Let me rekick those jobs manually and see if this is linker version related or not.

@nickdesaulniers nickdesaulniers self-assigned this Sep 28, 2023
@nickdesaulniers
Copy link
Member Author

Probably also need

commit 26e3f7690cda ("x86/retpoline,kprobes: Fix position of thunk sections with CONFIG_LTO_CLANG")

from v5.10.192

ClangBuiltLinux/linux#1909

nickdesaulniers added a commit that referenced this issue Sep 29, 2023
These issues seem dependent on LLD version.

The fixes are in v5.10.191 and v5.10.192. ACK just upgraded to
v5.10.189, and isn't planning another uprev soon.  Let's just carry
these build break fixes because I worry about backporting them without
the rest of the series.

Link: #635
nickdesaulniers added a commit that referenced this issue Sep 29, 2023
nickdesaulniers added a commit that referenced this issue Sep 29, 2023
These issues seem dependent on LLD version.

The fixes are in v5.10.191 and v5.10.192. ACK just upgraded to
v5.10.189, and isn't planning another uprev soon.  Let's just carry
these build break fixes because I worry about backporting them without
the rest of the series.

Link: #635
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant