commit f6cc2cc5e8250e35f5511d444bea0113dec05dde
author Yan Yan <evitayan@google.com> Thu Dec 03 22:28:59 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 03 22:28:59 2020 +0000
tree 33373fcc1e223ff2c7209e8b31f30fbece137620
parent 52d869238a5659dfb6639031a7486a4f5df4c59f
parent 649e6cfbe587baa35a0e30415c14f047a35d10d2

Do not make IkeSocket SOCK_NONBLOCK to save CPU utilization am: 649e6cfbe5

Original change: https://android-review.googlesource.com/c/platform/packages/modules/IPsec/+/1512484

Change-Id: Ib3e97cc19641c3902806597a98cfb3e733712881

src/java/com/android/internal/net/ipsec/ike/IkeUdp4Socket.java

diff --git a/src/java/com/android/internal/net/ipsec/ike/IkeUdp4Socket.java b/src/java/com/android/internal/net/ipsec/ike/IkeUdp4Socket.java
index 3f26fd9..44ccac0 100644
--- a/src/java/com/android/internal/net/ipsec/ike/IkeUdp4Socket.java
+++ b/src/java/com/android/internal/net/ipsec/ike/IkeUdp4Socket.java
@@ -17,10 +17,8 @@
 package com.android.internal.net.ipsec.ike;
 
 import static android.system.OsConstants.AF_INET;
-import static android.system.OsConstants.F_SETFL;
 import static android.system.OsConstants.IPPROTO_UDP;
 import static android.system.OsConstants.SOCK_DGRAM;
-import static android.system.OsConstants.SOCK_NONBLOCK;
 
 import android.net.InetAddresses;
 import android.net.Network;
@@ -71,9 +69,6 @@
         if (ikeSocket == null) {
             FileDescriptor sock = Os.socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
             Os.bind(sock, INADDR_ANY, 0);
-
-            // {@link PacketReader} requires non-blocking I/O access. Set SOCK_NONBLOCK here.
-            Os.fcntlInt(sock, F_SETFL, SOCK_DGRAM | SOCK_NONBLOCK);
             network.bindSocket(sock);
 
             ikeSocket = new IkeUdp4Socket(sock, network, handler);

src/java/com/android/internal/net/ipsec/ike/IkeUdp6Socket.java

diff --git a/src/java/com/android/internal/net/ipsec/ike/IkeUdp6Socket.java b/src/java/com/android/internal/net/ipsec/ike/IkeUdp6Socket.java
index 647583d..c195156 100644
--- a/src/java/com/android/internal/net/ipsec/ike/IkeUdp6Socket.java
+++ b/src/java/com/android/internal/net/ipsec/ike/IkeUdp6Socket.java
@@ -17,10 +17,8 @@
 package com.android.internal.net.ipsec.ike;
 
 import static android.system.OsConstants.AF_INET6;
-import static android.system.OsConstants.F_SETFL;
 import static android.system.OsConstants.IPPROTO_UDP;
 import static android.system.OsConstants.SOCK_DGRAM;
-import static android.system.OsConstants.SOCK_NONBLOCK;
 
 import android.net.InetAddresses;
 import android.net.Network;
@@ -84,9 +82,6 @@
             throws ErrnoException, IOException {
         FileDescriptor sock = Os.socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
         Os.bind(sock, INADDR_ANY, 0);
-
-        // {@link PacketReader} requires non-blocking I/O access. Set SOCK_NONBLOCK here.
-        Os.fcntlInt(sock, F_SETFL, SOCK_DGRAM | SOCK_NONBLOCK);
         network.bindSocket(sock);
 
         return sock;

src/java/com/android/internal/net/ipsec/ike/IkeUdpEncapSocket.java

diff --git a/src/java/com/android/internal/net/ipsec/ike/IkeUdpEncapSocket.java b/src/java/com/android/internal/net/ipsec/ike/IkeUdpEncapSocket.java
index 11bb934..5e94694 100644
--- a/src/java/com/android/internal/net/ipsec/ike/IkeUdpEncapSocket.java
+++ b/src/java/com/android/internal/net/ipsec/ike/IkeUdpEncapSocket.java
@@ -17,9 +17,6 @@
 package com.android.internal.net.ipsec.ike;
 
 import static android.net.ipsec.ike.IkeManager.getIkeLog;
-import static android.system.OsConstants.F_SETFL;
-import static android.system.OsConstants.SOCK_DGRAM;
-import static android.system.OsConstants.SOCK_NONBLOCK;
 
 import android.net.IpSecManager;
 import android.net.IpSecManager.ResourceUnavailableException;
@@ -91,9 +88,6 @@
         if (ikeSocket == null) {
             UdpEncapsulationSocket udpEncapSocket = ipsecManager.openUdpEncapsulationSocket();
             FileDescriptor fd = udpEncapSocket.getFileDescriptor();
-
-            // {@link PacketReader} requires non-blocking I/O access. Set SOCK_NONBLOCK here.
-            Os.fcntlInt(fd, F_SETFL, SOCK_DGRAM | SOCK_NONBLOCK);
             network.bindSocket(fd);
 
             ikeSocket = new IkeUdpEncapSocket(udpEncapSocket, network, new Handler(looper));