Skip to content

Align the Windows OPcache JIT buffer #25262

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

Merged
shivammathur merged 2 commits into from
Nov 12, 2026
Merged

Align the Windows OPcache JIT buffer #25262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83d6fc5
Align the Windows OPcache JIT buffer
shivammathur Nov 7, 2026
6d9c288
Assert that the OPcache JIT buffer is page-aligned
shivammathur Nov 11, 2026
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
1 change: 1 addition & 0 deletions ext/opcache/jit/zend_jit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3659,6 +3659,7 @@ int zend_jit_check_support(void)

void zend_jit_startup(void *buf, size_t size, bool reattached)
{
ZEND_ASSERT(((uintptr_t)buf & (zend_get_page_size() - 1)) == 0);
zend_jit_halt_op = zend_get_halt_op();
zend_jit_profile_counter_rid = zend_get_op_array_extension_handle(ACCELERATOR_PRODUCT_NAME);

Expand Down
2 changes: 1 addition & 1 deletion ext/opcache/shared_alloc_win32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ static int create_segments(size_t requested_size, zend_shared_segment ***shared_
}

shared_segment->pos = ACCEL_BASE_POINTER_SIZE;
shared_segment->size = requested_size - ACCEL_BASE_POINTER_SIZE;
shared_segment->size = requested_size;

zend_shared_alloc_unlock_win32();

Expand Down
53 changes: 53 additions & 0 deletions ext/opcache/tests/jit/gh25213.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
--TEST--
GH-25213 (JIT buffer misalignment crashes OPcache when shared memory fills up on Windows)
--EXTENSIONS--
opcache
--SKIPIF--
<?php
if (PHP_OS_FAMILY !== 'Windows') die('skip Windows only');
if (ini_get('opcache.jit') === false) die('skip PHP is compiled without JIT');
?>
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.memory_consumption=16
opcache.interned_strings_buffer=1
opcache.max_accelerated_files=20000
opcache.jit=tracing
opcache.jit_buffer_size=64M
--FILE--
<?php
if (!(opcache_get_status(false)['jit']['enabled'] ?? false)) {
throw new RuntimeException('JIT is not enabled');
}
$dir = __DIR__ . '/gh25213_tmp';
mkdir($dir);
for ($i = 0; $i < 20000; $i++) {
$file = "$dir/c$i.php";
file_put_contents($file, "<?php class C$i extends ArrayObject { public function m(int \$a): int { return \$a + $i; } }\n");
require $file;
unlink($file);
$status = opcache_get_status(false);
if ($status['cache_full']) {
break;
}
}
var_dump($status['cache_full']);
var_dump($status['memory_usage']['free_memory'] < 65536);
var_dump($status['opcache_statistics']['num_cached_keys'] < $status['opcache_statistics']['max_cached_keys']);
rmdir($dir);
?>
--CLEAN--
<?php
$dir = __DIR__ . '/gh25213_tmp';
if (is_dir($dir)) {
foreach (glob("$dir/*") as $file) {
unlink($file);
}
rmdir($dir);
}
?>
--EXPECT--
bool(true)
bool(true)
bool(true)
Loading