com php-src: Don't remap .text segment if huge pages are not available.: ext/opcache/ZendAccelerator.c
| From: | Dmitry Stogov | Date: | Thu, 29 Oct 2015 05:44:19 +0000 |
| Subject: | com php-src: Don't remap .text segment if huge pages are not available.: ext/opcache/ZendAccelerator.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89559@lists.php.net to get a copy of this message | ||
Commit: eb59dd7d8137c6567afcd579bcb3bd0298f5bbc4
Author: Julien Pauli <jpauli@php.net> Thu, 29 Oct 2015 08:44:19 +0300
Committer: Dmitry Stogov <dmitry@zend.com> Thu, 29 Oct 2015 08:44:19 +0300
Parents: 2b23ba97f320aa5bbaa9c14380f16415b5f14549
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=eb59dd7d8137c6567afcd579bcb3bd0298f5bbc4
Log:
Don't remap .text segment if huge pages are not available.
Changed paths:
M ext/opcache/ZendAccelerator.c
Diff:
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index 14dce59..eaadac6 100644
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -2529,7 +2529,10 @@ static int accel_remap_huge_pages(void *start, size_t size, const char *name,
si
PROT_READ | PROT_WRITE | PROT_EXEC,
MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED,
-1, 0);
- madvise(start, size, MADV_HUGEPAGE);
+ if (-1 == madvise(start, size, MADV_HUGEPAGE)) {
+ munmap(mem, size);
+ return -1;
+ }
}
# endif
if (ret == start) {