opcache JIT support improvements attempts on macOs. #8382
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
devnexen
force-pushed
the
macos_opcache_jit_protect_flags_fix_attempt
branch
5 times, most recently
from
036c348 to
17d924a
Compare
dstogov
reviewed
Jul 19, 2022
ext/opcache/jit/zend_jit.c
Outdated
Comment on lines
4617
to
4618
| pthread_jit_write_protect_np(0); | ||
| opts |= PROT_EXEC |
There was a problem hiding this comment.
I think you don't need to call mprotect() after pthread_jit_write_protect_np() here and in zend_jit_protect(). Also see code alignment.
This probably should be changed into:
if (zend_write_protect) {
pthread_jit_write_protect_np(0);
return;
}
opts |= PROT_EXEC
ext/opcache/jit/zend_jit.c
Outdated
Comment on lines
4919
to
4918
| #ifdef HAVE_PTHREAD_JIT_WRITE_PROTECT_NP | ||
| if (zend_write_protect) { | ||
| pthread_jit_write_protect_np(0); | ||
| } | ||
| #endif |
devnexen
force-pushed
the
macos_opcache_jit_protect_flags_fix_attempt
branch
from
17d924a to
6735ac4
Compare
dstogov
approved these changes
Jul 19, 2022
ext/opcache/jit/zend_jit.c
Outdated
Comment on lines
4647
to
4648
| pthread_jit_write_protect_np(1); | ||
| return; |
ext/opcache/jit/zend_jit.c
Outdated
Comment on lines
4915
to
4928
| #ifdef HAVE_PTHREAD_JIT_WRITE_PROTECT_NP | ||
| if (zend_write_protect) { | ||
| pthread_jit_write_protect_np(1); | ||
| } | ||
| #endif | ||
| if (mprotect(dasm_buf, dasm_size, PROT_READ | PROT_WRITE | PROT_EXEC) != 0) { | ||
| fprintf(stderr, "mprotect() failed [%d] %s\n", errno, strerror(errno)); | ||
| } | ||
| } else { | ||
| #ifdef HAVE_PTHREAD_JIT_WRITE_PROTECT_NP | ||
| if (zend_write_protect) { | ||
| pthread_jit_write_protect_np(1); | ||
| } | ||
| #endif |
There was a problem hiding this comment.
Now the both new identical chunks may be merged above.
for cases when shared segments switch b/w R/W/X and R/X bits.
devnexen
force-pushed
the
macos_opcache_jit_protect_flags_fix_attempt
branch
from
6735ac4 to
5842ce5
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
for cases when shared segments switch b/w R/W/X and R/X bits.