Merge branch 'main' into timeout-remove

pom.xml

@@ -77,7 +77,7 @@
 
     <checkstyle.version>8.38</checkstyle.version>
     <junit.version>5.9.0</junit.version>
-    <netty.version>4.1.104.Final</netty.version>
+    <netty.version>4.1.106.Final</netty.version>
     <netty-tcnative-boringssl-static.version>2.0.61.Final</netty-tcnative-boringssl-static.version>
     <bouncycastle.version>1.68</bouncycastle.version>
     <build-helper-maven-plugin.version>3.2.0</build-helper-maven-plugin.version>

transport-classes-io_uring/src/main/java/io/netty/incubator/channel/uring/IOUringEventLoopGroup.java

@@ -52,21 +52,21 @@ public IOUringEventLoopGroup(int nThreads) {
      * Create a new instance using the default number of threads and the given {@link ThreadFactory}.
      */
     public IOUringEventLoopGroup(ThreadFactory threadFactory) {
-        this(0, threadFactory, 0, Native.DEFAULT_IOSEQ_ASYNC_THRESHOLD);
+        this(0, threadFactory, 0, Native.DEFAULT_IOSQE_ASYNC_THRESHOLD);
     }
 
     /**
      * Create a new instance using the specified number of threads and the given {@link ThreadFactory}.
      */
     public IOUringEventLoopGroup(int nThreads, ThreadFactory threadFactory) {
-        this(nThreads, threadFactory, 0, Native.DEFAULT_IOSEQ_ASYNC_THRESHOLD);
+        this(nThreads, threadFactory, 0, Native.DEFAULT_IOSQE_ASYNC_THRESHOLD);
     }
 
     /**
      * Create a new instance using the specified number of threads and the given {@link Executor}.
      */
     public IOUringEventLoopGroup(int nThreads, Executor executor) {
-        this(nThreads, executor, 0, Native.DEFAULT_IOSEQ_ASYNC_THRESHOLD);
+        this(nThreads, executor, 0, Native.DEFAULT_IOSQE_ASYNC_THRESHOLD);
     }
 
     /**

transport-classes-io_uring/src/main/java/io/netty/incubator/channel/uring/Native.java

@@ -40,8 +40,15 @@
 final class Native {
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(Native.class);
     static final int DEFAULT_RING_SIZE = Math.max(64, SystemPropertyUtil.getInt("io.netty.iouring.ringSize", 4096));
-    static final int DEFAULT_IOSEQ_ASYNC_THRESHOLD =
-            Math.max(0, SystemPropertyUtil.getInt("io.netty.iouring.iosqeAsyncThreshold", 25));
+    /**
+     * When there are more FDs (= connections) than this setting, the FDs will be marked as IOSQE_ASYNC, under the
+     * expectation that read/write ops on the FDs will usually block. If this expectation is correct, IOSQE_ASYNC can
+     * reduce CPU usage, but if the expectation is incorrect, it may add additional, unnecessary latency.
+     * <p>
+     * Default is to never use IOSQE_ASYNC.
+     */
+    static final int DEFAULT_IOSQE_ASYNC_THRESHOLD =
+            Math.max(0, SystemPropertyUtil.getInt("io.netty.iouring.iosqeAsyncThreshold", Integer.MAX_VALUE));
 
     static {
         Selector selector = null;
@@ -195,7 +202,7 @@ public void run() {
             (TCP_FASTOPEN_MODE & TFO_ENABLED_SERVER_MASK) == TFO_ENABLED_SERVER_MASK;
 
     static RingBuffer createRingBuffer(int ringSize) {
-        return createRingBuffer(ringSize, DEFAULT_IOSEQ_ASYNC_THRESHOLD);
+        return createRingBuffer(ringSize, DEFAULT_IOSQE_ASYNC_THRESHOLD);
     }
 
     static RingBuffer createRingBuffer(int ringSize, int iosqeAsyncThreshold) {
@@ -232,7 +239,7 @@ static RingBuffer createRingBuffer(int ringSize, int iosqeAsyncThreshold) {
     }
 
     static RingBuffer createRingBuffer() {
-        return createRingBuffer(DEFAULT_RING_SIZE, DEFAULT_IOSEQ_ASYNC_THRESHOLD);
+        return createRingBuffer(DEFAULT_RING_SIZE, DEFAULT_IOSQE_ASYNC_THRESHOLD);
     }
 
     static void checkAllIOSupported(int ringFd) {