WIP

Signed-off-by: Dmytro Podgornyi <[email protected]>

src/core/event/event_handler_manager.cpp

@@ -182,11 +182,21 @@ void event_handler_manager::unregister_timers_event_and_delete(timer_handler *ha
     post_new_reg_action(reg_action);
 }
 
-void event_handler_manager::unregister_socket_timer_and_delete(sockinfo_tcp *sock_tcp)
+void event_handler_manager::unregister_socket_timer_event(sockinfo_tcp *sock_tcp)
 {
     evh_logdbg("Unregistering TCP socket timer: %p", sock_tcp);
     reg_action_t reg_action;
     memset(&reg_action, 0, sizeof(reg_action));
+    reg_action.type = UNREGISTER_TCP_SOCKET_TIMER;
+    reg_action.info.timer.user_data = sock_tcp;
+    post_new_reg_action(reg_action);
+}
+
+void event_handler_manager::unregister_socket_timer_and_delete(sockinfo_tcp *sock_tcp)
+{
+    evh_logdbg("Unregistering TCP socket timer and destroying: %p", sock_tcp);
+    reg_action_t reg_action;
+    memset(&reg_action, 0, sizeof(reg_action));
     reg_action.type = UNREGISTER_TCP_SOCKET_TIMER_AND_DELETE;
     reg_action.info.timer.user_data = sock_tcp;
     post_new_reg_action(reg_action);
@@ -447,6 +457,8 @@ const char *event_handler_manager::reg_action_str(event_action_type_e reg_action
     switch (reg_action_type) {
     case REGISTER_TCP_SOCKET_TIMER:
         return "REGISTER_TCP_SOCKET_TIMER";
+    case UNREGISTER_TCP_SOCKET_TIMER:
+        return "UNREGISTER_TCP_SOCKET_TIMER";
     case UNREGISTER_TCP_SOCKET_TIMER_AND_DELETE:
         return "UNREGISTER_TCP_SOCKET_TIMER_AND_DELETE";
     case REGISTER_TIMER:
@@ -729,6 +741,10 @@ void event_handler_manager::handle_registration_action(reg_action_t &reg_action)
         sock = reinterpret_cast<sockinfo_tcp *>(reg_action.info.timer.user_data);
         sock->get_tcp_timer_collection()->add_new_timer(sock);
         break;
+    case UNREGISTER_TCP_SOCKET_TIMER:
+        sock = reinterpret_cast<sockinfo_tcp *>(reg_action.info.timer.user_data);
+        sock->get_tcp_timer_collection()->remove_timer(sock);
+        break;
     case UNREGISTER_TCP_SOCKET_TIMER_AND_DELETE:
         sock = reinterpret_cast<sockinfo_tcp *>(reg_action.info.timer.user_data);
         sock->get_tcp_timer_collection()->remove_timer(sock);

src/core/event/event_handler_manager.h

@@ -54,6 +54,7 @@ typedef std::map<void * /*event_handler_id*/, event_handler_rdma_cm * /*p_event_
 
 typedef enum {
     REGISTER_TCP_SOCKET_TIMER,
+    UNREGISTER_TCP_SOCKET_TIMER,
     UNREGISTER_TCP_SOCKET_TIMER_AND_DELETE,
     REGISTER_TIMER,
     WAKEUP_TIMER, /* NOT AVAILABLE FOR GROUPED TIMERS */
@@ -193,6 +194,7 @@ class event_handler_manager : public wakeup_pipe {
     void unregister_timers_event_and_delete(timer_handler *handler);
 
     void register_socket_timer_event(sockinfo_tcp *sock_tcp);
+    void unregister_socket_timer_event(sockinfo_tcp *sock_tcp);
     void unregister_socket_timer_and_delete(sockinfo_tcp *sock_tcp);
 
     void register_ibverbs_event(int fd, event_handler_ibverbs *handler, void *channel,

src/core/event/poll_group.cpp

@@ -59,6 +59,7 @@ poll_group::poll_group(const struct xlio_poll_group_attr *attr)
     : m_socket_event_cb(attr->socket_event_cb)
     , m_socket_comp_cb(attr->socket_comp_cb)
     , m_socket_rx_cb(attr->socket_rx_cb)
+    , m_socket_accept_cb(attr->socket_accept_cb)
     , m_group_flags(attr->flags)
 {
     /*
@@ -178,7 +179,7 @@ void poll_group::add_socket(sockinfo_tcp *si)
     g_p_fd_collection->set_socket(si->get_fd(), si);
 }
 
-void poll_group::close_socket(sockinfo_tcp *si, bool force /*=false*/)
+void poll_group::remove_socket(sockinfo_tcp *si)
 {
     g_p_fd_collection->clear_socket(si->get_fd());
     m_sockets_list.erase(si);
@@ -187,6 +188,11 @@ void poll_group::close_socket(sockinfo_tcp *si, bool force /*=false*/)
     if (iter != std::end(m_dirty_sockets)) {
         m_dirty_sockets.erase(iter);
     }
+}
+
+void poll_group::close_socket(sockinfo_tcp *si, bool force /*=false*/)
+{
+    remove_socket(si);
 
     bool closed = si->prepare_to_close(force);
     if (closed) {

src/core/event/poll_group.h

@@ -61,6 +61,7 @@ class poll_group {
     void add_ring(ring *rng, ring_alloc_logic_attr *attr);
 
     void add_socket(sockinfo_tcp *si);
+    void remove_socket(sockinfo_tcp *si);
     void close_socket(sockinfo_tcp *si, bool force = false);
 
     unsigned get_flags() const { return m_group_flags; }
@@ -71,6 +72,7 @@ class poll_group {
     xlio_socket_event_cb_t m_socket_event_cb;
     xlio_socket_comp_cb_t m_socket_comp_cb;
     xlio_socket_rx_cb_t m_socket_rx_cb;
+    xlio_socket_accept_cb_t m_socket_accept_cb;
 
 private:
     std::vector<ring *> m_rings;

src/core/sock/sock-extra.cpp

@@ -379,10 +379,15 @@ struct xlio_api_t *extra_api()
         SET_EXTRA_API(xlio_poll_group_poll, xlio_poll_group_poll, XLIO_EXTRA_API_XLIO_SOCKET);
         SET_EXTRA_API(xlio_socket_create, xlio_socket_create, XLIO_EXTRA_API_XLIO_SOCKET);
         SET_EXTRA_API(xlio_socket_destroy, xlio_socket_destroy, XLIO_EXTRA_API_XLIO_SOCKET);
+        SET_EXTRA_API(xlio_socket_update, xlio_socket_update, XLIO_EXTRA_API_XLIO_SOCKET);
         SET_EXTRA_API(xlio_socket_setsockopt, xlio_socket_setsockopt, XLIO_EXTRA_API_XLIO_SOCKET);
+        SET_EXTRA_API(xlio_socket_getpeername, xlio_socket_getpeername, XLIO_EXTRA_API_XLIO_SOCKET);
         SET_EXTRA_API(xlio_socket_bind, xlio_socket_bind, XLIO_EXTRA_API_XLIO_SOCKET);
         SET_EXTRA_API(xlio_socket_connect, xlio_socket_connect, XLIO_EXTRA_API_XLIO_SOCKET);
+        SET_EXTRA_API(xlio_socket_listen, xlio_socket_listen, XLIO_EXTRA_API_XLIO_SOCKET);
         SET_EXTRA_API(xlio_socket_get_pd, xlio_socket_get_pd, XLIO_EXTRA_API_XLIO_SOCKET);
+        SET_EXTRA_API(xlio_socket_detach_group, xlio_socket_detach_group, XLIO_EXTRA_API_XLIO_SOCKET);
+        SET_EXTRA_API(xlio_socket_attach_group, xlio_socket_attach_group, XLIO_EXTRA_API_XLIO_SOCKET);
         SET_EXTRA_API(xlio_socket_send, xlio_socket_send, XLIO_EXTRA_API_XLIO_SOCKET);
         SET_EXTRA_API(xlio_socket_sendv, xlio_socket_sendv, XLIO_EXTRA_API_XLIO_SOCKET);
         SET_EXTRA_API(xlio_poll_group_flush, xlio_poll_group_flush, XLIO_EXTRA_API_XLIO_SOCKET);
@@ -503,6 +508,12 @@ extern "C" int xlio_socket_destroy(xlio_socket_t sock)
     return 0;
 }
 
+extern "C" int xlio_socket_update(xlio_socket_t sock, unsigned flags, uintptr_t userdata_sq)
+{
+    sockinfo_tcp *si = reinterpret_cast<sockinfo_tcp *>(sock);
+    return si->update_xlio_socket(flags, userdata_sq);
+}
+
 extern "C" int xlio_socket_setsockopt(xlio_socket_t sock, int level, int optname,
                                       const void *optval, socklen_t optlen)
 {
@@ -516,6 +527,13 @@ extern "C" int xlio_socket_setsockopt(xlio_socket_t sock, int level, int optname
     return rc;
 }
 
+extern "C" int xlio_socket_getpeername(xlio_socket_t sock, struct sockaddr *addr,
+                                       socklen_t *addrlen)
+{
+    sockinfo_tcp *si = reinterpret_cast<sockinfo_tcp *>(sock);
+    return si->getpeername(addr, addrlen);
+}
+
 extern "C" int xlio_socket_bind(xlio_socket_t sock, const struct sockaddr *addr, socklen_t addrlen)
 {
     sockinfo_tcp *si = reinterpret_cast<sockinfo_tcp *>(sock);
@@ -542,6 +560,18 @@ extern "C" int xlio_socket_connect(xlio_socket_t sock, const struct sockaddr *to
     return rc;
 }
 
+extern "C" int xlio_socket_listen(xlio_socket_t sock)
+{
+    sockinfo_tcp *si = reinterpret_cast<sockinfo_tcp *>(sock);
+    poll_group *group = si->get_poll_group();
+
+    if (!group->m_socket_accept_cb) {
+        errno = ENOTCONN;
+        return -1;
+    }
+    return si->listen(-1);
+}
+
 extern "C" struct ibv_pd *xlio_socket_get_pd(xlio_socket_t sock)
 {
     sockinfo_tcp *si = reinterpret_cast<sockinfo_tcp *>(sock);
@@ -550,6 +580,21 @@ extern "C" struct ibv_pd *xlio_socket_get_pd(xlio_socket_t sock)
     return ctx ? ctx->get_ibv_pd() : nullptr;
 }
 
+int xlio_socket_detach_group(xlio_socket_t sock)
+{
+    sockinfo_tcp *si = reinterpret_cast<sockinfo_tcp *>(sock);
+
+    return si->detach_xlio_group();
+}
+
+int xlio_socket_attach_group(xlio_socket_t sock, xlio_poll_group_t group)
+{
+    sockinfo_tcp *si = reinterpret_cast<sockinfo_tcp *>(sock);
+    poll_group *grp = reinterpret_cast<poll_group *>(group);
+
+    return si->attach_xlio_group(grp);
+}
+
 static void xlio_buf_free(struct xlio_buf *buf)
 {
     mem_buf_desc_t *desc = mem_buf_desc_t::from_xlio_buf(buf);

src/core/sock/sockinfo.cpp

@@ -969,9 +969,7 @@ bool sockinfo::attach_receiver(flow_tuple_with_local_if &flow_key)
     // Registered as receiver successfully
     si_logdbg("Attached %s to ring %p", flow_key.to_str().c_str(), p_nd_resources->p_ring);
 
-    /* Verify 5 tuple over 3 tuple
-     * and replace flow rule with the strongest
-     */
+    // Verify 5 tuple over 3 tuple and replace flow rule with the strongest
     if (flow_key.is_5_tuple()) {
         // Check and remove lesser 3 tuple
         flow_tuple_with_local_if flow_key_3t(