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

gh-116510: Fix a Crash Due to Shared Immortal Interned Strings #124865

Merged
merged 3 commits into from
Oct 9, 2024

Conversation

ericsnowcurrently
Copy link
Member

@ericsnowcurrently ericsnowcurrently commented Oct 1, 2024

Fix a crash caused by immortal interned strings being shared between
sub-interpreters that use basic single-phase init. In that case, the string
can be used by an interpreter that outlives the interpreter that created and
interned it. For interpreters that share obmalloc state, also share the
interned dict with the main interpreter.

This is an un-revert of gh-124646 that addresses the Py_TRACE_REFS failures identified by gh-124785.

The 3.12 backport will be slightly different and will need to be done manually.

@ericsnowcurrently
Copy link
Member Author

!buildbot AMD64 Arch Linux TraceRefs

@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @ericsnowcurrently for commit 623fb87 🤖

The command will test the builders whose names match following regular expression: AMD64 Arch Linux TraceRefs

The builders matched are:

  • AMD64 Arch Linux TraceRefs PR

@@ -2491,6 +2491,24 @@ _Py_ResurrectReference(PyObject *op)


#ifdef Py_TRACE_REFS
void
_Py_NormalizeImmortalReference(PyObject *op)
Copy link
Member

Choose a reason for hiding this comment

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

Having some comment here would be helpful. Otherwise this function looks quite mysterious.

Copy link
Member Author

Choose a reason for hiding this comment

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

done!

@nascheme
Copy link
Member

nascheme commented Oct 1, 2024

LGTM other than adding a bit more comments.

@ericsnowcurrently
Copy link
Member Author

The buildbot passed.

@nascheme
Copy link
Member

nascheme commented Oct 8, 2024

Any reason not to merge this now?

@ericsnowcurrently
Copy link
Member Author

I can merge it first thing tomorrow if no one objects.

@ericsnowcurrently ericsnowcurrently merged commit f2cb399 into python:main Oct 9, 2024
37 checks passed
@miss-islington-app
Copy link

Thanks @ericsnowcurrently for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12, 3.13.
🐍🍒⛏🤖

@ericsnowcurrently ericsnowcurrently deleted the fix-tracerefs branch October 9, 2024 17:32
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 9, 2024
…ythongh-124865)

Fix a crash caused by immortal interned strings being shared between
sub-interpreters that use basic single-phase init. In that case, the string
can be used by an interpreter that outlives the interpreter that created and
interned it. For interpreters that share obmalloc state, also share the
interned dict with the main interpreter.

This is an un-revert of pythongh-124646 that then addresses the Py_TRACE_REFS
failures identified by pythongh-124785.
(cherry picked from commit f2cb399)

Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com>
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 9, 2024
…ythongh-124865)

Fix a crash caused by immortal interned strings being shared between
sub-interpreters that use basic single-phase init. In that case, the string
can be used by an interpreter that outlives the interpreter that created and
interned it. For interpreters that share obmalloc state, also share the
interned dict with the main interpreter.

This is an un-revert of pythongh-124646 that then addresses the Py_TRACE_REFS
failures identified by pythongh-124785.
(cherry picked from commit f2cb399)

Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com>
@bedevere-app
Copy link

bedevere-app bot commented Oct 9, 2024

GH-125204 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Oct 9, 2024
@bedevere-app
Copy link

bedevere-app bot commented Oct 9, 2024

GH-125205 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.12 only security fixes label Oct 9, 2024
@encukou
Copy link
Member

encukou commented Oct 10, 2024

Due to either this change or #125199, the AMD64 Arch Linux TraceRefs 3.x buildbot is failing: https://buildbot.python.org/#/builders/484/builds/6022/steps/6/logs/stdio

@vstinner
Copy link
Member

Due to either this change or #124865, the AMD64 Arch Linux TraceRefs 3.x buildbot is failing: https://buildbot.python.org/#/builders/484/builds/6022/steps/6/logs/stdio

I checked with git bisect and the regression was introduced by commit f2cb399:

commit f2cb39947093feda3ff85b8dc820922cc5e5f954
Author: Eric Snow <ericsnowcurrently@gmail.com>
Date:   Wed Oct 9 11:32:16 2024 -0600

    gh-116510: Fix a Crash Due to Shared Immortal Interned Strings (gh-124865)
    
    Fix a crash caused by immortal interned strings being shared between
    sub-interpreters that use basic single-phase init. In that case, the string
    can be used by an interpreter that outlives the interpreter that created and
    interned it. For interpreters that share obmalloc state, also share the
    interned dict with the main interpreter.
    
    This is an un-revert of gh-124646 that then addresses the Py_TRACE_REFS
    failures identified by gh-124785.

@ericsnowcurrently
Copy link
Member Author

I'll take a look.

encukou pushed a commit that referenced this pull request Nov 12, 2024
…gh-124865) (gh-125709) (GH-125204)

* gh-116510: Fix a Crash Due to Shared Immortal Interned Strings (gh-124865)

Fix a crash caused by immortal interned strings being shared between
sub-interpreters that use basic single-phase init. In that case, the string
can be used by an interpreter that outlives the interpreter that created and
interned it. For interpreters that share obmalloc state, also share the
interned dict with the main interpreter.

This is an un-revert of gh-124646 that then addresses the Py_TRACE_REFS
failures identified by gh-124785.
(cherry picked from commit f2cb399)

Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com>

* [3.13] gh-125286: Share the Main Refchain With Legacy Interpreters (gh-125709)

They used to be shared, before 3.12.  Returning to sharing them resolves a failure on Py_TRACE_REFS builds.

---------

Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com>
ericsnowcurrently added a commit that referenced this pull request Dec 3, 2024
…gh-125205)

Fix a crash caused by immortal interned strings being shared between
sub-interpreters that use basic single-phase init. In that case, the string
can be used by an interpreter that outlives the interpreter that created and
interned it. For interpreters that share obmalloc state, also share the
interned dict with the main interpreter.

This is an un-revert of gh-124646 that then addresses the Py_TRACE_REFS
failures identified by gh-124785 (i.e. backporting gh-125709 too).

(cherry picked from commit f2cb399, AKA gh-124865)

Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com>
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

Successfully merging this pull request may close these issues.

5 participants