8164900: Add support for O_DIRECT

Add support for Direct I/O in FileChannel

Co-authored-by: Volker Simonis <volker.simonis@gmail.com>
Reviewed-by: alanb, bpb, alanbur, coffeys, aph, clanger, plevart, mli, psandoz, simonis

make/gensrc/GensrcMisc.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -63,7 +63,7 @@ endif
 define generate-preproc-src
 	$(call MakeDir, $(@D))
 	( $(NAWK) '/@@END_COPYRIGHT@@/{exit}1' $< && \
-	  $(CPP) $(CPP_FLAGS) $(SYSROOT_CFLAGS) $< \
+	  $(CPP) $(CPP_FLAGS) $(SYSROOT_CFLAGS) $(CFLAGS_JDKLIB) $< \
 	      2> >($(GREP) -v '^$(<F)$$' >&2) \
 	      | $(NAWK) '/@@START_HERE@@/,0' \
 	      |  $(SED) -e 's/@@START_HERE@@/\/\/ AUTOMATICALLY GENERATED FILE - DO NOT EDIT/' \

make/jprt.properties

@@ -180,7 +180,8 @@ jprt.test.bundle.targets=\
   ${my.make.rule.test.targets.hotspot.reg}, \
   ${my.make.rule.test.targets.hotspot.gtest} \
   ${my.make.rule.test.targets.nativesanity} \
-  ${my.test.target.set:TESTNAME=jdk_lang}
+  ${my.test.target.set:TESTNAME=jdk_lang} \
+  ${my.test.target.set:TESTNAME=jdk_nio}
 
 # 7155453: Work-around to prevent popups on OSX from blocking test completion
 # but the work-around is added to all platforms to be consistent

make/mapfiles/libnio/mapfile-linux

@@ -75,6 +75,7 @@ SUNWprivate_1.1 {
 		Java_sun_nio_ch_FileDispatcherImpl_truncate0;
                 Java_sun_nio_ch_FileDispatcherImpl_write0;
                 Java_sun_nio_ch_FileDispatcherImpl_writev0;
+                Java_sun_nio_ch_FileDispatcherImpl_setDirect0;
                 Java_sun_nio_ch_FileKey_init;
                 Java_sun_nio_ch_FileKey_initIDs;
 		Java_sun_nio_ch_InheritedChannel_close0;

make/mapfiles/libnio/mapfile-solaris

@@ -63,6 +63,7 @@ SUNWprivate_1.1 {
 		Java_sun_nio_ch_FileDispatcherImpl_truncate0;
                 Java_sun_nio_ch_FileDispatcherImpl_write0;
                 Java_sun_nio_ch_FileDispatcherImpl_writev0;
+                Java_sun_nio_ch_FileDispatcherImpl_setDirect0;
                 Java_sun_nio_ch_FileKey_init;
                 Java_sun_nio_ch_FileKey_initIDs;
 		Java_sun_nio_ch_InheritedChannel_close0;

make/test/JtregNativeJdk.gmk

@@ -47,6 +47,10 @@ BUILD_JDK_JTREG_NATIVE_SRC += \
     $(TOPDIR)/test/jdk/java/lang/String/nativeEncoding \
     #
 
+ifneq ($(OPENJDK_TARGET_OS), windows)
+    BUILD_JDK_JTREG_NATIVE_SRC += $(TOPDIR)/test/jdk/java/nio/channels/FileChannel/directio
+endif
+
 BUILD_JDK_JTREG_OUTPUT_DIR := $(OUTPUTDIR)/support/test/jdk/jtreg/native
 
 BUILD_JDK_JTREG_IMAGE_DIR := $(TEST_IMAGE_DIR)/jdk/jtreg
@@ -56,8 +60,10 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
     BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := $(WIN_LIB_JAVA)
 else ifeq ($(OPENJDK_TARGET_OS), solaris)
     BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := -ljava -lc
+    BUILD_JDK_JTREG_LIBRARIES_LIBS_libDirectIO := -ljava -lc
 else
     BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := -ljava
+    BUILD_JDK_JTREG_LIBRARIES_LIBS_libDirectIO := -ljava
 endif
 
 $(eval $(call SetupTestFilesCompilation, BUILD_JDK_JTREG_LIBRARIES, \

src/java.base/share/classes/java/nio/file/FileStore.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -111,6 +111,31 @@ protected FileStore() {
      */
     public abstract long getUsableSpace() throws IOException;
 
+    /**
+     * Returns the number of bytes per block in this file store.
+     *
+     * <p> File storage is typically organized into discrete sequences of bytes
+     * called <i>blocks</i>. A block is the smallest storage unit of a file store.
+     * Every read and write operation is performed on a multiple of blocks.
+     *
+     * @implSpec The implementation in this class throws an
+     *         {@code UnsupportedOperationException}.
+     *
+     * @return  a positive value representing the block size of this file store,
+     *          in bytes
+     *
+     * @throws  IOException
+     *          if an I/O error occurs
+     *
+     * @throws  UnsupportedOperationException
+     *          if the operation is not supported
+     *
+     * @since 10
+     */
+    public long getBlockSize() throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
     /**
      * Returns the number of unallocated bytes in the file store.
      *

src/java.base/share/classes/sun/nio/ch/FileChannelImpl.java

@@ -41,6 +41,11 @@
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.SelectableChannel;
 import java.nio.channels.WritableByteChannel;
+import java.nio.file.Files;
+import java.nio.file.FileStore;
+import java.nio.file.FileSystemException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -87,6 +92,12 @@ public class FileChannelImpl
     // Positional-read is not interruptible
     private volatile boolean uninterruptible;
 
+    // DirectIO flag
+    private final boolean direct;
+
+    // IO alignment value for DirectIO
+    private final int alignment;
+
     // Cleanable with an action which closes this channel's file descriptor
     private final Cleanable closer;
 
@@ -103,14 +114,22 @@ public void run() {
     }
 
     private FileChannelImpl(FileDescriptor fd, String path, boolean readable,
-                            boolean writable, Object parent)
+                            boolean writable, boolean direct, Object parent)
     {
         this.fd = fd;
         this.readable = readable;
         this.writable = writable;
         this.parent = parent;
         this.path = path;
+        this.direct = direct;
         this.nd = new FileDispatcherImpl();
+        if (direct) {
+            assert path != null;
+            this.alignment = nd.setDirectIO(fd, path);
+        } else {
+            this.alignment = -1;
+        }
+
         // Register a cleaning action if and only if there is no parent
         // as the parent will take care of closing the file descriptor.
         // FileChannel is used by the LambdaMetaFactory so a lambda cannot
@@ -125,7 +144,14 @@ public static FileChannel open(FileDescriptor fd, String path,
                                    boolean readable, boolean writable,
                                    Object parent)
     {
-        return new FileChannelImpl(fd, path, readable, writable, parent);
+        return new FileChannelImpl(fd, path, readable, writable, false, parent);
+    }
+
+    public static FileChannel open(FileDescriptor fd, String path,
+                                   boolean readable, boolean writable,
+                                   boolean direct, Object parent)
+    {
+        return new FileChannelImpl(fd, path, readable, writable, direct, parent);
     }
 
     private void ensureOpen() throws IOException {
@@ -181,6 +207,8 @@ public int read(ByteBuffer dst) throws IOException {
         if (!readable)
             throw new NonReadableChannelException();
         synchronized (positionLock) {
+            if (direct)
+                Util.checkChannelPositionAligned(position(), alignment);
             int n = 0;
             int ti = -1;
             try {
@@ -189,7 +217,7 @@ public int read(ByteBuffer dst) throws IOException {
                 if (!isOpen())
                     return 0;
                 do {
-                    n = IOUtil.read(fd, dst, -1, nd);
+                    n = IOUtil.read(fd, dst, -1, direct, alignment, nd);
                 } while ((n == IOStatus.INTERRUPTED) && isOpen());
                 return IOStatus.normalize(n);
             } finally {
@@ -209,6 +237,8 @@ public long read(ByteBuffer[] dsts, int offset, int length)
         if (!readable)
             throw new NonReadableChannelException();
         synchronized (positionLock) {
+            if (direct)
+                Util.checkChannelPositionAligned(position(), alignment);
             long n = 0;
             int ti = -1;
             try {
@@ -217,7 +247,8 @@ public long read(ByteBuffer[] dsts, int offset, int length)
                 if (!isOpen())
                     return 0;
                 do {
-                    n = IOUtil.read(fd, dsts, offset, length, nd);
+                    n = IOUtil.read(fd, dsts, offset, length,
+                            direct, alignment, nd);
                 } while ((n == IOStatus.INTERRUPTED) && isOpen());
                 return IOStatus.normalize(n);
             } finally {
@@ -233,6 +264,8 @@ public int write(ByteBuffer src) throws IOException {
         if (!writable)
             throw new NonWritableChannelException();
         synchronized (positionLock) {
+            if (direct)
+                Util.checkChannelPositionAligned(position(), alignment);
             int n = 0;
             int ti = -1;
             try {
@@ -241,7 +274,7 @@ public int write(ByteBuffer src) throws IOException {
                 if (!isOpen())
                     return 0;
                 do {
-                    n = IOUtil.write(fd, src, -1, nd);
+                    n = IOUtil.write(fd, src, -1, direct, alignment, nd);
                 } while ((n == IOStatus.INTERRUPTED) && isOpen());
                 return IOStatus.normalize(n);
             } finally {
@@ -261,6 +294,8 @@ public long write(ByteBuffer[] srcs, int offset, int length)
         if (!writable)
             throw new NonWritableChannelException();
         synchronized (positionLock) {
+            if (direct)
+                Util.checkChannelPositionAligned(position(), alignment);
             long n = 0;
             int ti = -1;
             try {
@@ -269,7 +304,8 @@ public long write(ByteBuffer[] srcs, int offset, int length)
                 if (!isOpen())
                     return 0;
                 do {
-                    n = IOUtil.write(fd, srcs, offset, length, nd);
+                    n = IOUtil.write(fd, srcs, offset, length,
+                            direct, alignment, nd);
                 } while ((n == IOStatus.INTERRUPTED) && isOpen());
                 return IOStatus.normalize(n);
             } finally {
@@ -752,6 +788,8 @@ public int read(ByteBuffer dst, long position) throws IOException {
             throw new IllegalArgumentException("Negative position");
         if (!readable)
             throw new NonReadableChannelException();
+        if (direct)
+            Util.checkChannelPositionAligned(position, alignment);
         ensureOpen();
         if (nd.needsPositionLock()) {
             synchronized (positionLock) {
@@ -774,7 +812,7 @@ private int readInternal(ByteBuffer dst, long position) throws IOException {
             if (!isOpen())
                 return -1;
             do {
-                n = IOUtil.read(fd, dst, position, nd);
+                n = IOUtil.read(fd, dst, position, direct, alignment, nd);
             } while ((n == IOStatus.INTERRUPTED) && isOpen());
             return IOStatus.normalize(n);
         } finally {
@@ -791,6 +829,8 @@ public int write(ByteBuffer src, long position) throws IOException {
             throw new IllegalArgumentException("Negative position");
         if (!writable)
             throw new NonWritableChannelException();
+        if (direct)
+            Util.checkChannelPositionAligned(position, alignment);
         ensureOpen();
         if (nd.needsPositionLock()) {
             synchronized (positionLock) {
@@ -811,7 +851,7 @@ private int writeInternal(ByteBuffer src, long position) throws IOException {
             if (!isOpen())
                 return -1;
             do {
-                n = IOUtil.write(fd, src, position, nd);
+                n = IOUtil.write(fd, src, position, direct, alignment, nd);
             } while ((n == IOStatus.INTERRUPTED) && isOpen());
             return IOStatus.normalize(n);
         } finally {

src/java.base/share/classes/sun/nio/ch/FileDispatcher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -61,4 +61,6 @@ abstract FileDescriptor duplicateForMapping(FileDescriptor fd)
     abstract boolean canTransferToDirectly(SelectableChannel sc);
 
     abstract boolean transferToDirectlyNeedsPositionLock();
+
+    abstract int setDirectIO(FileDescriptor fd, String path);
 }