[posix] support non-critical read() call

macos tap devices will block the program when using critical read()

Author: wkgcass

base/src/main/c-generated/io_vproxy_vfd_posix_PosixNative.h

@@ -65,6 +65,7 @@ JNIEXPORT int JNICALL Java_io_vproxy_vfd_posix_PosixNative_getIPv6Remote(PNIEnv_
 JNIEXPORT int JNICALL Java_io_vproxy_vfd_posix_PosixNative_getUDSLocal(PNIEnv_SocketAddressUDS_st * env, int32_t fd, SocketAddressUDS_st * return_);
 JNIEXPORT int JNICALL Java_io_vproxy_vfd_posix_PosixNative_getUDSRemote(PNIEnv_SocketAddressUDS_st * env, int32_t fd, SocketAddressUDS_st * return_);
 JNIEXPORT int JNICALL Java_io_vproxy_vfd_posix_PosixNative_read(PNIEnv_int * env, int32_t fd, void * directBuffer, int32_t off, int32_t len);
+JNIEXPORT int JNICALL Java_io_vproxy_vfd_posix_PosixNative_readBlocking(PNIEnv_int * env, int32_t fd, void * directBuffer, int32_t off, int32_t len);
 JNIEXPORT int JNICALL Java_io_vproxy_vfd_posix_PosixNative_write(PNIEnv_int * env, int32_t fd, void * directBuffer, int32_t off, int32_t len);
 JNIEXPORT int JNICALL Java_io_vproxy_vfd_posix_PosixNative_sendtoIPv4(PNIEnv_int * env, int32_t fd, void * directBuffer, int32_t off, int32_t len, int32_t addrHostOrder, int32_t port);
 JNIEXPORT int JNICALL Java_io_vproxy_vfd_posix_PosixNative_sendtoIPv6(PNIEnv_int * env, int32_t fd, void * directBuffer, int32_t off, int32_t len, char * fullAddr, int32_t port);
@@ -80,5 +81,5 @@ JNIEXPORT int JNICALL Java_io_vproxy_vfd_posix_PosixNative_setCoreAffinityForCur
 }
 #endif
 #endif // _Included_io_vproxy_vfd_posix_PosixNative
-// metadata.generator-version: pni 21.0.0.12
-// sha256:fb5216887c255149d2b81e719096596542b69cf6d882a55bd40296387c1623c9
+// metadata.generator-version: pni 21.0.0.17
+// sha256:1e84eb47f36e590566f1bbbf692bdba8e228a6ba2a5900b4e62f016ecfb9a38b

base/src/main/c/io_vproxy_vfd_posix_GeneralPosix.c

@@ -600,6 +600,11 @@ JNIEXPORT int JNICALL Java_io_vproxy_vfd_posix_PosixNative_read
     return 0;
 }
 
+JNIEXPORT int JNICALL Java_io_vproxy_vfd_posix_PosixNative_readBlocking
+  (PNIEnv_int* env, int32_t fd, void* directBuffer, int32_t off, int32_t len) {
+    return Java_io_vproxy_vfd_posix_PosixNative_read(env, fd, directBuffer, off, len);
+}
+
 JNIEXPORT int JNICALL Java_io_vproxy_vfd_posix_PosixNative_write
   (PNIEnv_int* env, int32_t fd, void* directBuffer, int32_t off, int32_t len) {
     if (len == 0) {

base/src/main/generated/io/vproxy/vfd/posix/PosixNative.java

@@ -708,6 +708,23 @@ public int read(PNIEnv ENV, int fd, ByteBuffer directBuffer, int off, int len) t
         return ENV.returnInt();
     }
 
+    private static final MethodHandle readBlockingMH = PanamaUtils.lookupPNIFunction(new PNILinkOptions(), "Java_io_vproxy_vfd_posix_PosixNative_readBlocking", int.class /* fd */, ByteBuffer.class /* directBuffer */, int.class /* off */, int.class /* len */);
+
+    public int readBlocking(PNIEnv ENV, int fd, ByteBuffer directBuffer, int off, int len) throws java.io.IOException {
+        ENV.reset();
+        int ERR;
+        try {
+            ERR = (int) readBlockingMH.invokeExact(ENV.MEMORY, fd, PanamaUtils.format(directBuffer), off, len);
+        } catch (Throwable THROWABLE) {
+            throw PanamaUtils.convertInvokeExactException(THROWABLE);
+        }
+        if (ERR != 0) {
+            ENV.throwIf(java.io.IOException.class);
+            ENV.throwLast();
+        }
+        return ENV.returnInt();
+    }
+
     private static final MethodHandle writeMH = PanamaUtils.lookupPNIFunction(new PNILinkOptions().setCritical(true), "Java_io_vproxy_vfd_posix_PosixNative_write", int.class /* fd */, ByteBuffer.class /* directBuffer */, int.class /* off */, int.class /* len */);
 
     public int write(PNIEnv ENV, int fd, ByteBuffer directBuffer, int off, int len) throws java.io.IOException {
@@ -879,5 +896,5 @@ public void setCoreAffinityForCurrentThread(PNIEnv ENV, long mask) throws java.i
         }
     }
 }
