jdk17u-dev icon indicating copy to clipboard operation
jdk17u-dev copied to clipboard

8286490: JvmtiEventControllerPrivate::set_event_callbacks CLEARING_MASK computation is incorrect

Open wkia opened this issue 1 year ago • 7 comments
trafficstars

This is a backport of JDK-8286490: JvmtiEventControllerPrivate::set_event_callbacks CLEARING_MASK computation is incorrect.

Backporting this because this issue can be reproduced in JDK17 as well.

The backport isn't clean:

  1. Resolved a conflict in src/hotspot/share/prims/jvmtiEventController.cpp with an empty line.
  2. Removed files as VThreads are not implemented in jdk17:
    • test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTest/libVThreadTest.cpp
    • test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTest/VThreadTest.java
  3. Added new test:
    • test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/extcallback/Test.java
    • test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/extcallback/libextcallback.c
    • test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/extcallback/loadClass/Test2.java

Actually, backporting the fix only. The new test fails without the fix, and successfully passes with the fix.


Progress

  • [ ] Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • [x] Change must not contain extraneous whitespace
  • [x] Commit message must refer to an issue
  • [ ] JDK-8286490 needs maintainer approval

Issue

  • JDK-8286490: JvmtiEventControllerPrivate::set_event_callbacks CLEARING_MASK computation is incorrect (Bug - P4)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/2276/head:pull/2276
$ git checkout pull/2276

Update a local copy of the PR:
$ git checkout pull/2276
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/2276/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2276

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/2276.diff

Webrev

Link to Webrev Comment

wkia avatar Mar 08 '24 06:03 wkia

:wave: Welcome back rmarchenko! 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.

bridgekeeper[bot] avatar Mar 08 '24 06:03 bridgekeeper[bot]

This backport pull request has now been updated with issue from the original commit.

openjdk[bot] avatar Mar 08 '24 06:03 openjdk[bot]

Webrevs

mlbridge[bot] avatar Mar 08 '24 06:03 mlbridge[bot]

GHA passed, but "linux-cross-compile / build (riscv64)" - seems like an infrastructure problem.

wkia avatar Mar 08 '24 09:03 wkia

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

8286490: JvmtiEventControllerPrivate::set_event_callbacks CLEARING_MASK computation is incorrect

Reviewed-by: phh

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

  • 20c2511f54bbae0d41f8750f5e02c6b59630d66f: 8309890: TestStringDeduplicationInterned.java waits for the wrong condition
  • 8f68f8f019bca842b4bdf366f3c364b25983fd9e: 8316142: Enable parallelism in vmTestbase/nsk/monitoring/stress/lowmem tests
  • 4504b16390fc8c00542fdc43625e0e03a8cbc7c7: 8280113: (dc) DatagramSocket.receive does not always throw when the channel is closed
  • 97cc17719d01122399d1d5ea9bed02af321b27e6: 8042380: Test javax/swing/JFileChooser/4524490/bug4524490.java fails with InvocationTargetException
  • e552509bcbbba5562219355841cf3dedd7daaeb8: 8297082: Remove sun/tools/jhsdb/BasicLauncherTest.java from problem list
  • 5a3c668646c363f2a2028e4aede63eef524ad5fd: 8272315: Improve assert_different_registers
  • e97489774f0b893ed173be05e5d848ee2af76775: 8298413: [s390] CPUInfoTest fails due to uppercase feature string
  • d2982c673053bdea8bc122230a4d57eda76832ef: 8331641: [17u]: Bump GHA bootstrap JDK to 17.0.11
  • 68a2d93588b1b3cdf1a8c8eb135581ede97c8ac3: 8330094: RISC-V: Save and restore FRM in the call stub
  • 32bf1f4169fd07291d608323c143832ad48e531e: 8325579: Inconsistent behavior in com.sun.jndi.ldap.Connection::createSocket
  • ... and 172 more: https://git.openjdk.org/jdk17u-dev/compare/fa8a159933a1c5c4fb5f03b2b78eedc864881731...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@phohensee) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

openjdk[bot] avatar Mar 13 '24 19:03 openjdk[bot]

@wkia This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

bridgekeeper[bot] avatar Apr 10 '24 21:04 bridgekeeper[bot]

Up

wkia avatar Apr 11 '24 05:04 wkia

@wkia This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

bridgekeeper[bot] avatar May 09 '24 06:05 bridgekeeper[bot]

Up

wkia avatar May 09 '24 06:05 wkia

GHA failure is an infrastructure issue.

phohensee avatar May 11 '24 03:05 phohensee

⚠️ @wkia This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

openjdk[bot] avatar May 11 '24 03:05 openjdk[bot]

/approval request Backporting this because this issue can be reproduced in JDK17 as well. The backport isn't clean because of conflicts and removed files. The new test fails without the fix, and successfully passes with the fix.

wkia avatar May 12 '24 10:05 wkia

@wkia 8286490: The approval request has been created successfully.

openjdk[bot] avatar May 12 '24 10:05 openjdk[bot]

/integrate

wkia avatar May 13 '24 10:05 wkia

@wkia Your change (at version c0d28d465d88d8315789e7a072115a2a5f33c85e) is now ready to be sponsored by a Committer.

openjdk[bot] avatar May 13 '24 10:05 openjdk[bot]

/sponsor

phohensee avatar May 13 '24 17:05 phohensee

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

  • f789e384e55feaf10a08846e1f667c97367d317b: 8307423: [s390x] Represent Registers as values
  • bf4b15ce080bfdf1dd818233cd1ef6ac0519294d: 8321925: sun/security/mscapi/KeytoolChangeAlias.java fails with "Alias <246810> does not exist"
  • ce1fb0265b3edf904ea00b190957e8a70371a080: 8311964: Some jtreg tests failing on x86 with error 'unrecognized VM options' (C2 flags)
  • 606c542e7f9cb629e030463f07994e665f6212a2: 8326201: [S390] Need to bailout cleanly if creation of stubs fails when code cache is out of space
  • 16579f8658b6422131dd3ca35e7276eb6c477c12: 8297445: PPC64: Represent Registers as values
  • 20c2511f54bbae0d41f8750f5e02c6b59630d66f: 8309890: TestStringDeduplicationInterned.java waits for the wrong condition
  • 8f68f8f019bca842b4bdf366f3c364b25983fd9e: 8316142: Enable parallelism in vmTestbase/nsk/monitoring/stress/lowmem tests
  • 4504b16390fc8c00542fdc43625e0e03a8cbc7c7: 8280113: (dc) DatagramSocket.receive does not always throw when the channel is closed
  • 97cc17719d01122399d1d5ea9bed02af321b27e6: 8042380: Test javax/swing/JFileChooser/4524490/bug4524490.java fails with InvocationTargetException
  • e552509bcbbba5562219355841cf3dedd7daaeb8: 8297082: Remove sun/tools/jhsdb/BasicLauncherTest.java from problem list
  • ... and 177 more: https://git.openjdk.org/jdk17u-dev/compare/fa8a159933a1c5c4fb5f03b2b78eedc864881731...master

Your commit was automatically rebased without conflicts.

openjdk[bot] avatar May 13 '24 17:05 openjdk[bot]

@phohensee @wkia Pushed as commit e2791f3304768729fbc665886f9c406fb3d1bf39.

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

openjdk[bot] avatar May 13 '24 17:05 openjdk[bot]