Skip to content
This repository has been archived by the owner on Jul 17, 2024. It is now read-only.
/ jdk22u Public archive

Commit

Permalink
8322098: os::Linux::print_system_memory_info enhance the THP output w…
Browse files Browse the repository at this point in the history 
…ith /sys/kernel/mm/transparent_hugepage/hpage_pmd_size

Backport-of: b31454e36234091c3827c3b4d07f62345cb0cee4
  • Loading branch information
@MBaesken
MBaesken committed Jan 12, 2024
1 parent 4c8b839 commit 3257d9d
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/hotspot/os/linux/os_linux.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2215,6 +2215,8 @@ void os::Linux::print_system_memory_info(outputStream* st) {
// https://www.kernel.org/doc/Documentation/vm/transhuge.txt
_print_ascii_file_h("/sys/kernel/mm/transparent_hugepage/enabled",
"/sys/kernel/mm/transparent_hugepage/enabled", st);
_print_ascii_file_h("/sys/kernel/mm/transparent_hugepage/hpage_pdm_size",
"/sys/kernel/mm/transparent_hugepage/hpage_pmd_size", st);
_print_ascii_file_h("/sys/kernel/mm/transparent_hugepage/shmem_enabled",
"/sys/kernel/mm/transparent_hugepage/shmem_enabled", st);
_print_ascii_file_h("/sys/kernel/mm/transparent_hugepage/defrag (defrag/compaction efforts parameter)",
Expand Down

3 comments on commit 3257d9d

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@MBaesken
Copy link
Member Author

Choose a reason for hiding this comment

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

/backport jdk21u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 3257d9d Jan 17, 2024

Choose a reason for hiding this comment

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

@MBaesken Could not automatically backport 3257d9db to openjdk/jdk21u-dev due to conflicts in the following files:

  • src/hotspot/os/linux/os_linux.cpp

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk21u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk21u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-MBaesken-3257d9db

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk22u.git 3257d9db0b691d86643d01a805beda71d158fafd

# Backport the commit
$ git cherry-pick --no-commit 3257d9db0b691d86643d01a805beda71d158fafd
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 3257d9db0b691d86643d01a805beda71d158fafd'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk21u-dev with the title Backport 3257d9db0b691d86643d01a805beda71d158fafd.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 3257d9db from the openjdk/jdk22u repository.

The commit being backported was authored by Matthias Baesken on 12 Jan 2024 and had no reviewers.

Thanks!

Please sign in to comment.