-// metadata.generator-version: pni 21.0.0.17
-// sha256:168e4c184415e27beb86430bef5d5d1c23c2b272c410d8f1933413fde1ee9f67
+// metadata.generator-version: pni 21.0.0.18
+// sha256:a6ab0d88c014cf3f59f372ce03960a5a63f19153fefec2b5565170cd42416346

base/src/main/java/io/vproxy/base/selector/wrap/blocking/BlockingDatagramFD.java

@@ -289,7 +289,7 @@ private void doRead() {
 
         var buf = Utils.allocateByteBuffer(readBufSize);
         try {
-            fd.read(buf);
+            fd.readBlocking(buf);
         } catch (IOException e) {
             lastReadException = e;
             isReading = false;

base/src/main/java/io/vproxy/vfd/ReadableByteStream.java

@@ -5,4 +5,8 @@
 
 public interface ReadableByteStream {
     int read(ByteBuffer dst) throws IOException;
+
+    default int readBlocking(ByteBuffer buf) throws IOException {
+        return read(buf);
+    }
 }

base/src/main/java/io/vproxy/vfd/posix/GeneralPosix.java

@@ -289,6 +289,12 @@ public int read(int fd, ByteBuffer directBuffer, int off, int len) throws IOExce
             fd, directBuffer, off, len);
     }
 
+    @Override
+    public int readBlocking(int fd, ByteBuffer directBuffer, int off, int len) throws IOException {
+        return PosixNative.get().readBlocking(VProxyThread.current().getEnv(),
+            fd, directBuffer, off, len);
+    }
+
     @Override
     public int write(int fd, ByteBuffer directBuffer, int off, int len) throws IOException {
         return PosixNative.get().write(VProxyThread.current().getEnv(),

base/src/main/java/io/vproxy/vfd/posix/Posix.java

@@ -93,6 +93,8 @@ public interface Posix {
 
     int read(int fd, ByteBuffer directBuffer, int off, int len) throws IOException;
 
+    int readBlocking(int fd, ByteBuffer directBuffer, int off, int len) throws IOException;
+
     int write(int fd, ByteBuffer directBuffer, int off, int len) throws IOException;
 
     int sendtoIPv4(int fd, ByteBuffer directBuffer, int off, int len, int addrHostOrder, int port) throws IOException;

base/src/main/java/io/vproxy/vfd/posix/PosixNetworkFD.java

@@ -28,6 +28,14 @@ public int read(ByteBuffer dst) throws IOException {
         return utilRead(dst, (buf, off, len) -> posix.read(fd, buf, off, len));
     }
 
+    public int readBlocking(ByteBuffer dst) throws IOException {
+        checkFD();
+        checkConnected();
+        checkNotClosed();
+
+        return utilRead(dst, (buf, off, len) -> posix.readBlocking(fd, buf, off, len));
+    }
+
     public int write(ByteBuffer src) throws IOException {
         checkFD();
         checkConnected();

pni-template/src/main/java/io/vproxy/vfd/posix/PosixNative.java

@@ -143,6 +143,8 @@ interface PNIPosixNative {
     @LinkerOption.Critical
     int read(int fd, @Raw ByteBuffer directBuffer, int off, int len) throws IOException;
 
+    int readBlocking(int fd, @Raw ByteBuffer directBuffer, int off, int len) throws IOException;
+
     @LinkerOption.Critical
     int write(int fd, @Raw ByteBuffer directBuffer, int off, int len) throws IOException;