Skip to content

[Backport 3.3] [Bug #20085] Use consistent default options for -mbranch-protection #9385

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

Merged

Conversation

kateinoigakukun
Copy link
Member

@kateinoigakukun kateinoigakukun commented Dec 28, 2023

Cherry-pick 02973b7 to fix a regression in 3.3.0 release https://bugs.ruby-lang.org/issues/20085

  • Short description: Fiber on aarch64 with PAC support on Linux was broken in 3.3.0. The patch fixes the issue by adjusting compiler options.
  • Scope: Only aarch64 with PAC support on Linux (like aarch64 Linux container on M1 Mac)
  • Testing: Unfortunately, we don't have a CI node that affects the issue. The community and I tested the patch manually on such environments.

We need to use the same options for both C compiler and assembler when -mbranch-protection is guessed by configure. Otherwise, coroutine/arm64/Context.{h,S} will use incompatible PAC strategies.

We need to use the same options for both C compiler and assembler
when `-mbranch-protection` is guessed by configure. Otherwise,
`coroutine/arm64/Context.{h,S}` will use incompatible PAC strategies.
@kateinoigakukun kateinoigakukun marked this pull request as ready for review December 29, 2023 07:28
@mintuhouse
Copy link

@nurse Can this backport for 3.3 Fiber segfault be merged?

@hsbt
Copy link
Member

hsbt commented Jan 9, 2024

sorah added a commit to sorah-rbpkg/ruby that referenced this pull request Jan 17, 2024
@dorianmarie
Copy link

The bug is closed so I'm commenting here, but I don't understand, it says it's going to be backported to 3.3.1 but there is no 3.3.1 release?

@gee-forr
Copy link

The bug is closed so I'm commenting here, but I don't understand, it says it's going to be backported to 3.3.1 but there is no 3.3.1 release?

It's going to be backported to 3.3.0, as 3.3.0 already being released can only have patches applied via backporting.

3.3.1 as a future release -- presumably some months from now -- will have this patch already baked in.

Unfortunately, 3.3.0 still does not have this backported patch available as of 22 Jan 2024. If you take a look at the official ruby source download page you'll see that 3.3.0's mtime is still Christmas day 2023.

Here's hoping they release a 3.3.0 patch soon :) Can't wait to start using it, but we suffer from this bug too.

@hsbt
Copy link
Member

hsbt commented Jan 23, 2024

@dorianmarie "Status" field is only for master branch, not backport status. You should look "Backport" fields.

@dorianmarie
Copy link

Backport: 3.0: DONTNEED, 3.1: DONTNEED, 3.2: DONTNEED, 3.3: REQUIRED

So it says it's going to be backported to 3.3 ("required")

@navels
Copy link

navels commented Jan 25, 2024

Any guess as to when the backport to 3.3.0 will land? Our 3.3.0 upgrade is on hold, wondering if we should wait or employ a workaround.

@ruby ruby locked and limited conversation to collaborators Jan 25, 2024
@hsbt
Copy link
Member

hsbt commented Jan 25, 2024

GitHub is not discussion place for release engineering. Please use https://bugs.ruby-lang.org/issues/20085

@nurse nurse added this pull request to the merge queue Feb 5, 2024
Merged via the queue into ruby:ruby_3_3 with commit 7f97e35 Feb 5, 2024
@kateinoigakukun kateinoigakukun deleted the katei/backport-3.3-branch-protection branch February 5, 2024 16:08
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants