I5WI80: upgrade to jdk11.0.17-8(GA)

This commit is contained in:
DXwangg 2022-10-19 11:40:23 +08:00
parent f32f5e7bbd
commit 088fef1bad
4 changed files with 39 additions and 7 deletions

View File

@ -367,4 +367,4 @@ index 000000000..85b49171c
--- /dev/null --- /dev/null
+++ b/version.txt +++ b/version.txt
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+11.0.16.0.13 +11.0.17.0.13

View File

@ -1,3 +1,13 @@
From c470ac79015ad99f1760784cbffcf4b92d5bc8dc Mon Sep 17 00:00:00 2001
From: DXwangg <wangjiawei80@huawei.com>
Date: Wed, 26 Oct 2022 12:52:55 +0800
Subject: [PATCH] qqqqq
---
.../share/gc/parallel/parallel_globals.hpp | 6 +++++-
.../gc/parallel/psPromotionManager.inline.hpp | 18 ++++++++++++++++--
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/hotspot/share/gc/parallel/parallel_globals.hpp b/src/hotspot/share/gc/parallel/parallel_globals.hpp diff --git a/src/hotspot/share/gc/parallel/parallel_globals.hpp b/src/hotspot/share/gc/parallel/parallel_globals.hpp
index 5461bf04f..75ee84d4f 100644 index 5461bf04f..75ee84d4f 100644
--- a/src/hotspot/share/gc/parallel/parallel_globals.hpp --- a/src/hotspot/share/gc/parallel/parallel_globals.hpp
@ -15,10 +25,24 @@ index 5461bf04f..75ee84d4f 100644
#endif // SHARE_GC_PARALLEL_PARALLEL_GLOBALS_HPP #endif // SHARE_GC_PARALLEL_PARALLEL_GLOBALS_HPP
diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
index cc5a4aa98..9bf45f82b 100644 index cc5a4aa98..5a71ca307 100644
--- a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp --- a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp +++ b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
@@ -218,8 +218,15 @@ inline oop PSPromotionManager::copy_to_survivor_space(oop o) { @@ -35,6 +35,7 @@
#include "logging/log.hpp"
#include "oops/access.inline.hpp"
#include "oops/oop.inline.hpp"
+#include "runtime/prefetch.inline.hpp"
inline PSPromotionManager* PSPromotionManager::manager_array(uint index) {
assert(_manager_array != NULL, "access of NULL manager_array");
@@ -214,12 +215,21 @@ inline oop PSPromotionManager::copy_to_survivor_space(oop o) {
assert(new_obj != NULL, "allocation should have succeeded");
+ Prefetch::write(new_obj, PrefetchCopyIntervalInBytes);
+
// Copy obj
Copy::aligned_disjoint_words((HeapWord*)o, (HeapWord*)new_obj, new_obj_size); Copy::aligned_disjoint_words((HeapWord*)o, (HeapWord*)new_obj, new_obj_size);
// Now we have to CAS in the header. // Now we have to CAS in the header.
@ -36,14 +60,17 @@ index cc5a4aa98..9bf45f82b 100644
// We won any races, we "own" this object. // We won any races, we "own" this object.
assert(new_obj == o->forwardee(), "Sanity"); assert(new_obj == o->forwardee(), "Sanity");
@@ -275,6 +282,10 @@ inline oop PSPromotionManager::copy_to_survivor_space(oop o) { @@ -275,6 +285,10 @@ inline oop PSPromotionManager::copy_to_survivor_space(oop o) {
// This code must come after the CAS test, or it will print incorrect // This code must come after the CAS test, or it will print incorrect
// information. // information.
+ // When UsePSRelaxedForwardee is true or object o is gc leaf, CAS failed threads can't access forwardee's content, + // When UsePSRelaxedForwardee is true or object o is gc leaf, CAS failed threads can't access forwardee's content,
+ // as relaxed CAS cann't gurantee new obj's content visible for these CAS failed threads.The below log output is + // as relaxed CAS cann't gurantee new obj's content visible for these CAS failed threads.The below log output is
+ // dangerous.So we just support UsePSRelaxedForwardee and gc leaf in product. + // dangerous.So we just support UsePSRelaxedForwardee and gc leaf in product.
+ // Everywhere access forwardee's content must be careful. + // Everywhere access forwardee's content must be careful.
log_develop_trace(gc, scavenge)("{%s %s " PTR_FORMAT " -> " PTR_FORMAT " (%d)}", log_develop_trace(gc, scavenge)("{%s %s " PTR_FORMAT " -> " PTR_FORMAT " (%d)}",
should_scavenge(&new_obj) ? "copying" : "tenuring", should_scavenge(&new_obj) ? "copying" : "tenuring",
new_obj->klass()->internal_name(), p2i((void *)o), p2i((void *)new_obj), new_obj->size()); new_obj->klass()->internal_name(), p2i((void *)o), p2i((void *)new_obj), new_obj->size());
--
2.30.1 (Apple Git-130)

View File

@ -130,12 +130,12 @@
%global origin_nice OpenJDK %global origin_nice OpenJDK
%global top_level_dir_name %{origin} %global top_level_dir_name %{origin}
%global minorver 0 %global minorver 0
%global buildver 6 %global buildver 8
%global patchver 0 %global patchver 0
%global project jdk-updates %global project jdk-updates
%global repo jdk11u %global repo jdk11u
%global revision jdk-11.0.17-6 %global revision jdk-11.0.17-ga
%global full_revision %{project}-%{repo}-%{revision} %global full_revision %{project}-%{repo}-%{revision}
# priority must be 7 digits in total # priority must be 7 digits in total
# setting to 1, so debug ones can have 0 # setting to 1, so debug ones can have 0
@ -1678,6 +1678,11 @@ cjc.mainProgram(arg)
%changelog %changelog
* Wed Oct 19 2022 DXwangg <wangjiawei80@huawei.com> - 1:11.0.17.8-0
- update to 11.0.17+8(GA)
- modified G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch
- modified PS-introduce-UsePSRelaxedForwardee-to-enable-using-r.patch
* Mon Sep 19 2022 DXwangg <wangjiawei80@huawei.com> - 1:11.0.17.6-0 * Mon Sep 19 2022 DXwangg <wangjiawei80@huawei.com> - 1:11.0.17.6-0
- update to 11.0.17+5 - update to 11.0.17+5
- modified NUMA-Aware-Implementation-humongous-region.patch - modified NUMA-Aware-Implementation-humongous-region.patch