Verify off heap entry during update and free offheap array #20985
Conversation
|
@amicic @dmitripivkine please review the changes, thanks |
LinHu2016
force-pushed
the
update_isValidDataPtr
branch
3 times, most recently
from
a89417b to
1c5f6bb
Compare
runtime/gc_check/CheckEngine.cpp
Outdated
| @@ -468,10 +468,19 @@ GC_CheckEngine::checkJ9Object(J9JavaVM *javaVM, J9Object* objectPtr, J9MM_Iterat | |||
| if (extensions->isVirtualLargeObjectHeapEnabled && extensions->objectModel.isIndexable(objectPtr)) { | |||
| /* Check that the indexable object has the correct data address pointer */ | |||
| void *dataAddr = extensions->indexableObjectModel.getDataAddrForIndexableObject((J9IndexableObject *)objectPtr); | |||
| bool isValidDataAddr = extensions->largeObjectVirtualMemory->getSparseDataPool()->isValidDataPtr(dataAddr); | |||
| if (!isValidDataAddr && !extensions->indexableObjectModel.isValidDataAddr((J9IndexableObject *)objectPtr, dataAddr, isValidDataAddr)) { | |||
| bool isDataAddrForOffHeapObject = false; | |||
There was a problem hiding this comment.
this could be simply named isOffheapObject
here and in the arguments of isValidDataAddr()
edit: should be renamed to isDataNonAdjacent to be consistent with the method rename (isValidDataAddrForAdjacentData)
| */ | ||
| MMINLINE bool | ||
| isValidDataAddr(J9IndexableObject *arrayPtr, bool isValidDataAddrForOffHeapObject) | ||
| isValidDataAddr(J9IndexableObject *arrayPtr, bool *isDataAddrForOffHeapObject) |
There was a problem hiding this comment.
perhaps these 2 methods should be named more specifically, for example isValidDataAddrForHeapObject
@dmitripivkine opinion?
There was a problem hiding this comment.
or isValidDataAddrForAdjacentData
There was a problem hiding this comment.
ok, then to be consistent we should rename the output parameter to be isDataNonAdjacent (instead of isOffheapObject as I suggested in an earlier comment)
| * @return if the dataAddr field of the indexable object is correct | ||
| * @param arrayPtr[in] Pointer to the indexable object | ||
| * @param isDataAddrForOffHeapObject[out] set true if the given indexable object is off heap | ||
| * @return if the dataAddr field of the indexable object is correct((not heap object case), return false if indexable object is off heap |
LinHu2016
force-pushed
the
update_isValidDataPtr
branch
from
1c5f6bb to
3440684
Compare
Verify the consistency (dataAddr, size and related proxy array object) of off heap Entry before freeing the off heap array or updating related proxy object. Signed-off-by: lhu <[email protected]>
LinHu2016
force-pushed
the
update_isValidDataPtr
branch
from
3440684 to
2ea0866
Compare
|
jenkins test sanity xLinux jdk21 |
| *sparseHeapAllocation = false; | ||
| } else { | ||
| void *dataAddr = _extensions->indexableObjectModel.getDataAddrForContiguous((J9IndexableObject *)fwdOjectPtr); | ||
| if (NULL != dataAddr) { | ||
| /* There might be the case that GC finds a floating arraylet, which was a result of an allocation | ||
| * failure (reason why this GC cycle is happening). | ||
| */ | ||
| _extensions->largeObjectVirtualMemory->updateSparseDataEntryAfterObjectHasMoved(dataAddr, fwdOjectPtr); | ||
| } | ||
| _extensions->largeObjectVirtualMemory->updateSparseDataEntryAfterObjectHasMoved(dataAddr, objectPtr, _extensions->indexableObjectModel.getDataSizeInBytes((J9IndexableObject *)fwdOjectPtr), fwdOjectPtr); } |
There was a problem hiding this comment.
@LinHu2016 Could you create a follow-up change to put the closing brace back on a line by itself, please?
There was a problem hiding this comment.
Thanks, I have created a PR, which also clean up some others format issues, #21072
Verify the consistency (dataAddr, size and related proxy array object) of off heap Entry before freeing the off heap array or updating related proxy object.
depends on: eclipse-omr/omr#7614
Signed-off-by: lhu [email protected]