From 4ad2063f3dc7f9b68a28f4f8afaaf43a8ea88354 Mon Sep 17 00:00:00 2001 From: alanb Date: Sun, 19 Oct 2014 11:52:53 +0100 Subject: [PATCH] 8060170: Support SIO_LOOPBACK_FAST_PATH option on Windows Reviewed-by: alanb Contributed-by: kirk.shoop@microsoft.com, v-valkop@microsoft.com --- make/mapfiles/libnet/mapfile-vers | 2 + src/share/classes/sun/nio/ch/Net.java | 76 ++++++++++++------- src/share/native/java/net/net_util.h | 4 + src/solaris/native/java/net/net_util_md.c | 5 ++ src/solaris/native/sun/nio/ch/Net.c | 2 +- src/windows/native/java/net/net_util_md.c | 22 ++++++ src/windows/native/sun/nio/ch/Net.c | 16 +++- .../StressLoopback.java | 2 + 8 files changed, 100 insertions(+), 29 deletions(-) diff --git a/make/mapfiles/libnet/mapfile-vers b/make/mapfiles/libnet/mapfile-vers index 9e07f44b1..3eb5e6d99 100644 --- a/make/mapfiles/libnet/mapfile-vers +++ b/make/mapfiles/libnet/mapfile-vers @@ -110,6 +110,8 @@ SUNWprivate_1.1 { NET_Bind; NET_MapSocketOption; NET_Wait; + NET_EnableFastTcpLoopback; + NET_ThrowNew; ipv6_available; local: diff --git a/src/share/classes/sun/nio/ch/Net.java b/src/share/classes/sun/nio/ch/Net.java index 37823e98c..598b4849e 100644 --- a/src/share/classes/sun/nio/ch/Net.java +++ b/src/share/classes/sun/nio/ch/Net.java @@ -50,30 +50,8 @@ public class Net { // set to true if exclusive binding is on for Windows private static final boolean exclusiveBind; - static { - int availLevel = isExclusiveBindAvailable(); - if (availLevel >= 0) { - String exclBindProp = - java.security.AccessController.doPrivileged( - new PrivilegedAction() { - @Override - public String run() { - return System.getProperty( - "sun.net.useExclusiveBind"); - } - }); - if (exclBindProp != null) { - exclusiveBind = exclBindProp.length() == 0 ? - true : Boolean.parseBoolean(exclBindProp); - } else if (availLevel == 1) { - exclusiveBind = true; - } else { - exclusiveBind = false; - } - } else { - exclusiveBind = false; - } - } + // set to true if the fast tcp loopback should be enabled on Windows + private static final boolean fastLoopback; // -- Miscellaneous utilities -- @@ -391,6 +369,23 @@ public class Net { } } + public static boolean isFastTcpLoopbackRequested() { + String loopbackProp = java.security.AccessController.doPrivileged( + new PrivilegedAction() { + @Override + public String run() { + return System.getProperty("jdk.net.useFastTcpLoopback"); + } + }); + boolean enable; + if ("".equals(loopbackProp)) { + enable = true; + } else { + enable = Boolean.parseBoolean(loopbackProp); + } + return enable; + } + // -- Socket operations -- private static native boolean isIPv6Available0(); @@ -413,15 +408,16 @@ public class Net { throws IOException { boolean preferIPv6 = isIPv6Available() && (family != StandardProtocolFamily.INET); - return IOUtil.newFD(socket0(preferIPv6, stream, false)); + return IOUtil.newFD(socket0(preferIPv6, stream, false, fastLoopback)); } static FileDescriptor serverSocket(boolean stream) { - return IOUtil.newFD(socket0(isIPv6Available(), stream, true)); + return IOUtil.newFD(socket0(isIPv6Available(), stream, true, fastLoopback)); } // Due to oddities SO_REUSEADDR on windows reuse is ignored - private static native int socket0(boolean preferIPv6, boolean stream, boolean reuse); + private static native int socket0(boolean preferIPv6, boolean stream, boolean reuse, + boolean fastLoopback); public static void bind(FileDescriptor fd, InetAddress addr, int port) throws IOException @@ -634,4 +630,30 @@ public class Net { POLLCONN = pollconnValue(); } + static { + int availLevel = isExclusiveBindAvailable(); + if (availLevel >= 0) { + String exclBindProp = + java.security.AccessController.doPrivileged( + new PrivilegedAction() { + @Override + public String run() { + return System.getProperty( + "sun.net.useExclusiveBind"); + } + }); + if (exclBindProp != null) { + exclusiveBind = exclBindProp.length() == 0 ? + true : Boolean.parseBoolean(exclBindProp); + } else if (availLevel == 1) { + exclusiveBind = true; + } else { + exclusiveBind = false; + } + } else { + exclusiveBind = false; + } + + fastLoopback = isFastTcpLoopbackRequested(); + } } diff --git a/src/share/native/java/net/net_util.h b/src/share/native/java/net/net_util.h index 246c0549e..60d63fcb6 100644 --- a/src/share/native/java/net/net_util.h +++ b/src/share/native/java/net/net_util.h @@ -182,9 +182,13 @@ NET_MapSocketOption(jint cmd, int *level, int *optname); JNIEXPORT int JNICALL NET_MapSocketOptionV6(jint cmd, int *level, int *optname); +JNIEXPORT jint JNICALL +NET_EnableFastTcpLoopback(int fd); + int getScopeID (struct sockaddr *); int cmpScopeID (unsigned int, struct sockaddr *); unsigned short in_cksum(unsigned short *addr, int len); + #endif /* NET_UTILS_H */ diff --git a/src/solaris/native/java/net/net_util_md.c b/src/solaris/native/java/net/net_util_md.c index 769e54050..67da52316 100644 --- a/src/solaris/native/java/net/net_util_md.c +++ b/src/solaris/native/java/net/net_util_md.c @@ -777,6 +777,11 @@ void parseExclusiveBindProperty(JNIEnv *env) { #endif } +JNIEXPORT jint JNICALL +NET_EnableFastTcpLoopback(int fd) { + return 0; +} + /* In the case of an IPv4 Inetaddress this method will return an * IPv4 mapped address where IPv6 is available and v4MappedAddress is TRUE. * Otherwise it will return a sockaddr_in structure for an IPv4 InetAddress. diff --git a/src/solaris/native/sun/nio/ch/Net.c b/src/solaris/native/sun/nio/ch/Net.c index ae7f57943..73560ad6c 100644 --- a/src/solaris/native/sun/nio/ch/Net.c +++ b/src/solaris/native/sun/nio/ch/Net.c @@ -231,7 +231,7 @@ Java_sun_nio_ch_Net_canJoin6WithIPv4Group0(JNIEnv* env, jclass cl) JNIEXPORT int JNICALL Java_sun_nio_ch_Net_socket0(JNIEnv *env, jclass cl, jboolean preferIPv6, - jboolean stream, jboolean reuse) + jboolean stream, jboolean reuse, jboolean ignored) { int fd; int type = (stream ? SOCK_STREAM : SOCK_DGRAM); diff --git a/src/windows/native/java/net/net_util_md.c b/src/windows/native/java/net/net_util_md.c index 274d90995..9acffcaab 100644 --- a/src/windows/native/java/net/net_util_md.c +++ b/src/windows/native/java/net/net_util_md.c @@ -29,6 +29,9 @@ #include "net_util.h" #include "jni.h" +// Taken from mstcpip.h in Windows SDK 8.0 or newer. +#define SIO_LOOPBACK_FAST_PATH _WSAIOW(IOC_VENDOR,16) + #ifndef IPTOS_TOS_MASK #define IPTOS_TOS_MASK 0x1e #endif @@ -844,6 +847,25 @@ jint getDefaultIPv6Interface(JNIEnv *env, struct SOCKADDR_IN6 *target_addr) } } +/** + * Enables SIO_LOOPBACK_FAST_PATH + */ +JNIEXPORT jint JNICALL +NET_EnableFastTcpLoopback(int fd) { + int enabled = 1; + DWORD result_byte_count = -1; + int result = WSAIoctl(fd, + SIO_LOOPBACK_FAST_PATH, + &enabled, + sizeof(enabled), + NULL, + 0, + &result_byte_count, + NULL, + NULL); + return result == SOCKET_ERROR ? WSAGetLastError() : 0; +} + /* If address types is IPv6, then IPv6 must be available. Otherwise * no address can be generated. In the case of an IPv4 Inetaddress this * method will return an IPv4 mapped address where IPv6 is available and diff --git a/src/windows/native/sun/nio/ch/Net.c b/src/windows/native/sun/nio/ch/Net.c index fb0faa87b..e68951b83 100644 --- a/src/windows/native/sun/nio/ch/Net.c +++ b/src/windows/native/sun/nio/ch/Net.c @@ -127,7 +127,7 @@ Java_sun_nio_ch_Net_canJoin6WithIPv4Group0(JNIEnv* env, jclass cl) JNIEXPORT jint JNICALL Java_sun_nio_ch_Net_socket0(JNIEnv *env, jclass cl, jboolean preferIPv6, - jboolean stream, jboolean reuse) + jboolean stream, jboolean reuse, jboolean fastLoopback) { SOCKET s; int domain = (preferIPv6) ? AF_INET6 : AF_INET; @@ -152,6 +152,20 @@ Java_sun_nio_ch_Net_socket0(JNIEnv *env, jclass cl, jboolean preferIPv6, NET_ThrowNew(env, WSAGetLastError(), "socket"); } + if (stream && fastLoopback) { + static int loopback_available = 1; + if (loopback_available) { + int rv = NET_EnableFastTcpLoopback((jint)s); + if (rv) { + if (rv == WSAEOPNOTSUPP) { + loopback_available = 0; + } else { + NET_ThrowNew(env, rv, "fastLoopback"); + } + } + } + } + return (jint)s; } diff --git a/test/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java b/test/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java index 46b326bde..4627aaa2a 100644 --- a/test/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java +++ b/test/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java @@ -24,6 +24,8 @@ /* @test * @bug 6834246 6842687 * @summary Stress test connections through the loopback interface + * @run main StressLoopback + * @run main/othervm -Djdk.net.useFastTcpLoopback StressLoopback */ import java.nio.ByteBuffer; -- GitLab