packages/openjdk-1.8.0
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!216 I46H8I: fix g1 uncommit ygc enxpand region crash

Browse Source 
From: @kuenking111
Reviewed-by: @jvmboy
Signed-off-by: @jvmboy
This commit is contained in:
openeuler-ci-bot 2021-08-20 03:28:09 +00:00 committed by Gitee
commit 397ee452e0
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fix_g1uncommit_ygc_expand_crash.patch Executable file
View File

@ -0,0 +1,15 @@
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp
index 6ad85596..818f6681 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp
@@ -241,8 +241,8 @@ uint HeapRegionManager::expand_at(uint start, uint num_regions) {
uint HeapRegionManager::expand_on_preferred_node(uint preferred_index) {
uint expand_candidate = UINT_MAX;
for (uint i = 0; i < max_length(); i++) {
- if (is_available(i)) {
- // Already in use continue
+ if (!can_expand(i)) {
+ // Already in use or in uncommit list continue
continue;
}
// Always save the candidate so we can expand later on.

7
openjdk-1.8.0.spec
View File

@ -916,7 +916,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
Name: java-%{javaver}-%{origin} Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver} Version: %{javaver}.%{updatever}.%{buildver}
Release: 1 Release: 2
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
# and this change was brought into RHEL-4. java-1.5.0-ibm packages # and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a # also included the epoch in their virtual provides. This created a
@ -1102,6 +1102,7 @@ Patch202: Fix-RSACipher-memory-usage.patch
# 8u302 # 8u302
Patch203: fix-lock-ordering-issue-when-calling-JVMTI-GetLoaded.patch Patch203: fix-lock-ordering-issue-when-calling-JVMTI-GetLoaded.patch
Patch204: 8069191.patch Patch204: 8069191.patch
Patch205: fix_g1uncommit_ygc_expand_crash.patch
############################################# #############################################
# #
@ -1552,6 +1553,7 @@ pushd %{top_level_dir_name}
%patch202 -p1 %patch202 -p1
%patch203 -p1 %patch203 -p1
%patch204 -p1 %patch204 -p1
%patch205 -p1
popd popd
# System library fixes # System library fixes
@ -2167,6 +2169,9 @@ require "copy_jdk_configs.lua"
%endif %endif
%changelog %changelog
* Fri Aug 20 2021 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.302-b07.2
- add fix_g1uncommit_ygc_expand_crash.patch
* Thu Aug 19 2021 eapen <zhangyipeng7@huawei.com> - 1:1.8.0.302-b07.1 * Thu Aug 19 2021 eapen <zhangyipeng7@huawei.com> - 1:1.8.0.302-b07.1
- delete 8266929_huawei_add_oid_mapping_common_sig_types.patch - delete 8266929_huawei_add_oid_mapping_common_sig_types.patch