Skip to content

Remove reundant address comparison in accel_remap_huge_pages #8830

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
wants to merge 1 commit into from
Closed

Remove reundant address comparison in accel_remap_huge_pages #8830

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
19 changes: 10 additions & 9 deletions ext/opcache/ZendAccelerator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2936,7 +2936,7 @@ static void accel_globals_ctor(zend_accel_globals *accel_globals)
# endif

# if defined(MAP_HUGETLB) || defined(MADV_HUGEPAGE)
static int accel_remap_huge_pages(void *start, size_t size, size_t real_size, const char *name, size_t offset)
static zend_result accel_remap_huge_pages(void *start, size_t size, size_t real_size, const char *name, size_t offset)
{
void *ret = MAP_FAILED;
void *mem;
Expand All @@ -2949,7 +2949,7 @@ static int accel_remap_huge_pages(void *start, size_t size, size_t real_size, co
zend_error(E_WARNING,
ACCELERATOR_PRODUCT_NAME " huge_code_pages: mmap failed: %s (%d)",
strerror(errno), errno);
return -1;
return FAILURE;
}
memcpy(mem, start, real_size);

Expand All @@ -2974,7 +2974,7 @@ static int accel_remap_huge_pages(void *start, size_t size, size_t real_size, co
zend_error(E_WARNING,
ACCELERATOR_PRODUCT_NAME " huge_code_pages: madvise(HUGEPAGE) failed: %s (%d)",
strerror(errno), errno);
return -1;
return FAILURE;
}
# else
memcpy(start, mem, real_size);
Expand All @@ -2983,17 +2983,18 @@ static int accel_remap_huge_pages(void *start, size_t size, size_t real_size, co
zend_error(E_WARNING,
ACCELERATOR_PRODUCT_NAME " huge_code_pages: mmap(HUGETLB) failed: %s (%d)",
strerror(errno), errno);
return -1;
return FAILURE;
# endif
}

if (ret == start) {
memcpy(start, mem, real_size);
mprotect(start, size, PROT_READ | PROT_EXEC);
}
// Given the MAP_FIXED flag the address can never diverge
ZEND_ASSERT(ret == start);
memcpy(start, mem, real_size);
mprotect(start, size, PROT_READ | PROT_EXEC);

munmap(mem, size);

return (ret == start) ? 0 : -1;
return SUCCESS;
}

static void accel_move_code_to_huge_pages(void)
Expand Down