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.

Sign up for GitHub

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

Jump to bottom

7124710: interleaved RedefineClasses() and RetransformClasses() calls may have a problem #10032

Closed
wants to merge 10 commits into from
Closed

7124710: interleaved RedefineClasses() and RetransformClasses() calls may have a problem #10032

wants to merge 10 commits into from

Conversation

alexmenkov
Copy link

@alexmenkov alexmenkov commented Aug 25, 2022 •
edited by openjdk bot
Loading

The problem is RedefineClasses does not update cached_class_bytes, so subsequent RetransformClasses gets obsolete class bytes (this are testcases 3-6 from the new test)

cached_class_bytes are set when an agent instruments the class from ClassFileLoadHook.
After successful RedefineClasses it should be reset.
The fix updates ClassFileLoadHook caller to not use old cached_class_bytes with RedefineClasses (if some agent instruments the class, new cached_class_bytes are allocated for scratch_class) and updates cached_class_bytes after successful RedefineClasses or RetransformClasses.

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-7124710: interleaved RedefineClasses() and RetransformClasses() calls may have a problem

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10032

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 25, 2022

👋 Welcome back amenkov! 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
Copy link

openjdk bot commented Aug 25, 2022

@alexmenkov The following labels will be automatically applied to this pull request:

  • hotspot
  • serviceability

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

@openjdk openjdk bot added serviceability serviceability-dev@openjdk.org hotspot hotspot-dev@openjdk.org labels Aug 25, 2022
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 25, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 25, 2022 •
edited
Loading

Webrevs

sspitsyn
sspitsyn approved these changes Sep 3, 2022
View reviewed changes
Copy link
Contributor

@sspitsyn sspitsyn left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Alex,
My apology for latency with review.
The fix itself looks good to me.
Thank you for your good analysis and fix!
I've posted several comments on new test.
It feels like more comments are needed.
Could you, please, add them where you consider it relevant?
Also, I'm curious how did you verify that no regressions have been introduced?

Thanks,
Serguei

@openjdk
Copy link

openjdk bot commented Sep 3, 2022 •
edited
Loading

@alexmenkov 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:

7124710: interleaved RedefineClasses() and RetransformClasses() calls may have a problem

Reviewed-by: sspitsyn, dcubed

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 608 new commits pushed to the master branch:

  • 6a266c4: 8292879: com/sun/jdi/ClassUnloadEventTest.java failed due to classes not unloading
  • fe7a461: 8294920: Missing SP value in Linux x86_32 thread context
  • 4cbac40: 8294717: (bf) DirectByteBuffer constructor will leak if allocating Deallocator or Cleaner fails with OOME
  • c1166a3: 8289561: java/lang/instrument/NativeMethodPrefixAgent.java fails with "ERROR: Injection failure: java.lang.UnsupportedOperationException: Records requires ASM8"
  • a1747ef: 8294941: GHA: Cut down cross-compilation sysroots
  • 67210ab: 8286394: Address possibly lossy conversions in jdk.naming.dns
  • 7a194d3: 8290154: [JVMCI] partially implement JVMCI for RISC-V
  • b38bed6: 8294308: Allow dynamically choosing the MEMFLAGS of a type without ResourceObj
  • 118d93b: 8294907: Remove unused NativeLookup::dll_load
  • 1fda842: 8291429: java/lang/Thread/virtual/ThreadAPI.java timed out on single core system
  • ... and 598 more: https://git.openjdk.org/jdk/compare/82dbe29fc8327f6992703f54181c3e42beb99ccf...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 3, 2022
@alexmenkov
Copy link
Author

Also, I'm curious how did you verify that no regressions have been introduced?

Run all Redefine/Retransform Classes tests:
test/jdk/java/lang/instrument
test/hotspot/jtreg/serviceability/jvmti/RedefineClasses
test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses
test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses

sspitsyn
sspitsyn approved these changes Sep 8, 2022
View reviewed changes
Copy link
Contributor

@sspitsyn sspitsyn left a comment

Choose a reason for hiding this comment

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

Alex,
Thank you for the update!
It looks good to me.
Thanks,
Serguei

dcubed-ojdk
dcubed-ojdk suggested changes Sep 10, 2022
View reviewed changes
Copy link
Member

@dcubed-ojdk dcubed-ojdk left a comment

Choose a reason for hiding this comment

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

I like the fact that the fix is small and I really like the new test. I only
have minor comments and a couple of questions.

Please run these changes thru Tier[456] since that's where JVM/TI
tests run in different configs w/ different options.

@alexmenkov
Copy link
Author

I like the fact that the fix is small and I really like the new test. I only have minor comments and a couple of questions.

Thank you for the review

Please run these changes thru Tier[456] since that's where JVM/TI tests run in different configs w/ different options.

In progress

sspitsyn
sspitsyn approved these changes Sep 13, 2022
View reviewed changes
Copy link
Contributor

@sspitsyn sspitsyn left a comment

Choose a reason for hiding this comment

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

I've posted one minor comment.
Otherwise, it is good.
Thanks,
Serguei

sspitsyn
sspitsyn approved these changes Sep 14, 2022
View reviewed changes
Copy link
Contributor

@sspitsyn sspitsyn left a comment

Choose a reason for hiding this comment

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

Thank you for the update! It looks good.
Thanks,
Serguei

@dcubed-ojdk
Copy link
Member

@alexmenkov - sorry for the delay in re-reviewing. I was out sick.

dcubed-ojdk
dcubed-ojdk approved these changes Oct 7, 2022
View reviewed changes
Copy link
Member

@dcubed-ojdk dcubed-ojdk left a comment

Choose a reason for hiding this comment

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

Thanks for making the minor changes.

@alexmenkov
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 7, 2022

Going to push as commit 495c043.
Since your change was applied there have been 611 commits pushed to the master branch:

  • d39d8c8: 8170389: java.text.DigitList.getDouble() : Controversy between javadoc and code
  • 3466e99: 8294691: dynamicArchive/RelativePath.java is running other test case
  • 823b53d: 8294987: Streamline DerOutputStream write
  • 6a266c4: 8292879: com/sun/jdi/ClassUnloadEventTest.java failed due to classes not unloading
  • fe7a461: 8294920: Missing SP value in Linux x86_32 thread context
  • 4cbac40: 8294717: (bf) DirectByteBuffer constructor will leak if allocating Deallocator or Cleaner fails with OOME
  • c1166a3: 8289561: java/lang/instrument/NativeMethodPrefixAgent.java fails with "ERROR: Injection failure: java.lang.UnsupportedOperationException: Records requires ASM8"
  • a1747ef: 8294941: GHA: Cut down cross-compilation sysroots
  • 67210ab: 8286394: Address possibly lossy conversions in jdk.naming.dns
  • 7a194d3: 8290154: [JVMCI] partially implement JVMCI for RISC-V
  • ... and 601 more: https://git.openjdk.org/jdk/compare/82dbe29fc8327f6992703f54181c3e42beb99ccf...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 7, 2022

@alexmenkov Pushed as commit 495c043.

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

@alexmenkov alexmenkov deleted the redefineRetransform branch October 7, 2022 23:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sspitsyn sspitsyn sspitsyn approved these changes

@dcubed-ojdk dcubed-ojdk dcubed-ojdk approved these changes

Assignees
No one assigned
Labels
hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated serviceability serviceability-dev@openjdk.org
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@alexmenkov @dcubed-ojdk @sspitsyn