com php-src: Fixed bug #70977, #70973 (Segmentation fault with opcache.huge_code_pages=1): NEWS ext/opcache/ ZendAccelerator.c
| From: | Xinchen Hui | Date: | Fri, 27 Nov 2015 15:30:37 +0000 |
| Subject: | com php-src: Fixed bug #70977, #70973 (Segmentation fault with opcache.huge_code_pages=1): NEWS ext/opcache/ ZendAccelerator.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90048@lists.php.net to get a copy of this message | ||
Commit: e9a8d7ff1d59cbcaf4b5cec728a94fb0d54dd993
Author: Xinchen Hui <laruence@gmail.com> Fri, 27 Nov 2015 07:30:37 -0800
Parents: a347b0be48d892c105198b23868f37a0d4f92dee
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e9a8d7ff1d59cbcaf4b5cec728a94fb0d54dd993
Log:
Fixed bug #70977, #70973 (Segmentation fault with opcache.huge_code_pages=1)
Bugs:
https://bugs.php.net/70977
https://bugs.php.net/70973
Changed paths:
M NEWS
M ext/opcache/ZendAccelerator.c
Diff:
diff --git a/NEWS b/NEWS
index 227ccdf..7d7daae 100644
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,10 @@ PHP NEWS
. Fixed LOB implementation size_t/zend_long mismatch reported
by gcov. (Senthil)
+- Opcache:
+ . Fixed bug #70977 (Segmentation fault with opcache.huge_code_pages=1).
+ (Laruence)
+
- Phpdbg:
. Fixed stderr being written to stdout. (Bob)
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index e23e751..15d6734 100644
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -2515,6 +2515,9 @@ static int accel_remap_huge_pages(void *start, size_t size, const char *name,
si
MAP_PRIVATE | MAP_ANONYMOUS,
-1, 0);
if (mem == MAP_FAILED) {
+ zend_error(E_WARNING,
+ ACCELERATOR_PRODUCT_NAME " huge_code_pages: mmap failed: %s (%d)",
+ strerror(errno), errno);
return -1;
}
memcpy(mem, start, size);
@@ -2525,20 +2528,36 @@ static int accel_remap_huge_pages(void *start, size_t size, const char
*name, si
MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED | MAP_HUGETLB,
-1, 0);
# endif
-# ifdef MADV_HUGEPAGE
if (ret == MAP_FAILED) {
ret = mmap(start, size,
PROT_READ | PROT_WRITE | PROT_EXEC,
MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED,
-1, 0);
+ /* this should never happen? */
+ ZEND_ASSERT(ret != MAP_FAILED);
+# ifdef MADV_HUGEPAGE
if (-1 == madvise(start, size, MADV_HUGEPAGE)) {
+ memcpy(start, mem, size);
+ mprotect(start, size, PROT_READ | PROT_EXEC);
munmap(mem, size);
+ zend_error(E_WARNING,
+ ACCELERATOR_PRODUCT_NAME " huge_code_pages: madvise(HUGEPAGE) failed: %s (%d)",
+ strerror(errno), errno);
return -1;
}
- }
+# else
+ memcpy(start, mem, size);
+ mprotect(start, size, PROT_READ | PROT_EXEC);
+ munmap(mem, size);
+ zend_error(E_WARNING,
+ ACCELERATOR_PRODUCT_NAME "huge_code_pages: mmap(HUGETLB) failed: %s (%d)",
+ strerror(errno), errno);
+ return -1;
# endif
+ }
+
if (ret == start) {
- memcpy(start, mem, size);
+ memcpy(start, mem, size);
mprotect(start, size, PROT_READ | PROT_EXEC);
}
munmap(mem, size);