8324280: RISC-V: Incorrect implementation in VM_Version::parse_satp_mode

[MaxXSoft]

Currently, method VM_Version::os_uarch_additional_features uses fgets to read the contents of /proc/cpuinfo, then calls parse_satp_mode with a string with the leading "mmu" and whitespaces removed, like ": sv39\n". However, parse_satp_mode compares this string directly to "sv39", which always fails and returns VM_MBARE.

---

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-8324280: RISC-V: Incorrect implementation in VM_Version::parse_satp_mode (Bug - P4)

Reviewers

• Robbin Ehn (@robehn - Reviewer) ⚠️ Review applies to 5d1a8f27
• Fei Yang (@RealFYang - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17513

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

Hi @MaxXSoft, welcome to this OpenJDK project and thanks for contributing!

We do not recognize you as Contributor and need to ensure you have signed the Oracle Contributor Agreement (OCA). If you have not signed the OCA, please follow the instructions. Please fill in your GitHub username in the "Username" field of the application. Once you have signed the OCA, please let us know by writing /signed in a comment in this pull request.

If you already are an OpenJDK Author, Committer or Reviewer, please click here to open a new issue so that we can record that fact. Please use "Add GitHub user MaxXSoft" as summary for the issue.

If you are contributing this work on behalf of your employer and your employer has signed the OCA, please let us know by writing /covered in a comment in this pull request.

[openjdk]

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

• hotspot-runtime

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.

[MaxXSoft]

/covered

[bridgekeeper]

Thank you! Please allow for a few business days to verify that your employer has signed the OCA. Also, please note that pull requests that are pending an OCA check will not usually be evaluated, so your patience is appreciated!

[RealFYang]

Verified that this happens after fix for: https://bugs.openjdk.org/browse/JDK-8309258. Note: @robehn

[robehn]

Ah, thanks! (you need to fix the OCA: https://openjdk.org/contribute/)

I asked for a bunch of extensions in hwprobe and got allmost all.
I forgot about this one, I'll ask for it to be included in hwprobe.
Another approach seems to be to use mmap + hint.

Maybe use strncmp(vm_mode, 4, "svXX").

[MaxXSoft]

@RealFYang @robehn Thanks for your review!

I'm still waiting for my OCA to pass. Also I'v updated this PR to use strncmp.

[openjdk]

⚠️ @MaxXSoft the full name on your profile does not match the author name in this pull requests' HEAD commit. If this pull request gets integrated then the author name from this pull requests' HEAD commit will be used for the resulting commit. If you wish to push a new commit with a different author name, then please run the following commands in a local repository of your personal fork:

$ git checkout fix-satp-mode
$ git commit --author='Preferred Full Name <you@example.com>' --allow-empty -m 'Update full name'
$ git push

[openjdk]

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

8324280: RISC-V: Incorrect implementation in VM_Version::parse_satp_mode

Reviewed-by: rehn, fyang

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

• 3d32c46: 6503196: API doc for DecimalFormat::getMaximumIntegerDigits is unclear
• 2d5cb97: 8324647: Invalid test group of lib-test after JDK-8323515
• 6212264: 8320692: Null icon returned for .exe without custom icon
• 32eb529: 8324553: Shenandoah: Move periodic tasks closer to their collaborators
• c702dca: 8323815: Source launcher should find classes with $ in names
• c432dc0: 8322149: ConcurrentHashMap smarter presizing for copy constructor and putAll
• fb822e4: 8324514: ClassLoaderData::print_on should print address of class loader
• 00bb6bf: 8324220: jdk/jfr/event/io/TestSerializationMisdeclarationEvent.java had 22 failures
• bccd823: 8324613: Serial: Rename GenerationPool to TenuredGenerationPool
• 8c003d8: 8321512: runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java fails on 32-bit platforms
• ... and 29 more: https://git.openjdk.org/jdk/compare/2003610b3b52eed04de6713a2a36151d0d86d7c9...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 (@robehn, @RealFYang) 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).

[mlbridge]

Webrevs

• 00: Full (a85101e8)

[MaxXSoft]

/integrate

[openjdk]

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

[RealFYang]

/sponsor

[openjdk]

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

• 3d32c46: 6503196: API doc for DecimalFormat::getMaximumIntegerDigits is unclear
• 2d5cb97: 8324647: Invalid test group of lib-test after JDK-8323515
• 6212264: 8320692: Null icon returned for .exe without custom icon
• 32eb529: 8324553: Shenandoah: Move periodic tasks closer to their collaborators
• c702dca: 8323815: Source launcher should find classes with $ in names
• c432dc0: 8322149: ConcurrentHashMap smarter presizing for copy constructor and putAll
• fb822e4: 8324514: ClassLoaderData::print_on should print address of class loader
• 00bb6bf: 8324220: jdk/jfr/event/io/TestSerializationMisdeclarationEvent.java had 22 failures
• bccd823: 8324613: Serial: Rename GenerationPool to TenuredGenerationPool
• 8c003d8: 8321512: runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java fails on 32-bit platforms
• ... and 29 more: https://git.openjdk.org/jdk/compare/2003610b3b52eed04de6713a2a36151d0d86d7c9...master

Your commit was automatically rebased without conflicts.

[openjdk]

@RealFYang @MaxXSoft Pushed as commit e7fdac9.

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

[zifeihan]

/backport jdk21u-dev

[openjdk]

@zifeihan the backport was successfully created on the branch backport-zifeihan-e7fdac9d 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 e7fdac9d from the openjdk/jdk repository.

The commit being backported was authored by MaxXSoft on 25 Jan 2024 and was reviewed by Robbin Ehn and Fei Yang.

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-zifeihan-e7fdac9d:backport-zifeihan-e7fdac9d
$ git checkout backport-zifeihan-e7fdac9d
# 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-zifeihan-e7fdac9d

[zifeihan]

/backport jdk17u-dev

[openjdk]

@zifeihan the backport was successfully created on the branch backport-zifeihan-e7fdac9d in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-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 e7fdac9d from the openjdk/jdk repository.

The commit being backported was authored by MaxXSoft on 25 Jan 2024 and was reviewed by Robbin Ehn and Fei Yang.

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/jdk17u-dev:

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

⚠️ @zifeihan You are not yet a collaborator in my fork openjdk-bots/jdk17u-dev. An invite will be sent out and you need to accept it before you can proceed.

[zifeihan]

/backport jdk22u

[openjdk]

@zifeihan the backport was successfully created on the branch backport-zifeihan-e7fdac9d in my personal fork of openjdk/jdk22u. To create a pull request with this backport targeting openjdk/jdk22u: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 e7fdac9d from the openjdk/jdk repository.

The commit being backported was authored by MaxXSoft on 25 Jan 2024 and was reviewed by Robbin Ehn and Fei Yang.

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/jdk22u:

$ git fetch https://github.com/openjdk-bots/jdk22u.git backport-zifeihan-e7fdac9d:backport-zifeihan-e7fdac9d
$ git checkout backport-zifeihan-e7fdac9d
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk22u.git backport-zifeihan-e7fdac9d

⚠️ @zifeihan You are not yet a collaborator in my fork openjdk-bots/jdk22u. An invite will be sent out and you need to accept it before you can proceed.