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.

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

8315031: YoungPLABSize and OldPLABSize not aligned by ObjectAlignmentInBytes #15901

Closed
wants to merge 2 commits into from

Conversation

albertnetymk
Copy link
Member

@albertnetymk albertnetymk commented Sep 25, 2023

Simple fix around unaligned PLAB size. Due to a circular dependency between the heap and PLAB initialization in G1, _default_plab_size picks up unaligned PLAB sizes, hence the additional alignment there.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8315031: YoungPLABSize and OldPLABSize not aligned by ObjectAlignmentInBytes (Bug - P2)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/15901/head:pull/15901
$ git checkout pull/15901

Update a local copy of the PR:
$ git checkout pull/15901
$ git pull https://git.openjdk.org/jdk.git pull/15901/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15901

View PR using the GUI difftool:
$ git pr show -t 15901

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/15901.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 25, 2023

👋 Welcome back ayang! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title 8315031 8315031: YoungPLABSize and OldPLABSize not aligned by ObjectAlignmentInBytes Sep 25, 2023
@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 25, 2023
@openjdk
Copy link

openjdk bot commented Sep 25, 2023

@albertnetymk The following label will be automatically applied to this pull request:

  • hotspot-gc

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the hotspot-gc hotspot-gc-dev@openjdk.org label Sep 25, 2023
@mlbridge
Copy link

mlbridge bot commented Sep 25, 2023

Webrevs

@@ -133,7 +133,7 @@ G1EvacStats::G1EvacStats(const char* description, size_t default_per_thread_plab
// Calculates plab size for current number of gc worker threads.
size_t G1EvacStats::desired_plab_size(uint no_of_gc_workers) const {
if (!ResizePLAB) {
return _default_plab_size;
return align_object_size(_default_plab_size);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe a comment about that circular dependency should be added here; please also fix the indentation.

Copy link
Contributor

@tschatzl tschatzl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm.

@openjdk
Copy link

openjdk bot commented Sep 28, 2023

@albertnetymk This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8315031: YoungPLABSize and OldPLABSize not aligned by ObjectAlignmentInBytes

Reviewed-by: tschatzl, iwalulya

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 55 new commits pushed to the master branch:

  • fc98998: 8316580: HttpClient with StructuredTaskScope does not close when a task fails
  • 065203d: 8313631: SA: stack trace printed using "where" command does not show class name
  • 0c55887: 8309599: WeakHandle and OopHandle release should clear obj pointer
  • 1230aed: 8316885: jcmd: Compiler.CodeHeap_Analytics cmd does not inform about missing aggregate
  • d0c1444: 8316957: Serial: Change GenCollectedHeap to SerialHeap inside gc/serial folder
  • bc5a39b: 8317144: Exclude sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java on Linux ppc64le
  • 3481ecb: 8316159: Update BoxLayout sample image for crisper edges
  • 7981251: 8316970: Add internal annotation to mark restricted methods
  • 77fac0f: 8316906: Clarify TLABWasteTargetPercent flag
  • 2d154fc: 8316566: RISC-V: Zero extended narrow oop passed to Atomic::cmpxchg
  • ... and 45 more: https://git.openjdk.org/jdk/compare/311c7461c8c0f5f1524d409736e4cceca8de9000...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Sep 28, 2023
@albertnetymk
Copy link
Member Author

Thanks for the review.

/integrate

@openjdk
Copy link

openjdk bot commented Sep 28, 2023

Going to push as commit 060db1b.
Since your change was applied there have been 58 commits pushed to the master branch:

  • 3481a48: 8316974: ListFormat creation is unsuccessful for some of the supported Locales
  • 29348b3: 8316894: make test TEST="jtreg:test/jdk/..." fails on AIX
  • 3f19df6: 8315936: Parallelize gc/stress/TestStressG1Humongous.java test
  • fc98998: 8316580: HttpClient with StructuredTaskScope does not close when a task fails
  • 065203d: 8313631: SA: stack trace printed using "where" command does not show class name
  • 0c55887: 8309599: WeakHandle and OopHandle release should clear obj pointer
  • 1230aed: 8316885: jcmd: Compiler.CodeHeap_Analytics cmd does not inform about missing aggregate
  • d0c1444: 8316957: Serial: Change GenCollectedHeap to SerialHeap inside gc/serial folder
  • bc5a39b: 8317144: Exclude sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java on Linux ppc64le
  • 3481ecb: 8316159: Update BoxLayout sample image for crisper edges
  • ... and 48 more: https://git.openjdk.org/jdk/compare/311c7461c8c0f5f1524d409736e4cceca8de9000...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Sep 28, 2023
@openjdk openjdk bot closed this Sep 28, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 28, 2023
@openjdk
Copy link

openjdk bot commented Sep 28, 2023

@albertnetymk Pushed as commit 060db1b.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@albertnetymk albertnetymk deleted the plab-align branch September 28, 2023 17:19
@mmyxym
Copy link

mmyxym commented Jun 3, 2024

/backport jdk22u

@openjdk
Copy link

openjdk bot commented Jun 3, 2024

@mmyxym Could not apply backport 060db1b2 to openjdk/jdk22u because the change is already present in the target.

@mmyxym
Copy link

mmyxym commented Jun 3, 2024

/backport jdk21u-dev

@openjdk
Copy link

openjdk bot commented Jun 3, 2024

@mmyxym the backport was successfully created on the branch backport-mmyxym-060db1b2 in my personal fork of openjdk/jdk21u-dev. To create a pull request with this backport targeting openjdk/jdk21u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 060db1b2 from the openjdk/jdk repository.

The commit being backported was authored by Albert Mingkun Yang on 28 Sep 2023 and was reviewed by Thomas Schatzl and Ivan Walulya.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u-dev:

$ git fetch https://github.com/openjdk-bots/jdk21u-dev.git backport-mmyxym-060db1b2:backport-mmyxym-060db1b2
$ git checkout backport-mmyxym-060db1b2
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u-dev.git backport-mmyxym-060db1b2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-gc hotspot-gc-dev@openjdk.org integrated Pull request has been integrated
4 participants