From e24496e89ba07bbe6a0816723ddce86f00682b82 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 20 2017 12:17:16 +0000 Subject: import java-1.8.0-openjdk-1.8.0.131-2.b11.el7_3 --- diff --git a/.gitignore b/.gitignore index 96c115e..8bf8e47 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/aarch64-port-jdk8u-aarch64-jdk8u121-b13.tar.xz +SOURCES/aarch64-port-jdk8u-aarch64-jdk8u131-b11.tar.xz SOURCES/systemtap-tapset-3.1.0.tar.xz diff --git a/.java-1.8.0-openjdk.metadata b/.java-1.8.0-openjdk.metadata index fac76eb..43ef056 100644 --- a/.java-1.8.0-openjdk.metadata +++ b/.java-1.8.0-openjdk.metadata @@ -1,2 +1,2 @@ -508be0d8b88737e62649b68eddccc247addbdb00 SOURCES/aarch64-port-jdk8u-aarch64-jdk8u121-b13.tar.xz +bb8d9c65980a671b068504cfae738ed6dc1e2f65 SOURCES/aarch64-port-jdk8u-aarch64-jdk8u131-b11.tar.xz 44b09844ec2e90db08d3d883993e0dbab0c1988a SOURCES/systemtap-tapset-3.1.0.tar.xz diff --git a/SOURCES/6515172-pr3346.patch b/SOURCES/6515172-pr3346.patch new file mode 100644 index 0000000..4b8e8a2 --- /dev/null +++ b/SOURCES/6515172-pr3346.patch @@ -0,0 +1,213 @@ +# HG changeset patch +# User shshahma +# Date 1474535080 25200 +# Thu Sep 22 02:04:40 2016 -0700 +# Node ID baf64c88538f477d7f5a0cf90b670108ac312375 +# Parent 62212568179b76b5ebe7b0129ddeed7b268b0bc0 +6515172, PR3346: Runtime.availableProcessors() ignores Linux taskset command +Summary: extract processor count from sched_getaffinity mask +Reviewed-by: dholmes, gthornbr + +diff --git a/src/os/linux/vm/globals_linux.hpp b/src/os/linux/vm/globals_linux.hpp +--- openjdk/hotspot/src/os/linux/vm/globals_linux.hpp ++++ openjdk/hotspot/src/os/linux/vm/globals_linux.hpp +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2005, 2016, 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 +@@ -47,7 +47,10 @@ + "Load DLLs with executable-stack attribute in the VM Thread") \ + \ + product(bool, UseSHM, false, \ +- "Use SYSV shared memory for large pages") ++ "Use SYSV shared memory for large pages") \ ++ \ ++ diagnostic(bool, PrintActiveCpus, false, \ ++ "Print the number of CPUs detected in os::active_processor_count") + + // + // Defines Linux-specific default values. The flags are available on all +diff --git a/src/os/linux/vm/os_linux.cpp b/src/os/linux/vm/os_linux.cpp +--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1999, 2016, 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 +@@ -104,6 +104,14 @@ + + PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC + ++#ifndef _GNU_SOURCE ++ #define _GNU_SOURCE ++ #include ++ #undef _GNU_SOURCE ++#else ++ #include ++#endif ++ + // if RUSAGE_THREAD for getrusage() has not been defined, do it here. The code calling + // getrusage() is prepared to handle the associated failure. + #ifndef RUSAGE_THREAD +@@ -5027,12 +5035,42 @@ + } + }; + ++static int os_cpu_count(const cpu_set_t* cpus) { ++ int count = 0; ++ // only look up to the number of configured processors ++ for (int i = 0; i < os::processor_count(); i++) { ++ if (CPU_ISSET(i, cpus)) { ++ count++; ++ } ++ } ++ return count; ++} ++ ++// Get the current number of available processors for this process. ++// This value can change at any time during a process's lifetime. ++// sched_getaffinity gives an accurate answer as it accounts for cpusets. ++// If anything goes wrong we fallback to returning the number of online ++// processors - which can be greater than the number available to the process. + int os::active_processor_count() { +- // Linux doesn't yet have a (official) notion of processor sets, +- // so just return the number of online processors. +- int online_cpus = ::sysconf(_SC_NPROCESSORS_ONLN); +- assert(online_cpus > 0 && online_cpus <= processor_count(), "sanity check"); +- return online_cpus; ++ cpu_set_t cpus; // can represent at most 1024 (CPU_SETSIZE) processors ++ int cpus_size = sizeof(cpu_set_t); ++ int cpu_count = 0; ++ ++ // pid 0 means the current thread - which we have to assume represents the process ++ if (sched_getaffinity(0, cpus_size, &cpus) == 0) { ++ cpu_count = os_cpu_count(&cpus); ++ if (PrintActiveCpus) { ++ tty->print_cr("active_processor_count: sched_getaffinity processor count: %d", cpu_count); ++ } ++ } ++ else { ++ cpu_count = ::sysconf(_SC_NPROCESSORS_ONLN); ++ warning("sched_getaffinity failed (%s)- using online processor count (%d) " ++ "which may exceed available processors", strerror(errno), cpu_count); ++ } ++ ++ assert(cpu_count > 0 && cpu_count <= processor_count(), "sanity check"); ++ return cpu_count; + } + + void os::set_native_thread_name(const char *name) { +diff --git a/test/runtime/os/AvailableProcessors.java b/test/runtime/os/AvailableProcessors.java +new file mode 100644 +--- /dev/null ++++ openjdk/hotspot/test/runtime/os/AvailableProcessors.java +@@ -0,0 +1,103 @@ ++/* ++ * Copyright (c) 2016, 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.io.File; ++import com.oracle.java.testlibrary.ProcessTools; ++import com.oracle.java.testlibrary.OutputAnalyzer; ++import java.util.ArrayList; ++ ++/* ++ * @test ++ * @bug 6515172 ++ * @summary Check that availableProcessors reports the correct value when running in a cpuset on linux ++ * @requires os.family == "linux" ++ * @library /testlibrary ++ * @build com.oracle.java.testlibrary.* ++ * @run driver AvailableProcessors ++ */ ++public class AvailableProcessors { ++ ++ static final String SUCCESS_STRING = "Found expected processors: "; ++ ++ public static void main(String[] args) throws Throwable { ++ if (args.length > 0) ++ checkProcessors(Integer.parseInt(args[0])); ++ else { ++ // run ourselves under different cpu configurations ++ // using the taskset command ++ String taskset; ++ final String taskset1 = "/bin/taskset"; ++ final String taskset2 = "/usr/bin/taskset"; ++ if (new File(taskset1).exists()) ++ taskset = taskset1; ++ else if (new File(taskset2).exists()) ++ taskset = taskset2; ++ else { ++ System.out.println("Skipping test: could not find taskset command"); ++ return; ++ } ++ ++ int available = Runtime.getRuntime().availableProcessors(); ++ ++ if (available == 1) { ++ System.out.println("Skipping test: only one processor available"); ++ return; ++ } ++ ++ // Get the java command we want to execute ++ // Enable logging for easier failure diagnosis ++ ProcessBuilder master = ++ ProcessTools.createJavaProcessBuilder(false, ++ "-XX:+UnlockDiagnosticVMOptions", ++ "-XX:+PrintActiveCpus", ++ "AvailableProcessors"); ++ ++ int[] expected = new int[] { 1, available/2, available-1, available }; ++ ++ for (int i : expected) { ++ System.out.println("Testing for " + i + " processors ..."); ++ int max = i - 1; ++ ArrayList cmdline = new ArrayList<>(master.command()); ++ // prepend taskset command ++ cmdline.add(0, "0-" + max); ++ cmdline.add(0, "-c"); ++ cmdline.add(0, taskset); ++ // append expected processor count ++ cmdline.add(String.valueOf(i)); ++ ProcessBuilder pb = new ProcessBuilder(cmdline); ++ System.out.println("Final command line: " + ++ ProcessTools.getCommandLine(pb)); ++ OutputAnalyzer output = ProcessTools.executeProcess(pb); ++ output.shouldContain(SUCCESS_STRING); ++ } ++ } ++ } ++ ++ static void checkProcessors(int expected) { ++ int available = Runtime.getRuntime().availableProcessors(); ++ if (available != expected) ++ throw new Error("Expected " + expected + " processors, but found " ++ + available); ++ else ++ System.out.println(SUCCESS_STRING + available); ++ } ++} diff --git a/SOURCES/8144566-pr3352.patch b/SOURCES/8144566-pr3352.patch new file mode 100644 index 0000000..9a2a294 --- /dev/null +++ b/SOURCES/8144566-pr3352.patch @@ -0,0 +1,911 @@ +# HG changeset patch +# User rpatil +# Date 1474623897 -19800 +# Fri Sep 23 15:14:57 2016 +0530 +# Node ID fb617df8fbac42e962219e45cbd29b15b5ecdc63 +# Parent d41592af9af3790fe5eee30ce686d85cff09c942 +8144566, PR3352: Custom HostnameVerifier disables SNI extension +Reviewed-by: coffeys + +diff --git a/src/share/classes/sun/security/ssl/SSLSocketImpl.java b/src/share/classes/sun/security/ssl/SSLSocketImpl.java +--- openjdk/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java ++++ openjdk/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1996, 2016, 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 +@@ -220,6 +220,11 @@ + Collections.emptyList(); + Collection sniMatchers = + Collections.emptyList(); ++ // Is the serverNames set to empty with SSLParameters.setServerNames()? ++ private boolean noSniExtension = false; ++ ++ // Is the sniMatchers set to empty with SSLParameters.setSNIMatchers()? ++ private boolean noSniMatcher = false; + + /* + * READ ME * READ ME * READ ME * READ ME * READ ME * READ ME * +@@ -666,6 +671,11 @@ + } + + super.connect(endpoint, timeout); ++ ++ if (host == null || host.length() == 0) { ++ useImplicitHost(false); ++ } ++ + doneConnect(); + } + +@@ -2158,41 +2168,61 @@ + output.r.setVersion(protocolVersion); + } + ++ // ++ // ONLY used by ClientHandshaker for the server hostname during handshaking ++ // + synchronized String getHost() { + // Note that the host may be null or empty for localhost. + if (host == null || host.length() == 0) { +- if (!trustNameService) { +- // If the local name service is not trustworthy, reverse host +- // name resolution should not be performed for endpoint +- // identification. Use the application original specified +- // hostname or IP address instead. +- host = getOriginalHostname(getInetAddress()); +- } else { +- host = getInetAddress().getHostName(); +- } ++ useImplicitHost(true); + } + + return host; + } + + /* +- * Get the original application specified hostname. ++ * Try to set and use the implicit specified hostname + */ +- private static String getOriginalHostname(InetAddress inetAddress) { +- /* +- * Get the original hostname via sun.misc.SharedSecrets. +- */ ++ private synchronized void useImplicitHost(boolean noSniUpdate) { ++ ++ // Note: If the local name service is not trustworthy, reverse ++ // host name resolution should not be performed for endpoint ++ // identification. Use the application original specified ++ // hostname or IP address instead. ++ ++ // Get the original hostname via jdk.internal.misc.SharedSecrets ++ InetAddress inetAddress = getInetAddress(); ++ if (inetAddress == null) { // not connected ++ return; ++ } ++ + JavaNetAccess jna = SharedSecrets.getJavaNetAccess(); + String originalHostname = jna.getOriginalHostName(inetAddress); ++ if ((originalHostname != null) && ++ (originalHostname.length() != 0)) { + +- /* +- * If no application specified hostname, use the IP address. +- */ +- if (originalHostname == null || originalHostname.length() == 0) { +- originalHostname = inetAddress.getHostAddress(); ++ host = originalHostname; ++ if (!noSniUpdate && serverNames.isEmpty() && !noSniExtension) { ++ serverNames = ++ Utilities.addToSNIServerNameList(serverNames, host); ++ ++ if (!roleIsServer && ++ (handshaker != null) && !handshaker.started()) { ++ handshaker.setSNIServerNames(serverNames); ++ } ++ } ++ ++ return; + } + +- return originalHostname; ++ // No explicitly specified hostname, no server name indication. ++ if (!trustNameService) { ++ // The local name service is not trustworthy, use IP address. ++ host = inetAddress.getHostAddress(); ++ } else { ++ // Use the underlying reverse host name resolution service. ++ host = getInetAddress().getHostName(); ++ } + } + + +@@ -2205,6 +2235,10 @@ + this.host = host; + this.serverNames = + Utilities.addToSNIServerNameList(this.serverNames, this.host); ++ ++ if (!roleIsServer && (handshaker != null) && !handshaker.started()) { ++ handshaker.setSNIServerNames(serverNames); ++ } + } + + /** +@@ -2571,8 +2605,21 @@ + // the super implementation does not handle the following parameters + params.setEndpointIdentificationAlgorithm(identificationProtocol); + params.setAlgorithmConstraints(algorithmConstraints); +- params.setSNIMatchers(sniMatchers); +- params.setServerNames(serverNames); ++ ++ if (sniMatchers.isEmpty() && !noSniMatcher) { ++ // 'null' indicates none has been set ++ params.setSNIMatchers(null); ++ } else { ++ params.setSNIMatchers(sniMatchers); ++ } ++ ++ if (serverNames.isEmpty() && !noSniExtension) { ++ // 'null' indicates none has been set ++ params.setServerNames(null); ++ } else { ++ params.setServerNames(serverNames); ++ } ++ + params.setUseCipherSuitesOrder(preferLocalCipherSuites); + + return params; +@@ -2592,11 +2639,13 @@ + + List sniNames = params.getServerNames(); + if (sniNames != null) { ++ noSniExtension = sniNames.isEmpty(); + serverNames = sniNames; + } + + Collection matchers = params.getSNIMatchers(); + if (matchers != null) { ++ noSniMatcher = matchers.isEmpty(); + sniMatchers = matchers; + } + +diff --git a/test/javax/net/ssl/ServerName/BestEffortOnLazyConnected.java b/test/javax/net/ssl/ServerName/BestEffortOnLazyConnected.java +new file mode 100644 +--- /dev/null ++++ openjdk/jdk/test/javax/net/ssl/ServerName/BestEffortOnLazyConnected.java +@@ -0,0 +1,337 @@ ++/* ++ * Copyright (c) 2016, 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. ++ */ ++ ++// ++// SunJSSE does not support dynamic system properties, no way to re-use ++// system properties in samevm/agentvm mode. ++// ++ ++/** ++ * @test ++ * @bug 8144566 ++ * @summary Custom HostnameVerifier disables SNI extension ++ * @run main/othervm BestEffortOnLazyConnected ++ */ ++ ++import java.io.*; ++import java.nio.*; ++import java.nio.channels.*; ++import java.util.*; ++import java.net.*; ++import javax.net.ssl.*; ++ ++public class BestEffortOnLazyConnected { ++ ++ /* ++ * ============================================================= ++ * Set the various variables needed for the tests, then ++ * specify what tests to run on each side. ++ */ ++ ++ /* ++ * Should we run the client or server in a separate thread? ++ * Both sides can throw exceptions, but do you have a preference ++ * as to which side should be the main thread. ++ */ ++ private static final boolean separateServerThread = true; ++ ++ /* ++ * Where do we find the keystores? ++ */ ++ private static final String pathToStores = "../../../../sun/security/ssl/etc"; ++ private static final String keyStoreFile = "keystore"; ++ private static final String trustStoreFile = "truststore"; ++ private static final String passwd = "passphrase"; ++ ++ /* ++ * Is the server ready to serve? ++ */ ++ private static volatile boolean serverReady = false; ++ ++ /* ++ * Turn on SSL debugging? ++ */ ++ private static final boolean debug = false; ++ ++ /* ++ * the fully qualified domain name of localhost ++ */ ++ private static String hostname = null; ++ ++ /* ++ * If the client or server is doing some kind of object creation ++ * that the other side depends on, and that thread prematurely ++ * exits, you may experience a hang. The test harness will ++ * terminate all hung threads after its timeout has expired, ++ * currently 3 minutes by default, but you might try to be ++ * smart about it.... ++ */ ++ ++ /* ++ * Define the server side of the test. ++ * ++ * If the server prematurely exits, serverReady will be set to true ++ * to avoid infinite hangs. ++ */ ++ private void doServerSide() throws Exception { ++ SSLServerSocketFactory sslssf = ++ (SSLServerSocketFactory) SSLServerSocketFactory.getDefault(); ++ try (SSLServerSocket sslServerSocket = ++ (SSLServerSocket) sslssf.createServerSocket(serverPort)) { ++ ++ serverPort = sslServerSocket.getLocalPort(); ++ ++ /* ++ * Signal Client, we're ready for his connect. ++ */ ++ serverReady = true; ++ ++ try (SSLSocket sslSocket = (SSLSocket)sslServerSocket.accept()) { ++ InputStream sslIS = sslSocket.getInputStream(); ++ OutputStream sslOS = sslSocket.getOutputStream(); ++ ++ sslIS.read(); ++ sslOS.write(85); ++ sslOS.flush(); ++ ++ ExtendedSSLSession session = ++ (ExtendedSSLSession)sslSocket.getSession(); ++ if (session.getRequestedServerNames().isEmpty()) { ++ throw new Exception("No expected Server Name Indication"); ++ } ++ } ++ } ++ } ++ ++ /* ++ * Define the client side of the test. ++ * ++ * If the server prematurely exits, serverReady will be set to true ++ * to avoid infinite hangs. ++ */ ++ private void doClientSide() throws Exception { ++ ++ /* ++ * Wait for server to get started. ++ */ ++ while (!serverReady) { ++ Thread.sleep(50); ++ } ++ ++ SSLSocketFactory sslsf = ++ (SSLSocketFactory) SSLSocketFactory.getDefault(); ++ ++ try (SSLSocket sslSocket = (SSLSocket)sslsf.createSocket()) { ++ ++ sslSocket.connect(new InetSocketAddress(hostname, serverPort), 0); ++ ++ InputStream sslIS = sslSocket.getInputStream(); ++ OutputStream sslOS = sslSocket.getOutputStream(); ++ ++ sslOS.write(280); ++ sslOS.flush(); ++ sslIS.read(); ++ } ++ } ++ ++ ++ /* ++ * ============================================================= ++ * The remainder is just support stuff ++ */ ++ ++ // use any free port by default ++ private volatile int serverPort = 0; ++ ++ private volatile Exception serverException = null; ++ private volatile Exception clientException = null; ++ ++ public static void main(String[] args) throws Exception { ++ String keyFilename = ++ System.getProperty("test.src", ".") + "/" + pathToStores + ++ "/" + keyStoreFile; ++ String trustFilename = ++ System.getProperty("test.src", ".") + "/" + pathToStores + ++ "/" + trustStoreFile; ++ ++ System.setProperty("javax.net.ssl.keyStore", keyFilename); ++ System.setProperty("javax.net.ssl.keyStorePassword", passwd); ++ System.setProperty("javax.net.ssl.trustStore", trustFilename); ++ System.setProperty("javax.net.ssl.trustStorePassword", passwd); ++ ++ if (debug) { ++ System.setProperty("javax.net.debug", "all"); ++ } ++ ++ try { ++ hostname = InetAddress.getLocalHost().getCanonicalHostName(); ++ } catch (UnknownHostException uhe) { ++ System.out.println( ++ "Ignore the test as the local hostname cannot be determined"); ++ ++ return; ++ } ++ ++ System.out.println( ++ "The fully qualified domain name of the local host is " + ++ hostname); ++ // Ignore the test if the hostname does not sound like a domain name. ++ if ((hostname == null) || hostname.isEmpty() || ++ hostname.startsWith("localhost") || ++ Character.isDigit(hostname.charAt(hostname.length() - 1))) { ++ ++ System.out.println("Ignore the test as the local hostname " + ++ "cannot be determined as fully qualified domain name"); ++ ++ return; ++ } ++ ++ /* ++ * Start the tests. ++ */ ++ new BestEffortOnLazyConnected(); ++ } ++ ++ private Thread clientThread = null; ++ private Thread serverThread = null; ++ ++ /* ++ * Primary constructor, used to drive remainder of the test. ++ * ++ * Fork off the other side, then do your work. ++ */ ++ BestEffortOnLazyConnected() throws Exception { ++ try { ++ if (separateServerThread) { ++ startServer(true); ++ startClient(false); ++ } else { ++ startClient(true); ++ startServer(false); ++ } ++ } catch (Exception e) { ++ // swallow for now. Show later ++ } ++ ++ /* ++ * Wait for other side to close down. ++ */ ++ if (separateServerThread) { ++ serverThread.join(); ++ } else { ++ clientThread.join(); ++ } ++ ++ /* ++ * When we get here, the test is pretty much over. ++ * Which side threw the error? ++ */ ++ Exception local; ++ Exception remote; ++ String whichRemote; ++ ++ if (separateServerThread) { ++ remote = serverException; ++ local = clientException; ++ whichRemote = "server"; ++ } else { ++ remote = clientException; ++ local = serverException; ++ whichRemote = "client"; ++ } ++ ++ /* ++ * If both failed, return the curthread's exception, but also ++ * print the remote side Exception ++ */ ++ if ((local != null) && (remote != null)) { ++ System.out.println(whichRemote + " also threw:"); ++ remote.printStackTrace(); ++ System.out.println(); ++ throw local; ++ } ++ ++ if (remote != null) { ++ throw remote; ++ } ++ ++ if (local != null) { ++ throw local; ++ } ++ } ++ ++ private void startServer(boolean newThread) throws Exception { ++ if (newThread) { ++ serverThread = new Thread() { ++ public void run() { ++ try { ++ doServerSide(); ++ } catch (Exception e) { ++ /* ++ * Our server thread just died. ++ * ++ * Release the client, if not active already... ++ */ ++ System.err.println("Server died..."); ++ serverReady = true; ++ serverException = e; ++ } ++ } ++ }; ++ serverThread.start(); ++ } else { ++ try { ++ doServerSide(); ++ } catch (Exception e) { ++ serverException = e; ++ } finally { ++ serverReady = true; ++ } ++ } ++ } ++ ++ private void startClient(boolean newThread) throws Exception { ++ if (newThread) { ++ clientThread = new Thread() { ++ public void run() { ++ try { ++ doClientSide(); ++ } catch (Exception e) { ++ /* ++ * Our client thread just died. ++ */ ++ System.err.println("Client died..."); ++ clientException = e; ++ } ++ } ++ }; ++ clientThread.start(); ++ } else { ++ try { ++ doClientSide(); ++ } catch (Exception e) { ++ clientException = e; ++ } ++ } ++ } ++} +diff --git a/test/sun/net/www/protocol/https/HttpsURLConnection/ImpactOnSNI.java b/test/sun/net/www/protocol/https/HttpsURLConnection/ImpactOnSNI.java +new file mode 100644 +--- /dev/null ++++ openjdk/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/ImpactOnSNI.java +@@ -0,0 +1,390 @@ ++/* ++ * Copyright (c) 2016, 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. ++ */ ++ ++// ++// SunJSSE does not support dynamic system properties, no way to re-use ++// system properties in samevm/agentvm mode. ++// ++ ++/* ++ * @test ++ * @bug 8144566 ++ * @summary Custom HostnameVerifier disables SNI extension ++ * @run main/othervm ImpactOnSNI ++ */ ++ ++import java.io.*; ++import java.net.*; ++import javax.net.ssl.*; ++ ++public class ImpactOnSNI { ++ ++ /* ++ * ============================================================= ++ * Set the various variables needed for the tests, then ++ * specify what tests to run on each side. ++ */ ++ ++ /* ++ * Should we run the client or server in a separate thread? ++ * Both sides can throw exceptions, but do you have a preference ++ * as to which side should be the main thread. ++ */ ++ private static final boolean separateServerThread = true; ++ ++ /* ++ * Where do we find the keystores? ++ */ ++ private static final String pathToStores = ++ "../../../../../../sun/security/ssl/etc"; ++ private static final String keyStoreFile = "keystore"; ++ private static final String trustStoreFile = "truststore"; ++ private static final String passwd = "passphrase"; ++ ++ /* ++ * Is the server ready to serve? ++ */ ++ private static volatile boolean serverReady = false; ++ ++ /* ++ * Is the connection ready to close? ++ */ ++ private static volatile boolean closeReady = false; ++ ++ /* ++ * Turn on SSL debugging? ++ */ ++ private static final boolean debug = false; ++ ++ /* ++ * Message posted ++ */ ++ private static final String postMsg = "HTTP post on a https server"; ++ ++ /* ++ * the fully qualified domain name of localhost ++ */ ++ private static String hostname = null; ++ ++ /* ++ * If the client or server is doing some kind of object creation ++ * that the other side depends on, and that thread prematurely ++ * exits, you may experience a hang. The test harness will ++ * terminate all hung threads after its timeout has expired, ++ * currently 3 minutes by default, but you might try to be ++ * smart about it.... ++ */ ++ ++ /* ++ * Define the server side of the test. ++ * ++ * If the server prematurely exits, serverReady will be set to true ++ * to avoid infinite hangs. ++ */ ++ private void doServerSide() throws Exception { ++ SSLServerSocketFactory sslssf = ++ (SSLServerSocketFactory)SSLServerSocketFactory.getDefault(); ++ try (SSLServerSocket sslServerSocket = ++ (SSLServerSocket)sslssf.createServerSocket(serverPort)) { ++ ++ serverPort = sslServerSocket.getLocalPort(); ++ ++ /* ++ * Signal Client, we're ready for his connect. ++ */ ++ serverReady = true; ++ ++ /* ++ * Accept connections ++ */ ++ try (SSLSocket sslSocket = (SSLSocket)sslServerSocket.accept()) { ++ InputStream sslIS = sslSocket.getInputStream(); ++ OutputStream sslOS = sslSocket.getOutputStream(); ++ BufferedReader br = ++ new BufferedReader(new InputStreamReader(sslIS)); ++ PrintStream ps = new PrintStream(sslOS); ++ ++ // process HTTP POST request from client ++ System.out.println("status line: " + br.readLine()); ++ String msg = null; ++ while ((msg = br.readLine()) != null && msg.length() > 0); ++ ++ msg = br.readLine(); ++ if (msg.equals(postMsg)) { ++ ps.println("HTTP/1.1 200 OK\n\n"); ++ } else { ++ ps.println("HTTP/1.1 500 Not OK\n\n"); ++ } ++ ps.flush(); ++ ++ ExtendedSSLSession session = ++ (ExtendedSSLSession)sslSocket.getSession(); ++ if (session.getRequestedServerNames().isEmpty()) { ++ throw new Exception("No expected Server Name Indication"); ++ } ++ ++ // close the socket ++ while (!closeReady) { ++ Thread.sleep(50); ++ } ++ } ++ } ++ } ++ ++ /* ++ * Define the client side of the test. ++ * ++ * If the server prematurely exits, serverReady will be set to true ++ * to avoid infinite hangs. ++ */ ++ private void doClientSide() throws Exception { ++ /* ++ * Wait for server to get started. ++ */ ++ while (!serverReady) { ++ Thread.sleep(50); ++ } ++ ++ // Send HTTP POST request to server ++ URL url = new URL("https://" + hostname + ":" + serverPort); ++ ++ HttpsURLConnection.setDefaultHostnameVerifier(new NameVerifier()); ++ HttpsURLConnection http = (HttpsURLConnection)url.openConnection(); ++ http.setDoOutput(true); ++ ++ http.setRequestMethod("POST"); ++ PrintStream ps = new PrintStream(http.getOutputStream()); ++ try { ++ ps.println(postMsg); ++ ps.flush(); ++ if (http.getResponseCode() != 200) { ++ throw new RuntimeException("test Failed"); ++ } ++ } finally { ++ ps.close(); ++ http.disconnect(); ++ closeReady = true; ++ } ++ } ++ ++ private static class NameVerifier implements HostnameVerifier { ++ public boolean verify(String hostname, SSLSession session) { ++ return true; ++ } ++ } ++ ++ /* ++ * ============================================================= ++ * The remainder is just support stuff ++ */ ++ ++ // use any free port by default ++ private volatile int serverPort = 0; ++ ++ private volatile Exception serverException = null; ++ private volatile Exception clientException = null; ++ ++ public static void main(String[] args) throws Exception { ++ String keyFilename = ++ System.getProperty("test.src", "./") + "/" + pathToStores + ++ "/" + keyStoreFile; ++ String trustFilename = ++ System.getProperty("test.src", "./") + "/" + pathToStores + ++ "/" + trustStoreFile; ++ ++ System.setProperty("javax.net.ssl.keyStore", keyFilename); ++ System.setProperty("javax.net.ssl.keyStorePassword", passwd); ++ System.setProperty("javax.net.ssl.trustStore", trustFilename); ++ System.setProperty("javax.net.ssl.trustStorePassword", passwd); ++ ++ if (debug) { ++ System.setProperty("javax.net.debug", "all"); ++ } ++ ++ try { ++ hostname = InetAddress.getLocalHost().getCanonicalHostName(); ++ } catch (UnknownHostException uhe) { ++ System.out.println( ++ "Ignore the test as the local hostname cannot be determined"); ++ ++ return; ++ } ++ ++ System.out.println( ++ "The fully qualified domain name of the local host is " + ++ hostname); ++ // Ignore the test if the hostname does not sound like a domain name. ++ if ((hostname == null) || hostname.isEmpty() || ++ hostname.startsWith("localhost") || ++ Character.isDigit(hostname.charAt(hostname.length() - 1))) { ++ ++ System.out.println("Ignore the test as the local hostname " + ++ "cannot be determined as fully qualified domain name"); ++ ++ return; ++ } ++ ++ /* ++ * Start the tests. ++ */ ++ new ImpactOnSNI(); ++ } ++ ++ private Thread clientThread = null; ++ private Thread serverThread = null; ++ ++ /* ++ * Primary constructor, used to drive remainder of the test. ++ * ++ * Fork off the other side, then do your work. ++ */ ++ ImpactOnSNI() throws Exception { ++ Exception startException = null; ++ try { ++ if (separateServerThread) { ++ startServer(true); ++ startClient(false); ++ } else { ++ startClient(true); ++ startServer(false); ++ } ++ } catch (Exception e) { ++ startException = e; ++ } ++ ++ /* ++ * Wait for other side to close down. ++ */ ++ if (separateServerThread) { ++ if (serverThread != null) { ++ serverThread.join(); ++ } ++ } else { ++ if (clientThread != null) { ++ clientThread.join(); ++ } ++ } ++ ++ /* ++ * When we get here, the test is pretty much over. ++ * Which side threw the error? ++ */ ++ Exception local; ++ Exception remote; ++ ++ if (separateServerThread) { ++ remote = serverException; ++ local = clientException; ++ } else { ++ remote = clientException; ++ local = serverException; ++ } ++ ++ Exception exception = null; ++ ++ /* ++ * Check various exception conditions. ++ */ ++ if ((local != null) && (remote != null)) { ++ // If both failed, return the curthread's exception. ++ local.initCause(remote); ++ exception = local; ++ } else if (local != null) { ++ exception = local; ++ } else if (remote != null) { ++ exception = remote; ++ } else if (startException != null) { ++ exception = startException; ++ } ++ ++ /* ++ * If there was an exception *AND* a startException, ++ * output it. ++ */ ++ if (exception != null) { ++ if (exception != startException && startException != null) { ++ exception.addSuppressed(startException); ++ } ++ throw exception; ++ } ++ ++ // Fall-through: no exception to throw! ++ } ++ ++ private void startServer(boolean newThread) throws Exception { ++ if (newThread) { ++ serverThread = new Thread() { ++ @Override ++ public void run() { ++ try { ++ doServerSide(); ++ } catch (Exception e) { ++ /* ++ * Our server thread just died. ++ * ++ * Release the client, if not active already... ++ */ ++ System.err.println("Server died..."); ++ serverReady = true; ++ serverException = e; ++ } ++ } ++ }; ++ serverThread.start(); ++ } else { ++ try { ++ doServerSide(); ++ } catch (Exception e) { ++ serverException = e; ++ } finally { ++ serverReady = true; ++ } ++ } ++ } ++ ++ private void startClient(boolean newThread) throws Exception { ++ if (newThread) { ++ clientThread = new Thread() { ++ @Override ++ public void run() { ++ try { ++ doClientSide(); ++ } catch (Exception e) { ++ /* ++ * Our client thread just died. ++ */ ++ System.err.println("Client died..."); ++ clientException = e; ++ } ++ } ++ }; ++ clientThread.start(); ++ } else { ++ try { ++ doClientSide(); ++ } catch (Exception e) { ++ clientException = e; ++ } ++ } ++ } ++} diff --git a/SOURCES/8153711-pr3313-rh1284948.patch b/SOURCES/8153711-pr3313-rh1284948.patch new file mode 100644 index 0000000..b93fa06 --- /dev/null +++ b/SOURCES/8153711-pr3313-rh1284948.patch @@ -0,0 +1,669 @@ +# HG changeset patch +# User sgehwolf +# Date 1458555849 -3600 +# Mon Mar 21 11:24:09 2016 +0100 +# Node ID 9f6a0864a734ae3fd0eb198768db7cdee53ba0ed +# Parent 1179be40f1e3b59a890e96a5a9d3ff6fc18a2846 +8153711, PR3313: [REDO] JDWP: Memory Leak: GlobalRefs never deleted when processing invokeMethod command +Summary: Delete global references in invoker_completeInvokeRequest() +Reviewed-by: sspitsyn, dsamersoff + +diff --git a/src/share/back/invoker.c b/src/share/back/invoker.c +--- openjdk/jdk/src/share/back/invoker.c ++++ openjdk/jdk/src/share/back/invoker.c +@@ -211,6 +211,62 @@ + return error; + } + ++/* ++ * Delete saved global references - if any - for: ++ * - a potentially thrown Exception ++ * - a returned refernce/array value ++ * See invoker_doInvoke() and invoke* methods where global references ++ * are being saved. ++ */ ++static void ++deletePotentiallySavedGlobalRefs(JNIEnv *env, InvokeRequest *request) ++{ ++ /* Delete potentially saved return value */ ++ if ((request->invokeType == INVOKE_CONSTRUCTOR) || ++ (returnTypeTag(request->methodSignature) == JDWP_TAG(OBJECT)) || ++ (returnTypeTag(request->methodSignature) == JDWP_TAG(ARRAY))) { ++ if (request->returnValue.l != NULL) { ++ tossGlobalRef(env, &(request->returnValue.l)); ++ } ++ } ++ /* Delete potentially saved exception */ ++ if (request->exception != NULL) { ++ tossGlobalRef(env, &(request->exception)); ++ } ++} ++ ++/* ++ * Delete global argument references from the request which got put there before a ++ * invoke request was carried out. See fillInvokeRequest(). ++ */ ++static void ++deleteGlobalArgumentRefs(JNIEnv *env, InvokeRequest *request) ++{ ++ void *cursor; ++ jint argIndex = 0; ++ jvalue *argument = request->arguments; ++ jbyte argumentTag = firstArgumentTypeTag(request->methodSignature, &cursor); ++ ++ if (request->clazz != NULL) { ++ tossGlobalRef(env, &(request->clazz)); ++ } ++ if (request->instance != NULL) { ++ tossGlobalRef(env, &(request->instance)); ++ } ++ /* Delete global argument references */ ++ while (argIndex < request->argumentCount) { ++ if ((argumentTag == JDWP_TAG(OBJECT)) || ++ (argumentTag == JDWP_TAG(ARRAY))) { ++ if (argument->l != NULL) { ++ tossGlobalRef(env, &(argument->l)); ++ } ++ } ++ argument++; ++ argIndex++; ++ argumentTag = nextArgumentTypeTag(&cursor); ++ } ++} ++ + static jvmtiError + fillInvokeRequest(JNIEnv *env, InvokeRequest *request, + jbyte invokeType, jbyte options, jint id, +@@ -320,6 +376,8 @@ + invokeConstructor(JNIEnv *env, InvokeRequest *request) + { + jobject object; ++ ++ JDI_ASSERT_MSG(request->clazz, "Request clazz null"); + object = JNI_FUNC_PTR(env,NewObjectA)(env, request->clazz, + request->method, + request->arguments); +@@ -336,6 +394,7 @@ + case JDWP_TAG(OBJECT): + case JDWP_TAG(ARRAY): { + jobject object; ++ JDI_ASSERT_MSG(request->clazz, "Request clazz null"); + object = JNI_FUNC_PTR(env,CallStaticObjectMethodA)(env, + request->clazz, + request->method, +@@ -424,6 +483,7 @@ + case JDWP_TAG(OBJECT): + case JDWP_TAG(ARRAY): { + jobject object; ++ JDI_ASSERT_MSG(request->instance, "Request instance null"); + object = JNI_FUNC_PTR(env,CallObjectMethodA)(env, + request->instance, + request->method, +@@ -511,6 +571,8 @@ + case JDWP_TAG(OBJECT): + case JDWP_TAG(ARRAY): { + jobject object; ++ JDI_ASSERT_MSG(request->clazz, "Request clazz null"); ++ JDI_ASSERT_MSG(request->instance, "Request instance null"); + object = JNI_FUNC_PTR(env,CallNonvirtualObjectMethodA)(env, + request->instance, + request->clazz, +@@ -607,6 +669,8 @@ + JNIEnv *env; + jboolean startNow; + InvokeRequest *request; ++ jbyte options; ++ jbyte invokeType; + + JDI_ASSERT(thread); + +@@ -623,6 +687,9 @@ + if (startNow) { + request->started = JNI_TRUE; + } ++ options = request->options; ++ invokeType = request->invokeType; ++ + debugMonitorExit(invokerLock); + + if (!startNow) { +@@ -637,7 +704,7 @@ + + JNI_FUNC_PTR(env,ExceptionClear)(env); + +- switch (request->invokeType) { ++ switch (invokeType) { + case INVOKE_CONSTRUCTOR: + invokeConstructor(env, request); + break; +@@ -645,7 +712,7 @@ + invokeStatic(env, request); + break; + case INVOKE_INSTANCE: +- if (request->options & JDWP_INVOKE_OPTIONS(NONVIRTUAL) ) { ++ if (options & JDWP_INVOKE_OPTIONS(NONVIRTUAL) ) { + invokeNonvirtual(env, request); + } else { + invokeVirtual(env, request); +@@ -723,12 +790,23 @@ + } + + /* ++ * At this time, there's no need to retain global references on ++ * arguments since the reply is processed. No one will deal with ++ * this request ID anymore, so we must call deleteGlobalArgumentRefs(). ++ * ++ * We cannot delete saved exception or return value references ++ * since otherwise a deleted handle would escape when writing ++ * the response to the stream. Instead, we clean those refs up ++ * after writing the respone. ++ */ ++ deleteGlobalArgumentRefs(env, request); ++ ++ /* + * Give up the lock before I/O operation + */ + debugMonitorExit(invokerLock); + eventHandler_unlock(); + +- + if (!detached) { + outStream_initReply(&out, id); + (void)outStream_writeValue(env, &out, tag, returnValue); +@@ -736,6 +814,16 @@ + (void)outStream_writeObjectRef(env, &out, exc); + outStream_sendReply(&out); + } ++ ++ /* ++ * Delete potentially saved global references of return value ++ * and exception ++ */ ++ eventHandler_lock(); // for proper lock order ++ debugMonitorEnter(invokerLock); ++ deletePotentiallySavedGlobalRefs(env, request); ++ debugMonitorExit(invokerLock); ++ eventHandler_unlock(); + } + + jboolean +diff --git a/test/com/sun/jdi/oom/@debuggeeVMOptions b/test/com/sun/jdi/oom/@debuggeeVMOptions +new file mode 100644 +--- /dev/null ++++ openjdk/jdk/test/com/sun/jdi/oom/@debuggeeVMOptions +@@ -0,0 +1,1 @@ ++-Xmx40m +\ No newline at end of file +diff --git a/test/com/sun/jdi/oom/OomDebugTest.java b/test/com/sun/jdi/oom/OomDebugTest.java +new file mode 100644 +--- /dev/null ++++ openjdk/jdk/test/com/sun/jdi/oom/OomDebugTest.java +@@ -0,0 +1,417 @@ ++/* ++ * Copyright (c) 2016 Red Hat Inc. ++ * ++ * 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 8153711 ++ * @summary JDWP: Memory Leak (global references not deleted after invokeMethod). ++ * ++ * @author Severin Gehwolf ++ * ++ * @library .. ++ * @run build TestScaffold VMConnection TargetListener TargetAdapter ++ * @run compile -g OomDebugTest.java ++ * @run shell OomDebugTestSetup.sh ++ * @run main OomDebugTest OomDebugTestTarget test1 ++ * @run main OomDebugTest OomDebugTestTarget test2 ++ * @run main OomDebugTest OomDebugTestTarget test3 ++ * @run main OomDebugTest OomDebugTestTarget test4 ++ * @run main OomDebugTest OomDebugTestTarget test5 ++ */ ++import java.io.File; ++import java.io.FileInputStream; ++import java.io.FileNotFoundException; ++import java.io.FileOutputStream; ++import java.io.IOException; ++import java.util.ArrayList; ++import java.util.Arrays; ++import java.util.Collections; ++import java.util.HashSet; ++import java.util.List; ++import java.util.Properties; ++import java.util.Set; ++ ++import com.sun.jdi.ArrayReference; ++import com.sun.jdi.ArrayType; ++import com.sun.jdi.ClassType; ++import com.sun.jdi.Field; ++import com.sun.jdi.InvocationException; ++import com.sun.jdi.Method; ++import com.sun.jdi.ObjectReference; ++import com.sun.jdi.ReferenceType; ++import com.sun.jdi.StackFrame; ++import com.sun.jdi.VMOutOfMemoryException; ++import com.sun.jdi.Value; ++import com.sun.jdi.event.BreakpointEvent; ++import com.sun.jdi.event.ExceptionEvent; ++ ++/***************** Target program **********************/ ++ ++class OomDebugTestTarget { ++ ++ OomDebugTestTarget() { ++ System.out.println("DEBUG: invoked constructor"); ++ } ++ static class FooCls { ++ @SuppressWarnings("unused") ++ private byte[] bytes = new byte[3000000]; ++ }; ++ ++ FooCls fooCls = new FooCls(); ++ byte[] byteArray = new byte[0]; ++ ++ void testMethod(FooCls foo) { ++ System.out.println("DEBUG: invoked 'void testMethod(FooCls)', foo == " + foo); ++ } ++ ++ void testPrimitive(byte[] foo) { ++ System.out.println("DEBUG: invoked 'void testPrimitive(byte[])', foo == " + foo); ++ } ++ ++ byte[] testPrimitiveArrRetval() { ++ System.out.println("DEBUG: invoked 'byte[] testPrimitiveArrRetval()'"); ++ return new byte[3000000]; ++ } ++ ++ FooCls testFooClsRetval() { ++ System.out.println("DEBUG: invoked 'FooCls testFooClsRetval()'"); ++ return new FooCls(); ++ } ++ ++ public void entry() {} ++ ++ public static void main(String[] args){ ++ System.out.println("DEBUG: OomDebugTestTarget.main"); ++ new OomDebugTestTarget().entry(); ++ } ++} ++ ++/***************** Test program ************************/ ++ ++public class OomDebugTest extends TestScaffold { ++ ++ private static final String[] ALL_TESTS = new String[] { ++ "test1", "test2", "test3", "test4", "test5" ++ }; ++ private static final Set ALL_TESTS_SET = new HashSet(); ++ static { ++ ALL_TESTS_SET.addAll(Arrays.asList(ALL_TESTS)); ++ } ++ private static final String TEST_CLASSES = System.getProperty("test.classes", "."); ++ private static final File RESULT_FILE = new File(TEST_CLASSES, "results.properties"); ++ private static final String LAST_TEST = ALL_TESTS[ALL_TESTS.length - 1]; ++ private ReferenceType targetClass; ++ private ObjectReference thisObject; ++ private int failedTests; ++ private final String testMethod; ++ ++ public OomDebugTest(String[] args) { ++ super(args); ++ if (args.length != 2) { ++ throw new RuntimeException("Wrong number of command-line arguments specified."); ++ } ++ this.testMethod = args[1]; ++ } ++ ++ @Override ++ protected void runTests() throws Exception { ++ try { ++ addListener(new TargetAdapter() { ++ ++ @Override ++ public void exceptionThrown(ExceptionEvent event) { ++ String name = event.exception().referenceType().name(); ++ System.err.println("DEBUG: Exception thrown in debuggee was: " + name); ++ } ++ }); ++ /* ++ * Get to the top of entry() ++ * to determine targetClass and mainThread ++ */ ++ BreakpointEvent bpe = startTo("OomDebugTestTarget", "entry", "()V"); ++ targetClass = bpe.location().declaringType(); ++ ++ mainThread = bpe.thread(); ++ ++ StackFrame frame = mainThread.frame(0); ++ thisObject = frame.thisObject(); ++ java.lang.reflect.Method m = findTestMethod(); ++ m.invoke(this); ++ } catch (NoSuchMethodException e) { ++ e.printStackTrace(); ++ failure(); ++ } catch (SecurityException e) { ++ e.printStackTrace(); ++ failure(); ++ } ++ /* ++ * resume the target, listening for events ++ */ ++ listenUntilVMDisconnect(); ++ } ++ ++ private java.lang.reflect.Method findTestMethod() ++ throws NoSuchMethodException, SecurityException { ++ return OomDebugTest.class.getDeclaredMethod(testMethod); ++ } ++ ++ private void failure() { ++ failedTests++; ++ } ++ ++ /* ++ * Test case: Object reference as method parameter. ++ */ ++ @SuppressWarnings("unused") // called via reflection ++ private void test1() throws Exception { ++ System.out.println("DEBUG: ------------> Running test1"); ++ try { ++ Field field = targetClass.fieldByName("fooCls"); ++ ClassType clsType = (ClassType)field.type(); ++ Method constructor = getConstructorForClass(clsType); ++ for (int i = 0; i < 15; i++) { ++ @SuppressWarnings({ "rawtypes", "unchecked" }) ++ ObjectReference objRef = clsType.newInstance(mainThread, ++ constructor, ++ new ArrayList(0), ++ ObjectReference.INVOKE_NONVIRTUAL); ++ if (objRef.isCollected()) { ++ System.out.println("DEBUG: Object got GC'ed before we can use it. NO-OP."); ++ continue; ++ } ++ invoke("testMethod", "(LOomDebugTestTarget$FooCls;)V", objRef); ++ } ++ } catch (InvocationException e) { ++ handleFailure(e); ++ } ++ } ++ ++ /* ++ * Test case: Array reference as method parameter. ++ */ ++ @SuppressWarnings("unused") // called via reflection ++ private void test2() throws Exception { ++ System.out.println("DEBUG: ------------> Running test2"); ++ try { ++ Field field = targetClass.fieldByName("byteArray"); ++ ArrayType arrType = (ArrayType)field.type(); ++ ++ for (int i = 0; i < 15; i++) { ++ ArrayReference byteArrayVal = arrType.newInstance(3000000); ++ if (byteArrayVal.isCollected()) { ++ System.out.println("DEBUG: Object got GC'ed before we can use it. NO-OP."); ++ continue; ++ } ++ invoke("testPrimitive", "([B)V", byteArrayVal); ++ } ++ } catch (VMOutOfMemoryException e) { ++ defaultHandleOOMFailure(e); ++ } ++ } ++ ++ /* ++ * Test case: Array reference as return value. ++ */ ++ @SuppressWarnings("unused") // called via reflection ++ private void test3() throws Exception { ++ System.out.println("DEBUG: ------------> Running test3"); ++ try { ++ for (int i = 0; i < 15; i++) { ++ invoke("testPrimitiveArrRetval", ++ "()[B", ++ Collections.EMPTY_LIST, ++ vm().mirrorOfVoid()); ++ } ++ } catch (InvocationException e) { ++ handleFailure(e); ++ } ++ } ++ ++ /* ++ * Test case: Object reference as return value. ++ */ ++ @SuppressWarnings("unused") // called via reflection ++ private void test4() throws Exception { ++ System.out.println("DEBUG: ------------> Running test4"); ++ try { ++ for (int i = 0; i < 15; i++) { ++ invoke("testFooClsRetval", ++ "()LOomDebugTestTarget$FooCls;", ++ Collections.EMPTY_LIST, ++ vm().mirrorOfVoid()); ++ } ++ } catch (InvocationException e) { ++ handleFailure(e); ++ } ++ } ++ ++ /* ++ * Test case: Constructor ++ */ ++ @SuppressWarnings({ "unused", "unchecked", "rawtypes" }) // called via reflection ++ private void test5() throws Exception { ++ System.out.println("DEBUG: ------------> Running test5"); ++ try { ++ ClassType type = (ClassType)thisObject.type(); ++ for (int i = 0; i < 15; i++) { ++ type.newInstance(mainThread, ++ findMethod(targetClass, "", "()V"), ++ new ArrayList(0), ++ ObjectReference.INVOKE_NONVIRTUAL); ++ } ++ } catch (InvocationException e) { ++ handleFailure(e); ++ } ++ } ++ ++ private Method getConstructorForClass(ClassType clsType) { ++ List methods = clsType.methodsByName(""); ++ if (methods.size() != 1) { ++ throw new RuntimeException("FAIL. Expected only one, the default, constructor"); ++ } ++ return methods.get(0); ++ } ++ ++ private void handleFailure(InvocationException e) { ++ // There is no good way to see the OOME diagnostic message in the target since the ++ // TestScaffold might throw an exception while trying to print the stack trace. I.e ++ // it might get a a VMDisconnectedException before the stack trace printing finishes. ++ System.err.println("FAILURE: InvocationException thrown. Trying to determine cause..."); ++ defaultHandleOOMFailure(e); ++ } ++ ++ private void defaultHandleOOMFailure(Exception e) { ++ e.printStackTrace(); ++ failure(); ++ } ++ ++ @SuppressWarnings({ "rawtypes", "unchecked" }) ++ void invoke(String methodName, String methodSig, Value value) ++ throws Exception { ++ List args = new ArrayList(1); ++ args.add(value); ++ invoke(methodName, methodSig, args, value); ++ } ++ ++ void invoke(String methodName, ++ String methodSig, ++ @SuppressWarnings("rawtypes") List args, ++ Value value) throws Exception { ++ Method method = findMethod(targetClass, methodName, methodSig); ++ if ( method == null) { ++ failure("FAILED: Can't find method: " ++ + methodName + " for class = " + targetClass); ++ return; ++ } ++ invoke(method, args, value); ++ } ++ ++ @SuppressWarnings({ "rawtypes", "unchecked" }) ++ void invoke(Method method, List args, Value value) throws Exception { ++ thisObject.invokeMethod(mainThread, method, args, 0); ++ System.out.println("DEBUG: Done invoking method via debugger."); ++ } ++ ++ Value fieldValue(String fieldName) { ++ Field field = targetClass.fieldByName(fieldName); ++ return thisObject.getValue(field); ++ } ++ ++ // Determine the pass/fail status on some heuristic and don't fail the ++ // test if < 3 of the total number of tests (currently 5) fail. This also ++ // has the nice side effect that all tests are first attempted and only ++ // all tests ran an overall pass/fail status is determined. ++ private static void determineOverallTestStatus(OomDebugTest oomTest) ++ throws IOException, FileNotFoundException { ++ Properties resultProps = new Properties(); ++ if (!RESULT_FILE.exists()) { ++ RESULT_FILE.createNewFile(); ++ } ++ FileInputStream fin = null; ++ try { ++ fin = new FileInputStream(RESULT_FILE); ++ resultProps.load(fin); ++ resultProps.put(oomTest.testMethod, ++ Integer.toString(oomTest.failedTests)); ++ } finally { ++ if (fin != null) { ++ fin.close(); ++ } ++ } ++ System.out.println("DEBUG: Finished running test '" ++ + oomTest.testMethod + "'."); ++ if (LAST_TEST.equals(oomTest.testMethod)) { ++ System.out.println("DEBUG: Determining overall test status."); ++ Set actualTestsRun = new HashSet(); ++ int totalTests = ALL_TESTS.length; ++ int failedTests = 0; ++ for (Object key: resultProps.keySet()) { ++ actualTestsRun.add((String)key); ++ Object propVal = resultProps.get(key); ++ int value = Integer.parseInt((String)propVal); ++ failedTests += value; ++ } ++ if (!ALL_TESTS_SET.equals(actualTestsRun)) { ++ String errorMsg = "Test failed! Expected to run tests '" ++ + ALL_TESTS_SET + "', but only these were run '" ++ + actualTestsRun + "'"; ++ throw new RuntimeException(errorMsg); ++ } ++ if (failedTests >= 3) { ++ String errorMsg = "Test failed. Expected < 3 sub-tests to fail " ++ + "for a pass. Got " + failedTests ++ + " failed tests out of " + totalTests + "."; ++ throw new RuntimeException(errorMsg); ++ } ++ RESULT_FILE.delete(); ++ System.out.println("All " + totalTests + " tests passed."); ++ } else { ++ System.out.println("DEBUG: More tests to run. Continuing."); ++ FileOutputStream fout = null; ++ try { ++ fout = new FileOutputStream(RESULT_FILE); ++ resultProps.store(fout, "Storing results after test " ++ + oomTest.testMethod); ++ } finally { ++ if (fout != null) { ++ fout.close(); ++ } ++ } ++ } ++ } ++ ++ public static void main(String[] args) throws Exception { ++ System.setProperty("test.vm.opts", "-Xmx40m"); // Set debuggee VM option ++ OomDebugTest oomTest = new OomDebugTest(args); ++ try { ++ oomTest.startTests(); ++ } catch (Throwable e) { ++ System.out.println("DEBUG: Got exception for test run. " + e); ++ e.printStackTrace(); ++ oomTest.failure(); ++ } ++ determineOverallTestStatus(oomTest); ++ } ++ ++} +diff --git a/test/com/sun/jdi/oom/OomDebugTestSetup.sh b/test/com/sun/jdi/oom/OomDebugTestSetup.sh +new file mode 100644 +--- /dev/null ++++ openjdk/jdk/test/com/sun/jdi/oom/OomDebugTestSetup.sh +@@ -0,0 +1,46 @@ ++#!/bin/sh ++# ++# Copyright (c) 2016 Red Hat Inc. ++# 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. ++# ++ ++ ++if [ "${TESTSRC}" = "" ] ++then ++ echo "TESTSRC not set. Test cannot execute. Failed." ++ exit 1 ++fi ++echo "TESTSRC=${TESTSRC}" ++ ++if [ "${TESTJAVA}" = "" ] ++then ++ echo "TESTJAVA not set. Test cannot execute. Failed." ++ exit 1 ++fi ++echo "TESTJAVA=${TESTJAVA}" ++ ++if [ "${TESTCLASSES}" = "" ] ++then ++ echo "TESTCLASSES not set. Test cannot execute. Failed." ++ exit 1 ++fi ++ ++cp ${TESTSRC}/@debuggeeVMOptions ${TESTCLASSES}/ diff --git a/SOURCES/8155049-pr3352.patch b/SOURCES/8155049-pr3352.patch new file mode 100644 index 0000000..68cf02f --- /dev/null +++ b/SOURCES/8155049-pr3352.patch @@ -0,0 +1,41 @@ +# HG changeset patch +# User rhalade +# Date 1463420211 25200 +# Mon May 16 10:36:51 2016 -0700 +# Node ID c0e856f2dacdf5eb5cdea380da32ba210aee9579 +# Parent fb617df8fbac42e962219e45cbd29b15b5ecdc63 +8155049, PR3352: New tests from 8144566 fail with "No expected Server Name Indication" +Reviewed-by: xuelei + +diff --git a/test/javax/net/ssl/ServerName/BestEffortOnLazyConnected.java b/test/javax/net/ssl/ServerName/BestEffortOnLazyConnected.java +--- openjdk/jdk/test/javax/net/ssl/ServerName/BestEffortOnLazyConnected.java ++++ openjdk/jdk/test/javax/net/ssl/ServerName/BestEffortOnLazyConnected.java +@@ -34,9 +34,6 @@ + */ + + import java.io.*; +-import java.nio.*; +-import java.nio.channels.*; +-import java.util.*; + import java.net.*; + import javax.net.ssl.*; + +@@ -197,6 +194,7 @@ + hostname); + // Ignore the test if the hostname does not sound like a domain name. + if ((hostname == null) || hostname.isEmpty() || ++ !hostname.contains(".") || hostname.endsWith(".") || + hostname.startsWith("localhost") || + Character.isDigit(hostname.charAt(hostname.length() - 1))) { + +diff --git a/test/sun/net/www/protocol/https/HttpsURLConnection/ImpactOnSNI.java b/test/sun/net/www/protocol/https/HttpsURLConnection/ImpactOnSNI.java +--- openjdk/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/ImpactOnSNI.java ++++ openjdk/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/ImpactOnSNI.java +@@ -235,6 +235,7 @@ + hostname); + // Ignore the test if the hostname does not sound like a domain name. + if ((hostname == null) || hostname.isEmpty() || ++ !hostname.contains(".") || hostname.endsWith(".") || + hostname.startsWith("localhost") || + Character.isDigit(hostname.charAt(hostname.length() - 1))) { + diff --git a/SOURCES/8165231-rh1437545.patch b/SOURCES/8165231-rh1437545.patch new file mode 100644 index 0000000..e0d5be7 --- /dev/null +++ b/SOURCES/8165231-rh1437545.patch @@ -0,0 +1,48 @@ +# HG changeset patch +# User horii +# Date 1473905514 14400 +# Wed Sep 14 22:11:54 2016 -0400 +# Node ID 8d16f74380a78eb76cb33183a64440316393903e +# Parent be698ac288484ab140715ee29ed9335e6ea8a33b +8165231: java.nio.Bits.unaligned() doesn't return true on ppc +Reviewed-by: simonis, coffeys + +diff --git a/src/share/classes/java/nio/Bits.java b/src/share/classes/java/nio/Bits.java +--- openjdk/jdk/src/share/classes/java/nio/Bits.java ++++ openjdk/jdk/src/share/classes/java/nio/Bits.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2000, 2016, 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 +@@ -614,7 +614,8 @@ + String arch = AccessController.doPrivileged( + new sun.security.action.GetPropertyAction("os.arch")); + unaligned = arch.equals("i386") || arch.equals("x86") +- || arch.equals("amd64") || arch.equals("x86_64"); ++ || arch.equals("amd64") || arch.equals("x86_64") ++ || arch.equals("ppc64") || arch.equals("ppc64le"); + unalignedKnown = true; + return unaligned; + } +diff --git a/src/share/classes/sun/security/provider/ByteArrayAccess.java b/src/share/classes/sun/security/provider/ByteArrayAccess.java +--- openjdk/jdk/src/share/classes/sun/security/provider/ByteArrayAccess.java ++++ openjdk/jdk/src/share/classes/sun/security/provider/ByteArrayAccess.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2006, 2016, 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 +@@ -94,7 +94,7 @@ + String arch = java.security.AccessController.doPrivileged + (new sun.security.action.GetPropertyAction("os.arch", "")); + return arch.equals("i386") || arch.equals("x86") || arch.equals("amd64") +- || arch.equals("x86_64"); ++ || arch.equals("x86_64") || arch.equals("ppc64") || arch.equals("ppc64le"); + } + + /** diff --git a/SOURCES/8173941-pr3326.patch b/SOURCES/8173941-pr3326.patch new file mode 100644 index 0000000..50e74f6 --- /dev/null +++ b/SOURCES/8173941-pr3326.patch @@ -0,0 +1,77 @@ +# HG changeset patch +# User ysuenaga +# Date 1487123491 18000 +# Tue Feb 14 20:51:31 2017 -0500 +# Node ID 15922b2f31db4857ec84efdf533c41b19e68030b +# Parent 652fe741b8f2bfdacba66d772cc89fe7ec6dea66 +8173941, PR3326: SA does not work if executable is DSO +Reviewed-by: aph, dsamersoff + +diff --git a/agent/src/os/linux/elfmacros.h b/agent/src/os/linux/elfmacros.h +--- openjdk/hotspot/agent/src/os/linux/elfmacros.h ++++ openjdk/hotspot/agent/src/os/linux/elfmacros.h +@@ -33,6 +33,7 @@ + #define ELF_NHDR Elf64_Nhdr + #define ELF_DYN Elf64_Dyn + #define ELF_ADDR Elf64_Addr ++#define ELF_AUXV Elf64_auxv_t + + #define ELF_ST_TYPE ELF64_ST_TYPE + +@@ -45,6 +46,7 @@ + #define ELF_NHDR Elf32_Nhdr + #define ELF_DYN Elf32_Dyn + #define ELF_ADDR Elf32_Addr ++#define ELF_AUXV Elf32_auxv_t + + #define ELF_ST_TYPE ELF32_ST_TYPE + +diff --git a/agent/src/os/linux/ps_core.c b/agent/src/os/linux/ps_core.c +--- openjdk/hotspot/agent/src/os/linux/ps_core.c ++++ openjdk/hotspot/agent/src/os/linux/ps_core.c +@@ -642,6 +642,18 @@ + if (core_handle_prstatus(ph, descdata, notep->n_descsz) != true) { + return false; + } ++ } else if (notep->n_type == NT_AUXV) { ++ // Get first segment from entry point ++ ELF_AUXV *auxv = (ELF_AUXV *)descdata; ++ while (auxv->a_type != AT_NULL) { ++ if (auxv->a_type == AT_ENTRY) { ++ // Set entry point address to address of dynamic section. ++ // We will adjust it in read_exec_segments(). ++ ph->core->dynamic_addr = auxv->a_un.a_val; ++ break; ++ } ++ auxv++; ++ } + } + p = descdata + ROUNDUP(notep->n_descsz, 4); + } +@@ -826,7 +838,13 @@ + + // from PT_DYNAMIC we want to read address of first link_map addr + case PT_DYNAMIC: { +- ph->core->dynamic_addr = exec_php->p_vaddr; ++ if (exec_ehdr->e_type == ET_EXEC) { ++ ph->core->dynamic_addr = exec_php->p_vaddr; ++ } else { // ET_DYN ++ // dynamic_addr has entry point of executable. ++ // Thus we should substract it. ++ ph->core->dynamic_addr += exec_php->p_vaddr - exec_ehdr->e_entry; ++ } + print_debug("address of _DYNAMIC is 0x%lx\n", ph->core->dynamic_addr); + break; + } +@@ -1024,8 +1042,9 @@ + goto err; + } + +- if (read_elf_header(ph->core->exec_fd, &exec_ehdr) != true || exec_ehdr.e_type != ET_EXEC) { +- print_debug("executable file is not a valid ELF ET_EXEC file\n"); ++ if (read_elf_header(ph->core->exec_fd, &exec_ehdr) != true || ++ ((exec_ehdr.e_type != ET_EXEC) && (exec_ehdr.e_type != ET_DYN))) { ++ print_debug("executable file is not a valid ELF file\n"); + goto err; + } + diff --git a/SOURCES/8174164-pr3334-rh1417266.patch b/SOURCES/8174164-pr3334-rh1417266.patch new file mode 100644 index 0000000..494883f --- /dev/null +++ b/SOURCES/8174164-pr3334-rh1417266.patch @@ -0,0 +1,79 @@ +# HG changeset patch +# User roland +# Date 1487208397 28800 +# Wed Feb 15 17:26:37 2017 -0800 +# Node ID a9cbaff50d3d7e3a1d2dbdc0121c470142b87270 +# Parent 15922b2f31db4857ec84efdf533c41b19e68030b +8174164, PR3334, RH1417266: SafePointNode::_replaced_nodes breaks with irreducible loops +Reviewed-by: kvn + +diff --git a/src/share/vm/opto/callnode.hpp b/src/share/vm/opto/callnode.hpp +--- openjdk/hotspot/src/share/vm/opto/callnode.hpp ++++ openjdk/hotspot/src/share/vm/opto/callnode.hpp +@@ -449,8 +449,8 @@ + void delete_replaced_nodes() { + _replaced_nodes.reset(); + } +- void apply_replaced_nodes() { +- _replaced_nodes.apply(this); ++ void apply_replaced_nodes(uint idx) { ++ _replaced_nodes.apply(this, idx); + } + void merge_replaced_nodes_with(SafePointNode* sfpt) { + _replaced_nodes.merge_with(sfpt->_replaced_nodes); +diff --git a/src/share/vm/opto/parse1.cpp b/src/share/vm/opto/parse1.cpp +--- openjdk/hotspot/src/share/vm/opto/parse1.cpp ++++ openjdk/hotspot/src/share/vm/opto/parse1.cpp +@@ -1048,7 +1048,7 @@ + kit.make_dtrace_method_exit(method()); + } + if (_replaced_nodes_for_exceptions) { +- kit.map()->apply_replaced_nodes(); ++ kit.map()->apply_replaced_nodes(_new_idx); + } + // Done with exception-path processing. + ex_map = kit.make_exception_state(ex_oop); +@@ -1069,7 +1069,7 @@ + _exits.add_exception_state(ex_map); + } + } +- _exits.map()->apply_replaced_nodes(); ++ _exits.map()->apply_replaced_nodes(_new_idx); + } + + //-----------------------------create_entry_map------------------------------- +diff --git a/src/share/vm/opto/replacednodes.cpp b/src/share/vm/opto/replacednodes.cpp +--- openjdk/hotspot/src/share/vm/opto/replacednodes.cpp ++++ openjdk/hotspot/src/share/vm/opto/replacednodes.cpp +@@ -91,13 +91,17 @@ + } + + // Perfom node replacement (used when returning to caller) +-void ReplacedNodes::apply(Node* n) { ++void ReplacedNodes::apply(Node* n, uint idx) { + if (is_empty()) { + return; + } + for (int i = 0; i < _replaced_nodes->length(); i++) { + ReplacedNode replaced = _replaced_nodes->at(i); +- n->replace_edge(replaced.initial(), replaced.improved()); ++ // Only apply if improved node was created in a callee to avoid ++ // issues with irreducible loops in the caller ++ if (replaced.improved()->_idx >= idx) { ++ n->replace_edge(replaced.initial(), replaced.improved()); ++ } + } + } + +diff --git a/src/share/vm/opto/replacednodes.hpp b/src/share/vm/opto/replacednodes.hpp +--- openjdk/hotspot/src/share/vm/opto/replacednodes.hpp ++++ openjdk/hotspot/src/share/vm/opto/replacednodes.hpp +@@ -71,7 +71,7 @@ + void record(Node* initial, Node* improved); + void transfer_from(const ReplacedNodes& other, uint idx); + void reset(); +- void apply(Node* n); ++ void apply(Node* n, uint idx); + void merge_with(const ReplacedNodes& other); + bool is_empty() const; + void dump(outputStream *st) const; diff --git a/SOURCES/8174729-pr3336-rh1420518.patch b/SOURCES/8174729-pr3336-rh1420518.patch new file mode 100644 index 0000000..3d67850 --- /dev/null +++ b/SOURCES/8174729-pr3336-rh1420518.patch @@ -0,0 +1,122 @@ +# HG changeset patch +# User adinn +# Date 1487931564 0 +# Fri Feb 24 10:19:24 2017 +0000 +# Node ID d41592af9af3790fe5eee30ce686d85cff09c942 +# Parent 1ac9b0f1bf17fc5935bfa8250550eabc2ffb6785 +8174729, PR3336, RH1420518: Race Condition in java.lang.reflect.WeakCache +Summary: Race can occur between Proxy.getProxyClass and Proxy.isProxyClass +Reviewed-by: mchung + +diff --git a/src/share/classes/java/lang/reflect/WeakCache.java b/src/share/classes/java/lang/reflect/WeakCache.java +--- openjdk/jdk/src/share/classes/java/lang/reflect/WeakCache.java ++++ openjdk/jdk/src/share/classes/java/lang/reflect/WeakCache.java +@@ -239,11 +239,11 @@ + // wrap value with CacheValue (WeakReference) + CacheValue cacheValue = new CacheValue<>(value); + ++ // put into reverseMap ++ reverseMap.put(cacheValue, Boolean.TRUE); ++ + // try replacing us with CacheValue (this should always succeed) +- if (valuesMap.replace(subKey, this, cacheValue)) { +- // put also in reverseMap +- reverseMap.put(cacheValue, Boolean.TRUE); +- } else { ++ if (!valuesMap.replace(subKey, this, cacheValue)) { + throw new AssertionError("Should not reach here"); + } + +diff --git a/test/java/lang/reflect/Proxy/ProxyRace.java b/test/java/lang/reflect/Proxy/ProxyRace.java +new file mode 100644 +--- /dev/null ++++ openjdk/jdk/test/java/lang/reflect/Proxy/ProxyRace.java +@@ -0,0 +1,88 @@ ++/* ++ * Copyright (c) 2017, 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.reflect.Proxy; ++import java.util.concurrent.ExecutorService; ++import java.util.concurrent.Executors; ++import java.util.concurrent.Phaser; ++import java.util.concurrent.TimeUnit; ++import java.util.concurrent.atomic.AtomicInteger; ++ ++/** ++ * @test ++ * @bug 8174729 ++ * @summary Proxy.getProxyClass() / Proxy.isProxyClass() race detector ++ * @run main ProxyRace ++ * @author plevart ++ */ ++ ++public class ProxyRace { ++ ++ static final int threads = 8; ++ ++ static volatile ClassLoader classLoader; ++ static volatile boolean terminate; ++ static final AtomicInteger racesDetected = new AtomicInteger(); ++ ++ public static void main(String[] args) throws Exception { ++ ++ Phaser phaser = new Phaser(threads) { ++ @Override ++ protected boolean onAdvance(int phase, int registeredParties) { ++ // install new ClassLoader on each advance ++ classLoader = new CL(); ++ return terminate; ++ } ++ }; ++ ++ ExecutorService exe = Executors.newFixedThreadPool(threads); ++ ++ for (int i = 0; i < threads; i++) { ++ exe.execute(() -> { ++ while (phaser.arriveAndAwaitAdvance() >= 0) { ++ Class proxyClass = Proxy.getProxyClass(classLoader, Runnable.class); ++ if (!Proxy.isProxyClass(proxyClass)) { ++ racesDetected.incrementAndGet(); ++ } ++ } ++ }); ++ } ++ ++ Thread.sleep(5000L); ++ ++ terminate = true; ++ exe.shutdown(); ++ exe.awaitTermination(5L, TimeUnit.SECONDS); ++ ++ System.out.println(racesDetected.get() + " races detected"); ++ if (racesDetected.get() != 0) { ++ throw new RuntimeException(racesDetected.get() + " races detected"); ++ } ++ } ++ ++ static class CL extends ClassLoader { ++ public CL() { ++ super(ClassLoader.getSystemClassLoader()); ++ } ++ } ++} diff --git a/SOURCES/8175097-pr3334-rh1417266.patch b/SOURCES/8175097-pr3334-rh1417266.patch new file mode 100644 index 0000000..e80dd11 --- /dev/null +++ b/SOURCES/8175097-pr3334-rh1417266.patch @@ -0,0 +1,100 @@ +# HG changeset patch +# User roland +# Date 1487286884 28800 +# Thu Feb 16 15:14:44 2017 -0800 +# Node ID 1b4eb44fbfcd0fceb485d89d91eb893d99f5864b +# Parent a9cbaff50d3d7e3a1d2dbdc0121c470142b87270 +8175097, PR3334, RH1417266: [TESTBUG] 8174164 fix missed the test +Reviewed-by: kvn + +diff --git a/test/compiler/c2/TestReplacedNodesOSR.java b/test/compiler/c2/TestReplacedNodesOSR.java +new file mode 100644 +--- /dev/null ++++ openjdk/hotspot/test/compiler/c2/TestReplacedNodesOSR.java +@@ -0,0 +1,86 @@ ++/* ++ * Copyright (c) 2017, Red Hat, Inc. 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 8174164 ++ * @summary SafePointNode::_replaced_nodes breaks with irreducible loops ++ * @run main/othervm -XX:-BackgroundCompilation TestReplacedNodesOSR ++ * ++ */ ++ ++public class TestReplacedNodesOSR { ++ ++ static Object dummy; ++ ++ static interface I { ++ } ++ ++ static class A implements I { ++ } ++ ++ static final class MyException extends Exception { ++ } ++ ++ static final A obj = new A(); ++ static I static_field() { return obj; } ++ ++ // When OSR compiled, this method has an irreducible loop ++ static void test(int v, MyException e) { ++ int i = 0; ++ for (;;) { ++ if (i == 1000) { ++ break; ++ } ++ try { ++ if ((i%2) == 0) { ++ int j = 0; ++ for (;;) { ++ j++; ++ if (i+j != v) { ++ if (j == 1000) { ++ break; ++ } ++ } else { ++ A a = (A)static_field(); ++ // replaced node recorded here ++ throw e; ++ } ++ } ++ } ++ } catch(MyException ex) { ++ } ++ i++; ++ // replaced node applied on return of the method ++ // replaced node used here ++ dummy = static_field(); ++ } ++ } ++ ++ ++ static public void main(String[] args) { ++ for (int i = 0; i < 1000; i++) { ++ test(1100, new MyException()); ++ } ++ } ++} diff --git a/SOURCES/pr1834-rh1022017.patch b/SOURCES/pr1834-rh1022017.patch index 3585029..4983884 100644 --- a/SOURCES/pr1834-rh1022017.patch +++ b/SOURCES/pr1834-rh1022017.patch @@ -1,8 +1,8 @@ diff --git a/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java b/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java --- openjdk/jdk/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java +++ openjdk/jdk/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java -@@ -160,20 +160,10 @@ - } +@@ -168,20 +168,10 @@ + "contains no supported elliptic curves"); } } else { // default curves - int[] ids; diff --git a/SPECS/java-1.8.0-openjdk.spec b/SPECS/java-1.8.0-openjdk.spec index 7a9373a..f913609 100644 --- a/SPECS/java-1.8.0-openjdk.spec +++ b/SPECS/java-1.8.0-openjdk.spec @@ -157,7 +157,7 @@ # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there. %global project aarch64-port %global repo jdk8u -%global revision aarch64-jdk8u121-b13 +%global revision aarch64-jdk8u131-b11 # eg # jdk8u60-b27 -> jdk8u60 or # aarch64-jdk8u60-b27 -> aarch64-jdk8u60 (dont forget spec escape % by %%) %global whole_update %(VERSION=%{revision}; echo ${VERSION%%-*}) # eg jdk8u60 -> 60 or aarch64-jdk8u60 -> 60 @@ -244,7 +244,8 @@ if [ "$1" -gt 1 ]; then "${sum}" = '5ea976e209d0d0b5b6ab148416123e02' -o \\ "${sum}" = '5ab4c77cf14fbd7f7ee6f51a7a73d88c' -o \\ "${sum}" = 'b727442b4ac0e3b8a26ec9741ad463e5' -o \\ - "${sum}" = 'a59c6d96aeae1303fb8ba85e97588e9d' ]; then + "${sum}" = 'a59c6d96aeae1303fb8ba85e97588e9d' -o \\ + "${sum}" = '3cd782982a47aa06399f5258ede65577' ]; then if [ -f "${javasecurity}.rpmnew" ]; then mv -f "${javasecurity}.rpmnew" "${javasecurity}" fi @@ -784,7 +785,7 @@ OrderWithRequires: %{name}-headless%1 = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: 0.%{buildver}%{?dist} +Release: 2.%{buildver}%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons, # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -804,7 +805,7 @@ URL: http://openjdk.java.net/ # aarch64-port now contains integration forest of both aarch64 and normal jdk # Source from upstream OpenJDK8 project. To regenerate, use -# VERSION=aarch64-jdk8u121-b13 FILE_NAME_ROOT=aarch64-port-jdk8u-${VERSION} +# VERSION=%%{revision} FILE_NAME_ROOT=%%{project}-%%{repo}-${VERSION} # REPO_ROOT= generate_source_tarball.sh # where the source is obtained from http://hg.openjdk.java.net/%%{project}/%%{repo} Source0: %{project}-%{repo}-%{revision}.tar.xz @@ -907,8 +908,30 @@ Patch507: pr2842-02.patch Patch400: 8154313.patch # S6260348, PR3066: GTK+ L&F JTextComponent not respecting desktop caret blink rate Patch526: 6260348-pr3066.patch -# S8162384, PR3122, RH1358661: Performance regression: bimorphic inlining may be bypassed by type speculation + +# Patches upstream and appearing in 8u131 +# 6515172, PR3346: Runtime.availableProcessors() ignores Linux taskset command +Patch542: 6515172-pr3346.patch + +# Patches upstream and appearing in 8u152 +# 8153711, PR3313, RH1284948: [REDO] JDWP: Memory Leak: GlobalRefs never deleted when processing invokeMethod command +Patch535: 8153711-pr3313-rh1284948.patch +# 8144566, PR3352: Custom HostnameVerifier disables SNI extension +Patch544: 8144566-pr3352.patch +# 8155049, PR3352: New tests from 8144566 fail with "No expected Server Name Indication" +Patch545: 8155049-pr3352.patch +# 8162384, PR3122, RH1358661: Performance regression: bimorphic inlining may be bypassed by type speculation Patch532: 8162384-pr3122-rh1358661.patch +# 8165231, RH1437545: java.nio.Bits.unaligned() doesn't return true on ppc +Patch546: 8165231-rh1437545.patch +# 8173941, PR3326: SA does not work if executable is DSO +Patch547: 8173941-pr3326.patch +# 8174164, PR3334, RH1417266: SafePointNode::_replaced_nodes breaks with irreducible loops" +Patch537: 8174164-pr3334-rh1417266.patch +# 8174729, PR3336, RH1420518: Race Condition in java.lang.reflect.WeakCache +Patch548: 8174729-pr3336-rh1420518.patch +# 8175097, PR3334, RH1417266: [TESTBUG] 8174164 fix missed the test +Patch549: 8175097-pr3334-rh1417266.patch # Patches ineligible for 8u # 8043805: Allow using a system-installed libjpeg @@ -1202,6 +1225,7 @@ cp %{SOURCE101} openjdk/common/autoconf/build-aux/ # Remove libraries that are linked sh %{SOURCE12} +# System library fixes %patch201 %patch202 %patch203 @@ -1218,12 +1242,13 @@ sh %{SOURCE12} # ppc64le fixes -# Zero fixes. - %patch603 %patch601 %patch602 +# Zero fixes. + +# Upstreamable fixes %patch502 %patch504 %patch506 @@ -1240,10 +1265,21 @@ sh %{SOURCE12} %patch518 %patch400 %patch523 -%patch525 %patch526 %patch528 %patch532 +%patch535 +%patch537 +%patch542 +%patch544 +%patch545 +%patch546 +%patch547 +%patch548 +%patch549 + +# RPM-only fixes +%patch525 %patch533 # RHEL-only patches @@ -1843,6 +1879,24 @@ require "copy_jdk_configs.lua" %endif %changelog +* Thu Apr 13 2017 Andrew Hughes - 1:1.8.0.131-2.b13 +- Backport "S8153711: [REDO] JDWP: Memory Leak: GlobalRefs never deleted when processing invokeMethod command" +- Resolves: rhbz#1442162 + +* Thu Apr 13 2017 Andrew Hughes - 1:1.8.0.131-1.b11 +- Update to aarch64-jdk8u131-b11. +- Drop upstreamed patches for 8147910, 8161993, 8170888 and 8173783. +- Update generate_source_tarball.sh to remove patch remnants. +- Cleanup tarball creation documentation to avoid duplication. +- Add MD5 checksum for the new java.security file (MD5 disabled for JAR signing) +- Resolves: rhbz#1438751 + +* Fri Apr 07 2017 Andrew Hughes - 1:1.8.0.121-1.b13 +- Add backports from 8u131 and 8u152 ahead of April CPU. +- Apply backports before local RPM fixes so they will be the same as when applied upstream +- Adjust RH1022017 following application of 8173783 +- Resolves: rhbz#1438751 + * Mon Jan 16 2017 Andrew Hughes - 1:1.8.0.121-0.b13 - Update to aarch64-jdk8u121-b13. - Add MD5 checksum for the new java.security file (EC < 224, DSA < 1024 restricted)