Skip to content
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

Jump to bottom

Don't map systemcfg on Power in checkpoint mode #7351

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Don't map systemcfg on Power in checkpoint mode #7351

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
28 changes: 21 additions & 7 deletions port/linuxppc64/omrtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,14 +265,28 @@ omrtime_startup(struct OMRPortLibrary *portLibrary)
#if !__GLIBC_PREREQ(2,4)
systemcfgP_millis = systemcfg_init();
#else
int procfd;
/* Avoid mapping systemcfg if a checkpoint is possible because we may be prevented from
* restoring it in some environments by a security module (e.g. SELinux). If we're currently
* running in an environment that doesn't prevent us from mapping systemcfg, and the
* process is later checkpointed, it can only be restored in an environment that allows
* systemcfg to be mapped. In order to improve portability we'll only map systemcfg if
* no further checkpoints are possible.
*/
#if defined(PPG_criuSupportFlags)
if (OMR_ARE_NO_BITS_SET(PPG_criuSupportFlags, OMRPORT_CRIU_SUPPORT_ENABLED)
|| OMR_ARE_ANY_BITS_SET(PPG_criuSupportFlags, OMRPORT_CRIU_SUPPORT_FINAL_RESTORE)
)
#endif /* defined(PPG_criuSupportFlags) */
{
int procfd;

procfd = open("/proc/ppc64/systemcfg", O_RDONLY);
if (-1 != procfd) {
systemcfgP_millis = mmap(0, sizeof(struct vdso_data), PROT_READ, MAP_SHARED, procfd, 0);
close(procfd);
if (MAP_FAILED == systemcfgP_millis) {
systemcfgP_millis = NULL;
procfd = open("/proc/ppc64/systemcfg", O_RDONLY);
if (-1 != procfd) {
systemcfgP_millis = mmap(0, sizeof(struct vdso_data), PROT_READ, MAP_SHARED, procfd, 0);
close(procfd);
if (MAP_FAILED == systemcfgP_millis) {
systemcfgP_millis = NULL;
}
}
}
#endif
Expand Down