pop (CONFLICT)

diff --git a/meta b/meta
index fedb9923d15cf108e83a0a195148e0fa3ba5a6fc..58503e4ec6abd51391acd4e90aa8bece3fbf7652 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,10 @@
 Version: 1
-Previous: a680c91b2b638761e268e44426097bcc49c5285c
+Previous: 10ed2447136d3c8959988a99600b1fde771c4543
 Head: 3600ccfec6ae26e1b44d492eac50fec4f4169d0d
 Applied:
   transpose: 8081f96f8481d898d8de86cbadac1ae459c93306
+  fork: 3600ccfec6ae26e1b44d492eac50fec4f4169d0d
 Unapplied:
-  fork: 9ec908638bd6c7254b466334d94c30f6a3a61360
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de
 Hidden:

diff --git a/patches/fork b/patches/fork
index dccec78620a958734cc2f1f19e8f863c04052a96..594bc0cea31be25eb25c16efe01565265293c4fc 100644 (file)
--- a/patches/fork
+++ b/patches/fork
@@ -1,5 +1,5 @@
-Bottom: a8d2f5e9e4909e604d5a7b614f02d08080507dcb
-Top:    372ba59a4b3584a6777c7ad5fa7340fbcf11dcfd
+Bottom: 5fd229f7e20bde0c0ed3050847f79e5d4c8af2b1
+Top:    5fd229f7e20bde0c0ed3050847f79e5d4c8af2b1
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-13 15:25:53 -0700
 
