Integrated: JDK-8319828: runtime/NMT/VirtualAllocCommitMerge.java may fail if mixing interpreted and compiled native invocations

[Thomas Stuefe]

On Thu, 9 Nov 2023 16:05:14 GMT, Thomas Stuefe <stuefe at openjdk.org> wrote:

> We saw this problem on s390x, but it was easy to reproduce on x64.
> 
> The test creates adjacent commit sections via NMTCommitMemory(), and then expects them to show up as merged sections in the NMT report. That sometimes fails.
> 
> The relevant snippet in the NMT report was:
> 
> 
> [0x000003ff859fc000 - 0x000003ff85dfc000] reserved 4096KB for Test from
>     [0x000003ffb4ad2a58] WB_NMTReserveMemory+0xc0
>     [0x000003ff9bf43344]
> 
>     [0x000003ff859fc000 - 0x000003ff85a1c000] committed 128KB from
>             [0x000003ffb4ad288c] WB_NMTCommitMemory+0xc4
> 
>     [0x000003ff85a1c000 - 0x000003ff85a5c000] committed 256KB from
>             [0x000003ffb4ad288c] WB_NMTCommitMemory+0xc4
>             [0x000003ff9bf43344]
> 
> 
> Note how it shows two adjacent commit sections, one 128k, one 256k, that the test expected to show up as one merged section of 384k.
> 
> The reason for this is that the first invocation of NMTCommitMemory was done interpreted, the second one compiled. Therefore we run with different stacks, one with an interpreter codelet, one with an nmethod. Can be easily reproduced on x64, see annotated stack:
> 
> 
> [0x00007fceb0147000 - 0x00007fceb0547000] reserved 4096KB for Test from
>     [0x00007fcef3beccd5] WB_NMTReserveMemory+0xa5
>     [0x00007fcedb92bbce]0x00007fcedb92bbce is at code_begin+1806 in an Interpreter codelet
> 
> [0x00007fceb0147000 - 0x00007fceb0167000] committed 128KB from
>             [0x00007fcef3bed098] WB_NMTCommitMemory+0xa8
>             [0x00007fcedc0901a1]0x00007fcedc0901a1 is at entry_point+225 in (nmethod*)0x00007fcedc08ff10
> 
> [0x00007fceb0167000 - 0x00007fceb01a7000] committed 256KB from
>             [0x00007fcef3bed098] WB_NMTCommitMemory+0xa8
>             [0x00007fcedb92bbce]0x00007fcedb92bbce is at code_begin+1806 in an Interpreter codelet
> 
> 
> 
> Since the stacks differ, NMT does not merge the sections. And that is fine; it shouldn't do that.
> 
> ---
> 
> The fix is to just run everything interpreted. I don't want to just define compilation for NMTCommitMemory(), since the compiled vs interpreted question may affect other stack frames as well. Best to have stable stack frames for this test.

This pull request has now been integrated.

Changeset: 6b21ff61
Author:    Thomas Stuefe <stuefe at openjdk.org>
URL:       https://git.openjdk.org/jdk/commit/6b21ff61dad6f633c744c1c33c29ea86183b509d
Stats:     4 lines in 1 file changed: 3 ins; 0 del; 1 mod

8319828: runtime/NMT/VirtualAllocCommitMerge.java may fail if mixing interpreted and compiled native invocations

Reviewed-by: stefank

-------------

PR: https://git.openjdk.org/jdk/pull/16583