Skip to content

opcache fixing w/x pages creation on freebsd 13.1 and above. #9896

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

Closed
devnexen wants to merge 1 commit into from
Closed

opcache fixing w/x pages creation on freebsd 13.1 and above. #9896

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,7 @@ sys/file.h \
sys/mman.h \
sys/mount.h \
sys/poll.h \
sys/procctl.h \
sys/resource.h \
sys/select.h \
sys/socket.h \
Expand Down Expand Up @@ -587,6 +588,7 @@ mmap \
nice \
nl_langinfo \
poll \
procctl \
putenv \
scandir \
setitimer \
Expand Down
10 changes: 10 additions & 0 deletions ext/opcache/shared_alloc_mmap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
#include <mach/vm_statistics.h>
#endif

#ifdef HAVE_SYS_PROCCTL_H
#include <sys/procctl.h>
#endif

#if defined(MAP_ANON) && !defined(MAP_ANONYMOUS)
# define MAP_ANONYMOUS MAP_ANON
#endif
Expand All @@ -45,6 +49,12 @@ static int create_segments(size_t requested_size, zend_shared_segment ***shared_
zend_shared_segment *shared_segment;
int flags = PROT_READ | PROT_WRITE, fd = -1;
void *p;
#if defined(HAVE_PROCCTL) && defined(PROC_WXMAP_CTL)
int enable_wxmap = PROC_WX_MAPPINGS_PERMIT;
if (procctl(P_PID, getpid(), PROC_WXMAP_CTL, &enable_wxmap) == -1) {
return ALLOC_FAILURE;
}
#endif
#ifdef PROT_MPROTECT
flags |= PROT_MPROTECT(PROT_EXEC);
#endif
Expand Down