grpc 1.51.0 → 1.52.0.pre2

data/src/core/lib/iomgr/tcp_server_utils_posix.h

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2017 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2017 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #ifndef GRPC_CORE_LIB_IOMGR_TCP_SERVER_UTILS_POSIX_H
 #define GRPC_CORE_LIB_IOMGR_TCP_SERVER_UTILS_POSIX_H
@@ -27,7 +27,7 @@
 #include "src/core/lib/iomgr/tcp_server.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 
-/* one listening port */
+// one listening port
 typedef struct grpc_tcp_listener {
   int fd;
   grpc_fd* emfd;
@@ -39,69 +39,72 @@ typedef struct grpc_tcp_listener {
   grpc_closure read_closure;
   grpc_closure destroyed_closure;
   struct grpc_tcp_listener* next;
-  /* sibling is a linked list of all listeners for a given port. add_port and
-     clone_port place all new listeners in the same sibling list. A member of
-     the 'sibling' list is also a member of the 'next' list. The head of each
-     sibling list has is_sibling==0, and subsequent members of sibling lists
-     have is_sibling==1. is_sibling allows separate sibling lists to be
-     identified while iterating through 'next'. */
+  // sibling is a linked list of all listeners for a given port. add_port and
+  // clone_port place all new listeners in the same sibling list. A member of
+  // the 'sibling' list is also a member of the 'next' list. The head of each
+  // sibling list has is_sibling==0, and subsequent members of sibling lists
+  // have is_sibling==1. is_sibling allows separate sibling lists to be
+  // identified while iterating through 'next'.
   struct grpc_tcp_listener* sibling;
   int is_sibling;
 } grpc_tcp_listener;
 
-/* the overall server */
+// the overall server
 struct grpc_tcp_server {
   gpr_refcount refs;
-  /* Called whenever accept() succeeds on a server port. */
+  // Called whenever accept() succeeds on a server port.
   grpc_tcp_server_cb on_accept_cb = nullptr;
   void* on_accept_cb_arg = nullptr;
 
   gpr_mu mu;
 
-  /* active port count: how many ports are actually still listening */
+  // active port count: how many ports are actually still listening
   size_t active_ports = 0;
-  /* destroyed port count: how many ports are completely destroyed */
+  // destroyed port count: how many ports are completely destroyed
   size_t destroyed_ports = 0;
 
-  /* is this server shutting down? */
+  // is this server shutting down?
   bool shutdown = false;
-  /* have listeners been shutdown? */
+  // have listeners been shutdown?
   bool shutdown_listeners = false;
-  /* use SO_REUSEPORT */
+  // use SO_REUSEPORT
   bool so_reuseport = false;
-  /* expand wildcard addresses to a list of all local addresses */
+  // expand wildcard addresses to a list of all local addresses
   bool expand_wildcard_addrs = false;
 
-  /* linked list of server ports */
+  // linked list of server ports
   grpc_tcp_listener* head = nullptr;
   grpc_tcp_listener* tail = nullptr;
   unsigned nports = 0;
 
-  /* List of closures passed to shutdown_starting_add(). */
+  // List of closures passed to shutdown_starting_add().
   grpc_closure_list shutdown_starting{nullptr, nullptr};
 
-  /* shutdown callback */
+  // shutdown callback
   grpc_closure* shutdown_complete = nullptr;
 
-  /* all pollsets interested in new connections. The object pointed at is not
-   * owned by this struct */
+  // all pollsets interested in new connections. The object pointed at is not
+  // owned by this struct
   const std::vector<grpc_pollset*>* pollsets = nullptr;
 
-  /* next pollset to assign a channel to */
+  // next pollset to assign a channel to
   gpr_atm next_pollset_to_assign = 0;
 
-  /* Contains config extracted from channel args for this server */
+  // Contains config extracted from channel args for this server
   grpc_core::PosixTcpOptions options;
 
-  /* a handler for external connections, owned */
+  // a handler for external connections, owned
   grpc_core::TcpServerFdHandler* fd_handler = nullptr;
 
-  /* used to create slice allocators for endpoints, owned */
+  // used to create slice allocators for endpoints, owned
   grpc_core::MemoryQuotaRefPtr memory_quota;
+
+  /* used to store a pre-allocated FD assigned to a socket */
+  int pre_allocated_fd;
 };
 
-/* If successful, add a listener to \a s for \a addr, set \a dsmode for the
-   socket, and return the \a listener. */
+// If successful, add a listener to \a s for \a addr, set \a dsmode for the
+// socket, and return the \a listener.
 grpc_error_handle grpc_tcp_server_add_addr(grpc_tcp_server* s,
                                            const grpc_resolved_address* addr,
                                            unsigned port_index,
@@ -109,21 +112,21 @@ grpc_error_handle grpc_tcp_server_add_addr(grpc_tcp_server* s,
                                            grpc_dualstack_mode* dsmode,
                                            grpc_tcp_listener** listener);
 
-/* Get all addresses assigned to network interfaces on the machine and create a
-   listener for each. requested_port is the port to use for every listener, or 0
-   to select one random port that will be used for every listener. Set *out_port
-   to the port selected. Return absl::OkStatus() only if all listeners were
-   added. */
+// Get all addresses assigned to network interfaces on the machine and create a
+// listener for each. requested_port is the port to use for every listener, or 0
+// to select one random port that will be used for every listener. Set *out_port
+// to the port selected. Return absl::OkStatus() only if all listeners were
+// added.
 grpc_error_handle grpc_tcp_server_add_all_local_addrs(grpc_tcp_server* s,
                                                       unsigned port_index,
                                                       int requested_port,
                                                       int* out_port);
 
-/* Prepare a recently-created socket for listening. */
+// Prepare a recently-created socket for listening.
 grpc_error_handle grpc_tcp_server_prepare_socket(
     grpc_tcp_server*, int fd, const grpc_resolved_address* addr,
     bool so_reuseport, int* port);
-/* Ruturn true if the platform supports ifaddrs */
+// Ruturn true if the platform supports ifaddrs
 bool grpc_tcp_server_have_ifaddrs(void);
 
-#endif /* GRPC_CORE_LIB_IOMGR_TCP_SERVER_UTILS_POSIX_H */
+#endif  // GRPC_CORE_LIB_IOMGR_TCP_SERVER_UTILS_POSIX_H

data/src/core/lib/iomgr/tcp_server_utils_posix_common.cc

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2017 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2017 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #include <grpc/support/port_platform.h>
 
@@ -37,6 +37,7 @@
 #include <grpc/support/sync.h>
 
 #include "src/core/lib/address_utils/sockaddr_utils.h"
+#include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/tcp_server_utils_posix.h"
@@ -47,13 +48,13 @@
 static gpr_once s_init_max_accept_queue_size = GPR_ONCE_INIT;
 static int s_max_accept_queue_size;
 
-/* get max listen queue size on linux */
+// get max listen queue size on linux
 static void init_max_accept_queue_size(void) {
   int n = SOMAXCONN;
   char buf[64];
   FILE* fp = fopen("/proc/sys/net/core/somaxconn", "r");
   if (fp == nullptr) {
-    /* 2.4 kernel. */
+    // 2.4 kernel.
     s_max_accept_queue_size = SOMAXCONN;
     return;
   }
@@ -99,7 +100,6 @@ static grpc_error_handle add_socket_to_server(grpc_tcp_server* s, int fd,
   std::string name = absl::StrCat("tcp-server-listener:", addr_str.value());
   gpr_mu_lock(&s->mu);
   s->nports++;
-  GPR_ASSERT(!s->on_accept_cb && "must add ports before starting server");
   grpc_tcp_listener* sp =
       static_cast<grpc_tcp_listener*>(gpr_malloc(sizeof(grpc_tcp_listener)));
   sp->next = nullptr;
@@ -112,6 +112,12 @@ static grpc_error_handle add_socket_to_server(grpc_tcp_server* s, int fd,
   sp->server = s;
   sp->fd = fd;
   sp->emfd = grpc_fd_create(fd, name.c_str(), true);
+
+  // Check and set fd as prellocated
+  if (grpc_tcp_server_pre_allocated_fd(s) == fd) {
+    grpc_fd_set_pre_allocated(sp->emfd);
+  }
+
   memcpy(&sp->addr, addr, sizeof(grpc_resolved_address));
   sp->port = port;
   sp->port_index = port_index;
@@ -125,16 +131,44 @@ static grpc_error_handle add_socket_to_server(grpc_tcp_server* s, int fd,
   return err;
 }
 
-/* If successful, add a listener to s for addr, set *dsmode for the socket, and
-   return the *listener. */
+// If successful, add a listener to s for addr, set *dsmode for the socket, and
+// return the *listener.
 grpc_error_handle grpc_tcp_server_add_addr(grpc_tcp_server* s,
                                            const grpc_resolved_address* addr,
                                            unsigned port_index,
                                            unsigned fd_index,
                                            grpc_dualstack_mode* dsmode,
                                            grpc_tcp_listener** listener) {
-  grpc_resolved_address addr4_copy;
   int fd;
+  fd = grpc_tcp_server_pre_allocated_fd(s);
+
+  // Check if FD has been pre-allocated
+  if (fd > 0) {
+    int family = grpc_sockaddr_get_family(addr);
+    // Set dsmode value
+    if (family == AF_INET6) {
+      const int off = 0;
+      if (setsockopt(fd, 0, IPV6_V6ONLY, &off, sizeof(off)) == 0) {
+        *dsmode = GRPC_DSMODE_DUALSTACK;
+      } else if (!grpc_sockaddr_is_v4mapped(addr, nullptr)) {
+        *dsmode = GRPC_DSMODE_IPV6;
+      } else {
+        *dsmode = GRPC_DSMODE_IPV4;
+      }
+    } else {
+      *dsmode = family == AF_INET ? GRPC_DSMODE_IPV4 : GRPC_DSMODE_NONE;
+    }
+
+    grpc_resolved_address addr4_copy;
+    if (*dsmode == GRPC_DSMODE_IPV4 &&
+        grpc_sockaddr_is_v4mapped(addr, &addr4_copy)) {
+      addr = &addr4_copy;
+    }
+
+    return add_socket_to_server(s, fd, addr, port_index, fd_index, listener);
+  }
+
+  grpc_resolved_address addr4_copy;
   grpc_error_handle err =
       grpc_create_dualstack_socket(addr, SOCK_STREAM, 0, dsmode, &fd);
   if (!err.ok()) {
@@ -147,7 +181,7 @@ grpc_error_handle grpc_tcp_server_add_addr(grpc_tcp_server* s,
   return add_socket_to_server(s, fd, addr, port_index, fd_index, listener);
 }
 
-/* Prepare a recently-created socket for listening. */
+// Prepare a recently-created socket for listening.
 grpc_error_handle grpc_tcp_server_prepare_socket(
     grpc_tcp_server* s, int fd, const grpc_resolved_address* addr,
     bool so_reuseport, int* port) {
@@ -164,7 +198,7 @@ grpc_error_handle grpc_tcp_server_prepare_socket(
 #ifdef GRPC_LINUX_ERRQUEUE
   err = grpc_set_socket_zerocopy(fd);
   if (!err.ok()) {
-    /* it's not fatal, so just log it. */
+    // it's not fatal, so just log it.
     gpr_log(GPR_DEBUG, "Node does not support SO_ZEROCOPY, continuing.");
   }
 #endif
@@ -188,15 +222,19 @@ grpc_error_handle grpc_tcp_server_prepare_socket(
                                           s->options);
   if (!err.ok()) goto error;
 
-  if (bind(fd, reinterpret_cast<grpc_sockaddr*>(const_cast<char*>(addr->addr)),
-           addr->len) < 0) {
-    err = GRPC_OS_ERROR(errno, "bind");
-    goto error;
-  }
+  // Only bind/listen if fd has not been already preallocated
+  if (grpc_tcp_server_pre_allocated_fd(s) != fd) {
+    if (bind(fd,
+             reinterpret_cast<grpc_sockaddr*>(const_cast<char*>(addr->addr)),
+             addr->len) < 0) {
+      err = GRPC_OS_ERROR(errno, "bind");
+      goto error;
+    }
 
-  if (listen(fd, get_max_accept_queue_size()) < 0) {
-    err = GRPC_OS_ERROR(errno, "listen");
-    goto error;
+    if (listen(fd, get_max_accept_queue_size()) < 0) {
+      err = GRPC_OS_ERROR(errno, "listen");
+      goto error;
+    }
   }
 
   sockname_temp.len = static_cast<socklen_t>(sizeof(struct sockaddr_storage));
@@ -221,4 +259,4 @@ error:
   return ret;
 }
 
-#endif /* GRPC_POSIX_SOCKET_TCP_SERVER_UTILS_COMMON */
+#endif  // GRPC_POSIX_SOCKET_TCP_SERVER_UTILS_COMMON

data/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2017 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2017 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #include <grpc/support/port_platform.h>
 
@@ -36,11 +36,12 @@
 #include <grpc/support/log.h>
 
 #include "src/core/lib/address_utils/sockaddr_utils.h"
+#include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/tcp_server_utils_posix.h"
 
-/* Return the listener in s with address addr or NULL. */
+// Return the listener in s with address addr or NULL.
 static grpc_tcp_listener* find_listener_with_addr(grpc_tcp_server* s,
                                                   grpc_resolved_address* addr) {
   grpc_tcp_listener* l;
@@ -57,7 +58,7 @@ static grpc_tcp_listener* find_listener_with_addr(grpc_tcp_server* s,
   return l;
 }
 
-/* Bind to "::" to get a port number not used by any address. */
+// Bind to "::" to get a port number not used by any address.
 static grpc_error_handle get_unused_port(int* port) {
   grpc_resolved_address wild;
   grpc_sockaddr_make_wildcard6(0, &wild);
@@ -98,10 +99,10 @@ grpc_error_handle grpc_tcp_server_add_all_local_addrs(grpc_tcp_server* s,
   grpc_tcp_listener* sp = nullptr;
   grpc_error_handle err;
   if (requested_port == 0) {
-    /* Note: There could be a race where some local addrs can listen on the
-       selected port and some can't. The sane way to handle this would be to
-       retry by recreating the whole grpc_tcp_server. Backing out individual
-       listeners and orphaning the FDs looks like too much trouble. */
+    // Note: There could be a race where some local addrs can listen on the
+    // selected port and some can't. The sane way to handle this would be to
+    // retry by recreating the whole grpc_tcp_server. Backing out individual
+    // listeners and orphaning the FDs looks like too much trouble.
     if ((err = get_unused_port(&requested_port)) != absl::OkStatus()) {
       return err;
     } else if (requested_port <= 0) {
@@ -128,7 +129,7 @@ grpc_error_handle grpc_tcp_server_add_all_local_addrs(grpc_tcp_server* s,
     }
     memcpy(addr.addr, ifa_it->ifa_addr, addr.len);
     if (!grpc_sockaddr_set_port(&addr, requested_port)) {
-      /* Should never happen, because we check sa_family above. */
+      // Should never happen, because we check sa_family above.
       err = GRPC_ERROR_CREATE("Failed to set port");
       break;
     }
@@ -139,8 +140,8 @@ grpc_error_handle grpc_tcp_server_add_all_local_addrs(grpc_tcp_server* s,
     gpr_log(GPR_DEBUG,
             "Adding local addr from interface %s flags 0x%x to server: %s",
             ifa_name, ifa_it->ifa_flags, addr_str->c_str());
-    /* We could have multiple interfaces with the same address (e.g., bonding),
-       so look for duplicates. */
+    // We could have multiple interfaces with the same address (e.g., bonding),
+    // so look for duplicates.
     if (find_listener_with_addr(s, &addr) != nullptr) {
       gpr_log(GPR_DEBUG, "Skipping duplicate addr %s on interface %s",
               addr_str->c_str(), ifa_name);
@@ -175,4 +176,4 @@ grpc_error_handle grpc_tcp_server_add_all_local_addrs(grpc_tcp_server* s,
 
 bool grpc_tcp_server_have_ifaddrs(void) { return true; }
 
-#endif /* GRPC_HAVE_IFADDRS */
+#endif  // GRPC_HAVE_IFADDRS

data/src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2017 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2017 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #include <grpc/support/port_platform.h>
 
@@ -33,4 +33,4 @@ grpc_error_handle grpc_tcp_server_add_all_local_addrs(grpc_tcp_server* /*s*/,
 
 bool grpc_tcp_server_have_ifaddrs(void) { return false; }
 
-#endif /* defined(GRPC_POSIX_SOCKET) && !defined(GRPC_HAVE_IFADDRS) */
+#endif  // defined(GRPC_POSIX_SOCKET) && !defined(GRPC_HAVE_IFADDRS)