Skip to content

Disable JIT when pthread protection is unavailable #22853

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.

Sign up for GitHub

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

Draft
realFlowControl wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −5
Draft

Disable JIT when pthread protection is unavailable #22853

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions ext/opcache/jit/zend_jit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3724,6 +3724,16 @@ int zend_jit_check_support(void)
{
int i;

#ifdef ZEND_JIT_USE_APPLE_MAP_JIT
if (!pthread_jit_write_protect_supported_np()) {
zend_accel_error(ACCEL_LOG_WARNING,
"Apple Silicon ZTS JIT requires pthread_jit_write_protect_np() support. JIT disabled.");
JIT_G(enabled) = 0;
JIT_G(on) = 0;
return FAILURE;
}
#endif

if (zend_execute_ex != execute_ex) {
if (zend_dtrace_enabled) {
zend_error(E_WARNING, "JIT is incompatible with DTrace. JIT disabled.");
Expand Down Expand Up @@ -3792,11 +3802,6 @@ void zend_jit_startup(void *buf, size_t size, bool reattached)
"Unable to share JIT buffer across fork using minherit(): %s (%d)",
strerror(error), error);
}
if (!pthread_jit_write_protect_supported_np()) {
munmap(buf, size);
zend_accel_error_noreturn(ACCEL_LOG_FATAL,
"Apple Silicon ZTS JIT requires pthread_jit_write_protect_np() support");
}
#endif

dasm_buf = buf;
Expand Down
Loading