Do unprivileged CRIU dump if requested+supported #14836
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The corresponding Open Liberty PR is OpenLiberty/open-liberty#20683 |
ymanton
force-pushed
the
criu-unprivileged
branch
from
e63c98b to
7d81d4d
Compare
dsouzai
reviewed
Apr 1, 2022
ymanton
force-pushed
the
criu-unprivileged
branch
from
7d81d4d to
e90bad6
Compare
tajila
reviewed
Apr 1, 2022
runtime/criusupport/criusupport.cpp
Outdated
| systemReturnCode = J9_CRIU_UNPRIVILEGED_NO_ERROR; | ||
| criu_set_unprivileged_ptr(TRUE); | ||
| } | ||
| else { |
runtime/criusupport/criusupport.cpp
Outdated
| @@ -256,6 +264,8 @@ Java_org_eclipse_openj9_criu_CRIUSupport_checkpointJVMImpl(JNIEnv *env, | |||
| const char *nlsMsgFormat = NULL; | |||
| UDATA msgCharLength = 0; | |||
| IDATA systemReturnCode = 0; | |||
| fn_criu_set_unprivileged criu_set_unprivileged_ptr = NULL; | |||
There was a problem hiding this comment.
use camelCase for naming here
runtime/criusupport/criusupport.cpp
Outdated
| @@ -350,6 +360,30 @@ Java_org_eclipse_openj9_criu_CRIUSupport_checkpointJVMImpl(JNIEnv *env, | |||
| goto closeWorkDirFD; | |||
| } | |||
|
|
|||
| if (TRUE == unprivileged) { | |||
runtime/criusupport/criusupport.cpp
Outdated
| @@ -36,6 +37,8 @@ | |||
|
|
|||
| extern "C" { | |||
|
|
|||
| typedef void (*fn_criu_set_unprivileged)(bool unprivileged); | |||
There was a problem hiding this comment.
is it defined with bool in the criu API?
There was a problem hiding this comment.
Yes. I actually added the function since it is missing from checkpoint-restore/criu#1155 however other functions taking a boolean (e.g. criu_set_shell_job) also define their booleans as bool.
ymanton
force-pushed
the
criu-unprivileged
branch
from
e90bad6 to
1577bd4
Compare
tajila
approved these changes
Apr 5, 2022
runtime/criusupport/criusupport.cpp
Outdated
| } | ||
| if ((NULL == dlerrorReturnString) && (NULL != criuSetUnprivileged)) { | ||
| systemReturnCode = J9_CRIU_UNPRIVILEGED_NO_ERROR; | ||
| criuSetUnprivileged(TRUE); |
There was a problem hiding this comment.
please JNI_FALSE != unprivileged for consistency
If the user requests an unprivileged CRIU dump we check if a non-NULL `criu_set_unprivileged` symbol can be found via dlsym() and if so call it with `true` as the parameter. If the user requests an unprivileged CRIU dump but the symbol cannot be found we throw an exception. If the user does not request an unprivileged CRIU dump we do nothing as CRIU (currently) defaults to privileged. Also link against libdl to get access to dlsym(). Signed-off-by: Younes Manton <[email protected]>
ymanton
force-pushed
the
criu-unprivileged
branch
from
1577bd4 to
cbb83ab
Compare
|
Jenkins compile xlinuxcriu jdk11 |
|
Jenkins test sanity win jdk8 |
|
Jenkins test sanity plinux jdk11 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If the user requests an unprivileged CRIU dump we check
if a non-NULL
criu_set_unprivilegedsymbol can be found viadlsym() and if so call it with
trueas the parameter.If the user requests an unprivileged CRIU dump but the symbol
cannot be found we throw an exception.
If the user does not request an unprivileged CRIU dump we do
nothing as CRIU (currently) defaults to privileged.
Also link against libdl to get access to dlsym().
Signed-off-by: Younes Manton [email protected]