@@ -13,275 +13,4 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-diff --git a/src/preload.c b/src/preload.c
-index 498e813..8f8fc11 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -46,6 +46,8 @@
- #include <string.h>
- #include <netinet/in.h>
- #include <netinet/tcp.h>
-+#include <unistd.h>
-+#include <semaphore.h>
- 
- #include <rdma/rdma_cma.h>
- #include <rdma/rdma_verbs.h>
-@@ -81,6 +83,7 @@ struct socket_calls {
-       int (*getsockopt)(int socket, int level, int optname,
-                         void *optval, socklen_t *optlen);
-       int (*fcntl)(int socket, int cmd, ... /* arg */);
-+      pid_t (*fork)(void);
- };
- 
- static struct socket_calls real;
-@@ -92,10 +95,13 @@ static pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER;
- static int sq_size;
- static int rq_size;
- static int sq_inline;
-+static int fork_support;
-+static int last_accept = -1;
- 
- enum fd_type {
-       fd_normal,
--      fd_rsocket
-+      fd_rsocket,
-+      fd_fork
- };
- 
- struct fd_info {
-@@ -207,6 +213,10 @@ void getenv_options(void)
-       var = getenv("RS_INLINE");
-       if (var)
-               sq_inline = atoi(var);
-+
-+      var = getenv("RDMAV_FORK_SAFE");
-+      if (var)
-+              fork_support = atoi(var);
- }
- 
- static void init_preload(void)
-@@ -244,6 +254,7 @@ static void init_preload(void)
-       real.setsockopt = dlsym(RTLD_NEXT, "setsockopt");
-       real.getsockopt = dlsym(RTLD_NEXT, "getsockopt");
-       real.fcntl = dlsym(RTLD_NEXT, "fcntl");
-+      real.fork = dlsym(RTLD_NEXT, "fork");
- 
-       rs.socket = dlsym(RTLD_DEFAULT, "rsocket");
-       rs.bind = dlsym(RTLD_DEFAULT, "rbind");
-@@ -280,12 +291,13 @@ out:
-  * the same settings and bindings as the current socket.  We currently only
-  * handle setting a few of the more common values.
-  */
--static int transpose_socket(int index, int *fd, enum fd_type new_type)
-+static int transpose_socket(int socket, enum fd_type new_type)
- {
--      socklen_t len = 0;
--      int new_fd, param, ret;
-+      int fd, new_fd, param, ret;
-       struct socket_calls *new, *old;
-+      socklen_t len = 0;
- 
-+      fd = fd_getd(socket);
-       if (new_type == fd_rsocket) {
-               new = &rs;
-               old = &real;
-@@ -294,7 +306,7 @@ static int transpose_socket(int index, int *fd, enum fd_type new_type)
-               old = &rs;
-       }
- 
--      ret = old->getsockname(*fd, NULL, &len);
-+      ret = old->getsockname(fd, NULL, &len);
-       if (ret)
-               return ret;
- 
-@@ -303,30 +315,28 @@ static int transpose_socket(int index, int *fd, enum fd_type new_type)
-       if (new_fd < 0)
-               return new_fd;
- 
--      ret = old->fcntl(*fd, F_GETFL);
-+      ret = old->fcntl(fd, F_GETFL);
-       if (ret > 0)
-               ret = new->fcntl(new_fd, F_SETFL, ret);
-       if (ret)
-               goto err;
- 
-       len = sizeof param;
--      ret = old->getsockopt(*fd, SOL_SOCKET, SO_REUSEADDR, &param, &len);
-+      ret = old->getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &param, &len);
-       if (param && !ret)
-               ret = new->setsockopt(new_fd, SOL_SOCKET, SO_REUSEADDR, &param, len);
-       if (ret)
-               goto err;
- 
-       len = sizeof param;
--      ret = old->getsockopt(*fd, IPPROTO_TCP, TCP_NODELAY, &param, &len);
-+      ret = old->getsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &param, &len);
-       if (param && !ret)
-               ret = new->setsockopt(new_fd, IPPROTO_TCP, TCP_NODELAY, &param, len);
-       if (ret)
-               goto err;
- 
--      old->close(*fd);
-       fd_store(socket, new_fd, new_type);
--      *fd = new_fd;
--      return 0;
-+      return new_fd;
- 
- err:
-       new->close(new_fd);
-@@ -365,8 +375,16 @@ int socket(int domain, int type, int protocol)
-       ret = rsocket(domain, type, protocol);
-       recursive = 0;
-       if (ret >= 0) {
--              fd_store(index, ret, fd_rsocket);
--              set_rsocket_options(ret);
-+              if (fork_support) {
-+                      rclose(ret);
-+                      ret = real_socket(domain, type, protocol);
-+                      if (ret < 0)
-+                              return ret;
-+                      fd_store(index, ret, fd_fork);
-+              } else {
-+                      fd_store(index, ret, fd_rsocket);
-+                      set_rsocket_options(ret);
-+              }
-               return index;
-       }
-       fd_close(index, &ret);
-@@ -384,9 +402,11 @@ int bind(int socket, const struct sockaddr *addr, socklen_t addrlen)
-               if (!sin->sin_port || ntohs(sin->sin_port) > 1024)
-                       return rbind(fd, addr, addrlen);
- 
--              ret = transpose_socket(socket, &fd, fd_normal);
--              if (ret)
-+              ret = transpose_socket(socket, fd_normal);
-+              if (ret < 0)
-                       return ret;
-+              rclose(fd);
-+              fd = ret;
-       }
- 
-       return real.bind(fd, addr, addrlen);
-@@ -415,18 +435,48 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
-               }
- 
-               fd_store(index, ret, fd_rsocket);
-+              last_accept = index;
-               return index;
-       } else {
-+              last_accept = -1;
-               return real.accept(fd, addr, addrlen);
-       }
- }
- 
-+static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrlen)
-+{
-+      struct sockaddr_in *sin;
-+      int fd, ret;
-+      uint32_t msg;
-+
-+      fd = fd_getd(socket);
-+      ret = real.connect(fd, addr, addrlen);
-+      if (ret)
-+              return ret;
-+
-+      ret = real.read(fd, &msg, sizeof msg);
-+      if ((ret != sizeof msg) || msg) {
-+              fd_store(socket, fd, fd_normal);
-+              return 0;
-+      }
-+
-+      ret = transpose_socket(socket, fd_rsocket);
-+      if (ret < 0)
-+              return ret;
-+
-+      real.close(fd);
-+      return rconnect(ret, addr, addrlen);
-+}
-+
- int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
- {
-       struct sockaddr_in *sin;
-       int fd, ret;
- 
--      if (fd_get(socket, &fd) == fd_rsocket) {
-+      switch (fd_get(socket, &fd)) {
-+      case fd_fork:
-+              return connect_fork(socket, addr, addrlen);
-+      case fd_rsocket:
-               sin = (struct sockaddr_in *) addr;
-               if (ntohs(sin->sin_port) > 1024) {
-                       ret = rconnect(fd, addr, addrlen);
-@@ -434,9 +484,12 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
-                               return ret;
-               }
- 
--              ret = transpose_socket(socket, &fd, fd_normal);
--              if (ret)
-+              ret = transpose_socket(socket, fd_normal);
-+              if (ret < 0)
-                       return ret;
-+              rclose(fd);
-+              fd = ret;
-+              break;
-       }
- 
-       return real.connect(fd, addr, addrlen);
-@@ -735,3 +788,57 @@ int fcntl(int socket, int cmd, ... /* arg */)
-       va_end(args);
-       return ret;
- }
-+
-+/*
-+ * We can't fork RDMA connections and pass them from the parent to the child
-+ * process.  Intercept the fork call, and if we're the child establish the
-+ * RDMA connection after calling fork.  The assumption is that the last
-+ * connection accepted by the server will be processed by the child after the
-+ * fork call.
-+ *
-+ * It would be better to establishing the RDMA connection once the child
-+ * process tries to use the connection after the fork call (i.e. in a read
-+ * or write call), rather than making the previous assumption.
-+ */
-+pid_t fork(void)
-+{
-+      struct sockaddr_storage sa;
-+      pid_t pid;
-+      sem_t *sem;
-+      int fd, lfd, newfd, ret, len, param;
-+      uint32_t msg;
-+
-+      init_preload();
-+      pid = real.fork();
-+      if (pid || !fork_support || (last_accept < 0) ||
-+          (fd_get(last_accept, &fd) != fd_fork))
-+              goto out;
-+
-+      sem = sem_open("/rsocket_fork", O_CREAT, 0644, 1);
-+      if (sem == SEM_FAILED)
-+              goto out;
-+
-+      lfd = transpose_socket(last_accept, fd_rsocket);
-+      if (lfd < 0)
-+              goto out;
-+
-+      param = 1;
-+      len = sizeof param;
-+      rsetsockopt(lfd, SOL_SOCKET, SO_REUSEADDR, &param, len);
-+
-+      len = sizeof sa;
-+      ret = real.getsockname(fd, &sa, &len);
-+      if (ret)
-+              goto out;
-+
-+      sem_wait(sem);
-+      ret = rbind()
-+
-+      real.close(fd);
-+
-+      sem_post(sem);
-+      sem_close(sem);
-+out:
-+      last_accept = -1;
-+      return pid;
-+}
+