From: David Carlier <devnexen@gmail.com>
Date: Mon, 1 Jul 2019 14:07:55 +0000 (+0000)
Subject: opcache huge pages: Little fix for FreeBSD
X-Git-Tag: php-7.4.0alpha3~90
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=994a01ea4339b05811f17c9e3d2bcffe05c4d6c0;p=php

opcache huge pages: Little fix for FreeBSD

Calculating the vm entries size beforehand, as we could
possibly miss few entries.

Closes GH-4344.
---

diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index 86b6d5ce7c..8973b2844d 100644
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -2746,9 +2746,9 @@ static void accel_move_code_to_huge_pages(void)
 	int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_VMMAP, getpid()};
 	long unsigned int huge_page_size = 2 * 1024 * 1024;
 	if(sysctl(mib, 4, NULL, &s, NULL, 0) == 0) {
+		s = s * 4 / 3;
 		void *addr = mmap(NULL, s * sizeof (struct kinfo_vmentry), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
 		if (addr != MAP_FAILED) {
-			s = s * 4 / 3;
 			if (sysctl(mib, 4, addr, &s, NULL, 0) == 0) {
 				uintptr_t start = (uintptr_t)addr;
 				uintptr_t end = start + s;