https://github.com/python/cpython/commit/a5c5edddbc3ca7192c057f65fb3a8ff4ea360f96
commit: a5c5edddbc3ca7192c057f65fb3a8ff4ea360f96
branch: 3.15
author: Victor Stinner <[email protected]>
committer: vstinner <[email protected]>
date: 2026-06-17T11:13:40+02:00
summary:
[3.15] gh-151546: Fix stack limits on musl (#151548) (#151583)
gh-151546: Fix stack limits on musl (#151548)
If the thread stack size is set by linker flags, pass the stack size
to Python/ceval.c via the new _Py_LINKER_THREAD_STACK_SIZE variable
to set Py_C_STACK_SIZE macro.
(cherry picked from commit 9a61d1c0c8ebe21277c0a84abf6000049540464f)
files:
A
Misc/NEWS.d/next/Core_and_Builtins/2026-06-16-17-23-37.gh-issue-151546.LhiaZz.rst
M Python/ceval.c
M configure
M configure.ac
M pyconfig.h.in
diff --git
a/Misc/NEWS.d/next/Core_and_Builtins/2026-06-16-17-23-37.gh-issue-151546.LhiaZz.rst
b/Misc/NEWS.d/next/Core_and_Builtins/2026-06-16-17-23-37.gh-issue-151546.LhiaZz.rst
new file mode 100644
index 00000000000000..af1c23bd50355f
--- /dev/null
+++
b/Misc/NEWS.d/next/Core_and_Builtins/2026-06-16-17-23-37.gh-issue-151546.LhiaZz.rst
@@ -0,0 +1,3 @@
+Fix the stack limit check if Python is linked to musl (ex: Alpine Linux).
+Use the stack size set by the linker to compute the stack limits. Patch by
+Victor Stinner.
diff --git a/Python/ceval.c b/Python/ceval.c
index 5661200e74d0a5..3feb6ad0050d14 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -63,7 +63,9 @@ _Py_EnterRecursiveCallUnchecked(PyThreadState *tstate)
}
}
-#if defined(__s390x__)
+#if defined(_Py_LINKER_THREAD_STACK_SIZE)
+# define Py_C_STACK_SIZE _Py_LINKER_THREAD_STACK_SIZE
+#elif defined(__s390x__)
# define Py_C_STACK_SIZE 320000
#elif defined(_WIN32)
// Don't define Py_C_STACK_SIZE, ask the O/S
diff --git a/configure b/configure
index 3a1c40e49d580b..e60a71cff469bc 100755
--- a/configure
+++ b/configure
@@ -9918,6 +9918,10 @@ printf "%s\n" "$ac_cv_thread_stack_size" >&6; }
if test "$ac_cv_thread_stack_size" != "default" -a
"$ac_cv_thread_stack_size" != "unknown"; then
LDFLAGS="$LDFLAGS -Wl,-z,stack-size=$ac_cv_thread_stack_size"
+ # Stack size used by Python/ceval.c to set Py_C_STACK_SIZE
+
+printf "%s\n" "#define _Py_LINKER_THREAD_STACK_SIZE $ac_cv_thread_stack_size"
>>confdefs.h
+
fi
fi
diff --git a/configure.ac b/configure.ac
index 62d761130ac07f..c6485093032439 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2507,6 +2507,9 @@ EOF
if test "$ac_cv_thread_stack_size" != "default" -a
"$ac_cv_thread_stack_size" != "unknown"; then
LDFLAGS="$LDFLAGS -Wl,-z,stack-size=$ac_cv_thread_stack_size"
+ # Stack size used by Python/ceval.c to set Py_C_STACK_SIZE
+ AC_DEFINE_UNQUOTED([_Py_LINKER_THREAD_STACK_SIZE],
[$ac_cv_thread_stack_size],
+ [Thread stack size set by the linker (in bytes).])
fi
fi
diff --git a/pyconfig.h.in b/pyconfig.h.in
index 7ef83fcd0b9e0b..f26c67644d5e5d 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -2067,6 +2067,9 @@
/* Define if you have the 'PR_SET_VMA_ANON_NAME' constant. */
#undef _Py_HAVE_PR_SET_VMA_ANON_NAME
+/* Thread stack size set by the linker (in bytes). */
+#undef _Py_LINKER_THREAD_STACK_SIZE
+
/* Define to 1 if the machine stack grows down (default); 0 if it grows up. */
#undef _Py_STACK_GROWS_DOWN
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
