This repository has been archived by the owner on Sep 19, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 58
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8287982: Concurrent implicit attach from native threads crashes VM
Reviewed-by: dholmes, rehn
- Loading branch information
Alan Bateman
committed
Jun 22, 2022
1 parent
9e2d9ac
commit 7cf71bc
Showing
7 changed files
with
381 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
test/jdk/java/lang/Thread/jni/AttachCurrentThread/AttachTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
| * | ||
| * This code is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| */ | ||
|
|
||
| /** | ||
| * @test | ||
| * @bug 8287982 | ||
| * @summary Test native threads attaching to the VM with JNI AttachCurrentThread | ||
| * @requires (os.family == "linux" | os.family == "mac") | ||
| * @library /test/lib | ||
| * @compile ExplicitAttach.java | ||
| * @run main AttachTest ExplicitAttach 1 | ||
| * @run main AttachTest ExplicitAttach 2 | ||
| * @run main AttachTest ExplicitAttach 4 | ||
| */ | ||
|
|
||
| /** | ||
| * @test | ||
| * @summary Test native threads attaching implicitly to the VM by means of an upcall | ||
| * @requires (os.family == "linux" | os.family == "mac") & (sun.arch.data.model == "64") | ||
| * @library /test/lib | ||
| * @compile --enable-preview -source ${jdk.version} ImplicitAttach.java | ||
| * @run main AttachTest --enable-preview --enable-native-access=ALL-UNNAMED ImplicitAttach 1 | ||
| * @run main AttachTest --enable-preview --enable-native-access=ALL-UNNAMED ImplicitAttach 2 | ||
| * @run main AttachTest --enable-preview --enable-native-access=ALL-UNNAMED ImplicitAttach 4 | ||
| */ | ||
|
|
||
| import java.util.stream.Stream; | ||
| import jdk.test.lib.process.ProcessTools; | ||
| import jdk.test.lib.process.OutputAnalyzer; | ||
|
|
||
| public class AttachTest { | ||
| static final String TEST_CLASSES = System.getProperty("test.classes"); | ||
| static final String JAVA_LIBRARY_PATH = System.getProperty("java.library.path"); | ||
|
|
||
| public static void main(String[] args) throws Exception { | ||
| // prepend -cp ${test.classes} -Djava.library.path=${java.library.path} | ||
| String[] opts = Stream.concat(Stream.of( | ||
| "-cp", TEST_CLASSES, | ||
| "-Djava.library.path=" + JAVA_LIBRARY_PATH), | ||
| Stream.of(args)) | ||
| .toArray(String[]::new); | ||
| OutputAnalyzer outputAnalyzer = ProcessTools | ||
| .executeTestJava(opts) | ||
| .outputTo(System.out) | ||
| .errorTo(System.out); | ||
| int exitValue = outputAnalyzer.getExitValue(); | ||
| if (exitValue != 0) | ||
| throw new RuntimeException("Test failed"); | ||
| } | ||
| } |
62 changes: 62 additions & 0 deletions
62
test/jdk/java/lang/Thread/jni/AttachCurrentThread/ExplicitAttach.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
| * | ||
| * This code is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| */ | ||
|
|
||
| import java.util.concurrent.CountDownLatch; | ||
|
|
||
| /** | ||
| * Test native threads attaching to the VM with JNI AttachCurrentThread. | ||
| */ | ||
| public class ExplicitAttach { | ||
| private static volatile CountDownLatch latch; | ||
|
|
||
| public static void main(String[] args) throws Exception { | ||
| int threadCount; | ||
| if (args.length > 0) { | ||
| threadCount = Integer.parseInt(args[0]); | ||
| } else { | ||
| threadCount = 2; | ||
| } | ||
| latch = new CountDownLatch(threadCount); | ||
|
|
||
| // start the threads and wait for the threads to call home | ||
| startThreads(threadCount); | ||
| latch.await(); | ||
| } | ||
|
|
||
| /** | ||
| * Invoked by attached threads. | ||
| */ | ||
| private static void callback() { | ||
| System.out.println(Thread.currentThread()); | ||
| latch.countDown(); | ||
| } | ||
|
|
||
| /** | ||
| * Start n native threads that attach to the VM and invoke callback. | ||
| */ | ||
| private static native void startThreads(int n); | ||
|
|
||
| static { | ||
| System.loadLibrary("ExplicitAttach"); | ||
| } | ||
| } |
79 changes: 79 additions & 0 deletions
79
test/jdk/java/lang/Thread/jni/AttachCurrentThread/ImplicitAttach.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| /* | ||
| * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
| * | ||
| * This code is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| */ | ||
|
|
||
| import java.lang.foreign.*; | ||
| import java.lang.invoke.MethodHandle; | ||
| import java.lang.invoke.MethodHandles; | ||
| import java.lang.invoke.MethodType; | ||
| import java.util.concurrent.CountDownLatch; | ||
|
|
||
| /** | ||
| * Test native threads attaching implicitly to the VM by means of an upcall. | ||
| */ | ||
| public class ImplicitAttach { | ||
| private static final ValueLayout.OfInt C_INT = ValueLayout.JAVA_INT.withBitAlignment(32); | ||
| private static final ValueLayout.OfAddress C_POINTER = ValueLayout.ADDRESS.withBitAlignment(64); | ||
|
|
||
| private static volatile CountDownLatch latch; | ||
|
|
||
| public static void main(String[] args) throws Throwable { | ||
| int threadCount; | ||
| if (args.length > 0) { | ||
| threadCount = Integer.parseInt(args[0]); | ||
| } else { | ||
| threadCount = 2; | ||
| } | ||
| latch = new CountDownLatch(threadCount); | ||
|
|
||
| Linker abi = Linker.nativeLinker(); | ||
|
|
||
| // stub to invoke callback | ||
| MethodHandle callback = MethodHandles.lookup() | ||
| .findStatic(ImplicitAttach.class, "callback", MethodType.methodType(void.class)); | ||
| MemorySegment upcallStub = abi.upcallStub(callback, | ||
| FunctionDescriptor.ofVoid(), | ||
| MemorySession.openImplicit()); | ||
|
|
||
| // void start_threads(int count, void *(*f)(void *)) | ||
| SymbolLookup symbolLookup = SymbolLookup.loaderLookup(); | ||
| MemorySegment symbol = symbolLookup.lookup("start_threads").orElseThrow(); | ||
| FunctionDescriptor desc = FunctionDescriptor.ofVoid(C_INT, C_POINTER); | ||
| MethodHandle start_threads = abi.downcallHandle(symbol, desc); | ||
|
|
||
| // start the threads and wait for the threads to call home | ||
| start_threads.invoke(threadCount, upcallStub); | ||
| latch.await(); | ||
| } | ||
|
|
||
| /** | ||
| * Invoked from native thread. | ||
| */ | ||
| private static void callback() { | ||
| System.out.println(Thread.currentThread()); | ||
| latch.countDown(); | ||
| } | ||
|
|
||
| static { | ||
| System.loadLibrary("ImplicitAttach"); | ||
| } | ||
| } |
Oops, something went wrong.
7cf71bcThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review
Issues