X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Flibmemif%2Fsrc%2Fmain.c;h=b80dd6481b80402021f24302076fd6ea4693d9cb;hb=refs%2Fchanges%2F38%2F25638%2F3;hp=49bf50cb5e04ac44ae4d780db32cf3bdfa315136;hpb=b467b2a02be6ea7bab1a4773523afe8a8e3cfd83;p=vpp.git diff --git a/extras/libmemif/src/main.c b/extras/libmemif/src/main.c index 49bf50cb5e0..b80dd6481b8 100644 --- a/extras/libmemif/src/main.c +++ b/extras/libmemif/src/main.c @@ -15,6 +15,7 @@ *------------------------------------------------------------------ */ +#define _GNU_SOURCE #include #include #include @@ -44,6 +45,7 @@ #include #include #include +#include /* memif protocol msg, ring and descriptor definitions */ #include @@ -54,17 +56,16 @@ /* private structs and functions */ #include -#define ERRLIST_LEN 36 +#define ERRLIST_LEN 40 #define MAX_ERRBUF_LEN 256 #if __x86_x64__ #define MEMIF_MEMORY_BARRIER() __builtin_ia32_sfence () #else -#define MEMIF_MEORY_BARRIER() __sync_synchronize () +#define MEMIF_MEMORY_BARRIER() __sync_synchronize () #endif /* __x86_x64__ */ libmemif_main_t libmemif_main; -int memif_epfd; static char memif_buf[MAX_ERRBUF_LEN]; @@ -72,6 +73,8 @@ const char *memif_errlist[ERRLIST_LEN] = { /* MEMIF_ERR_SUCCESS */ "Success.", /* MEMIF_ERR_SYSCALL */ "Unspecified syscall error (build with -DMEMIF_DBG or make debug).", + /* MEMIF_ERR_CONNREFUSED */ + "Connection refused", /* MEMIF_ERR_ACCES */ "Permission to resoure denied.", /* MEMIF_ERR_NO_FILE */ @@ -139,7 +142,13 @@ const char *memif_errlist[ERRLIST_LEN] = { /* MEMIF_ERR_SUCCESS */ /* MEMIF_ERR_DISCONNECTED */ "Interface is disconnected.", /* MEMIF_ERR_UNKNOWN_MSG */ - "Unknown message type received on control channel. (internal error)" + "Unknown message type received on control channel. (internal error)", + /* MEMIF_ERR_POLL_CANCEL */ + "Memif event polling was canceled.", + /* MEMIF_ERR_MAX_RING */ + "Maximum log2 ring size is 15", + /* MEMIF_ERR_PRIVHDR */ + "Private headers not supported." }; #define MEMIF_ERR_UNDEFINED "undefined error" @@ -161,6 +170,12 @@ memif_strerror (int err_code) return memif_buf; } +uint16_t +memif_get_version () +{ + return MEMIF_VERSION; +} + #define DBG_TX_BUF (0) #define DBG_RX_BUF (1) @@ -181,12 +196,12 @@ print_bytes (void *data, uint16_t len, uint8_t q) } printf ("\n\n"); } -#endif /* MEMIF_DBG */ +#endif /* MEMIF_DBG_SHM */ int memif_syscall_error_handler (int err_code) { - DBG_UNIX ("%s", strerror (err_code)); + DBG ("%s", strerror (err_code)); if (err_code == 0) return MEMIF_ERR_SUCCESS; @@ -198,10 +213,14 @@ memif_syscall_error_handler (int err_code) return MEMIF_ERR_PROC_FILE_LIMIT; if (err_code == ENOMEM) return MEMIF_ERR_NOMEM; -/* connection refused if master dows not exist +/* connection refused if master does not exist this error would spam the user until master was created */ +/* if (err_code == ECONNREFUSED) return MEMIF_ERR_SUCCESS; +*/ + if (err_code == ECONNREFUSED) + return MEMIF_ERR_CONNREFUSED; if (err_code == EALREADY) return MEMIF_ERR_ALREADY; if (err_code == EAGAIN) @@ -215,8 +234,17 @@ memif_syscall_error_handler (int err_code) return MEMIF_ERR_SYSCALL; } +/* Always valid */ +libmemif_main_t * +get_libmemif_main (memif_socket_t * ms) +{ + if (ms != NULL && ms->lm != NULL) + return ms->lm; + return &libmemif_main; +} + static int -memif_add_epoll_fd (int fd, uint32_t events) +memif_add_epoll_fd (libmemif_main_t * lm, int fd, uint32_t events) { if (fd < 0) { @@ -227,7 +255,7 @@ memif_add_epoll_fd (int fd, uint32_t events) memset (&evt, 0, sizeof (evt)); evt.events = events; evt.data.fd = fd; - if (epoll_ctl (memif_epfd, EPOLL_CTL_ADD, fd, &evt) < 0) + if (epoll_ctl (lm->epfd, EPOLL_CTL_ADD, fd, &evt) < 0) { DBG ("epoll_ctl: %s fd %d", strerror (errno), fd); return -1; @@ -237,7 +265,7 @@ memif_add_epoll_fd (int fd, uint32_t events) } static int -memif_mod_epoll_fd (int fd, uint32_t events) +memif_mod_epoll_fd (libmemif_main_t * lm, int fd, uint32_t events) { if (fd < 0) { @@ -248,7 +276,7 @@ memif_mod_epoll_fd (int fd, uint32_t events) memset (&evt, 0, sizeof (evt)); evt.events = events; evt.data.fd = fd; - if (epoll_ctl (memif_epfd, EPOLL_CTL_MOD, fd, &evt) < 0) + if (epoll_ctl (lm->epfd, EPOLL_CTL_MOD, fd, &evt) < 0) { DBG ("epoll_ctl: %s fd %d", strerror (errno), fd); return -1; @@ -258,7 +286,7 @@ memif_mod_epoll_fd (int fd, uint32_t events) } static int -memif_del_epoll_fd (int fd) +memif_del_epoll_fd (libmemif_main_t * lm, int fd) { if (fd < 0) { @@ -267,7 +295,7 @@ memif_del_epoll_fd (int fd) } struct epoll_event evt; memset (&evt, 0, sizeof (evt)); - if (epoll_ctl (memif_epfd, EPOLL_CTL_DEL, fd, &evt) < 0) + if (epoll_ctl (lm->epfd, EPOLL_CTL_DEL, fd, &evt) < 0) { DBG ("epoll_ctl: %s fd %d", strerror (errno), fd); return -1; @@ -277,10 +305,14 @@ memif_del_epoll_fd (int fd) } int -memif_control_fd_update (int fd, uint8_t events) +memif_control_fd_update (int fd, uint8_t events, void *private_ctx) { + libmemif_main_t *lm; + + lm = (private_ctx == NULL) ? &libmemif_main : (libmemif_main_t *) private_ctx; + if (events & MEMIF_FD_EVENT_DEL) - return memif_del_epoll_fd (fd); + return memif_del_epoll_fd (lm, fd); uint32_t evt = 0; if (events & MEMIF_FD_EVENT_READ) @@ -289,17 +321,18 @@ memif_control_fd_update (int fd, uint8_t events) evt |= EPOLLOUT; if (events & MEMIF_FD_EVENT_MOD) - return memif_mod_epoll_fd (fd, evt); + return memif_mod_epoll_fd (lm, fd, evt); - return memif_add_epoll_fd (fd, evt); + return memif_add_epoll_fd (lm, fd, evt); } int -add_list_elt (memif_list_elt_t * e, memif_list_elt_t ** list, uint16_t * len) +add_list_elt (libmemif_main_t * lm, memif_list_elt_t * e, + memif_list_elt_t ** list, uint16_t * len) { - libmemif_main_t *lm = &libmemif_main; - + memif_list_elt_t *tmp; int i; + for (i = 0; i < *len; i++) { if ((*list)[i].data_struct == NULL) @@ -309,8 +342,8 @@ add_list_elt (memif_list_elt_t * e, memif_list_elt_t ** list, uint16_t * len) return i; } } - memif_list_elt_t *tmp; - tmp = realloc (*list, sizeof (memif_list_elt_t) * *len * 2); + + tmp = lm->realloc (*list, sizeof (memif_list_elt_t) * *len * 2); if (tmp == NULL) return -1; @@ -333,12 +366,13 @@ int get_list_elt (memif_list_elt_t ** e, memif_list_elt_t * list, uint16_t len, int key) { + int i; if (key == -1) { *e = NULL; return -1; } - int i; + for (i = 0; i < len; i++) { if (list[i].key == key) @@ -390,57 +424,175 @@ free_list_elt_ctx (memif_list_elt_t * list, uint16_t len, } static void -memif_control_fd_update_register (memif_control_fd_update_t * cb) +memif_control_fd_update_register (libmemif_main_t * lm, + memif_control_fd_update_t * cb) { - libmemif_main_t *lm = &libmemif_main; lm->control_fd_update = cb; } +void +memif_register_external_region (memif_add_external_region_t * ar, + memif_get_external_region_addr_t * gr, + memif_del_external_region_t * dr, + memif_get_external_buffer_offset_t * go) +{ + libmemif_main_t *lm = &libmemif_main; + lm->add_external_region = ar; + lm->get_external_region_addr = gr; + lm->del_external_region = dr; + lm->get_external_buffer_offset = go; +} + +static void +memif_alloc_register (libmemif_main_t * lm, memif_alloc_t * ma) +{ + lm->alloc = ma; +} + +static void +memif_realloc_register (libmemif_main_t * lm, memif_realloc_t * mr) +{ + lm->realloc = mr; +} + +static void +memif_free_register (libmemif_main_t * lm, memif_free_t * mf) +{ + lm->free = mf; +} + +int +memif_set_connection_request_timer (struct itimerspec timer) +{ + libmemif_main_t *lm = &libmemif_main; + int err = MEMIF_ERR_SUCCESS; + + lm->arm = timer; + + /* overwrite timer, if already armed */ + if (lm->disconn_slaves != 0) + { + if (timerfd_settime (lm->timerfd, 0, &lm->arm, NULL) < 0) + { + err = memif_syscall_error_handler (errno); + } + } + return err; +} + +int +memif_per_thread_set_connection_request_timer (memif_per_thread_main_handle_t + pt_main, + struct itimerspec timer) +{ + libmemif_main_t *lm = (libmemif_main_t *) pt_main; + int err = MEMIF_ERR_SUCCESS; + + lm->arm = timer; + + /* overwrite timer, if already armed */ + if (lm->disconn_slaves != 0) + { + if (timerfd_settime (lm->timerfd, 0, &lm->arm, NULL) < 0) + { + err = memif_syscall_error_handler (errno); + } + } + return err; +} + int -memif_init (memif_control_fd_update_t * on_control_fd_update, char *app_name) +memif_init (memif_control_fd_update_t * on_control_fd_update, char *app_name, + memif_alloc_t * memif_alloc, memif_realloc_t * memif_realloc, + memif_free_t * memif_free) { int err = MEMIF_ERR_SUCCESS; /* 0 */ libmemif_main_t *lm = &libmemif_main; + memset (lm, 0, sizeof (libmemif_main_t)); - if (app_name) + /* register custom memory management */ + if (memif_alloc != NULL) { - lm->app_name = malloc (strlen (app_name) + sizeof (char)); - memset (lm->app_name, 0, strlen (app_name) + sizeof (char)); - strncpy ((char *) lm->app_name, app_name, strlen (app_name)); + memif_alloc_register (lm, memif_alloc); + } + else + memif_alloc_register (lm, malloc); + + if (memif_realloc != NULL) + { + memif_realloc_register (lm, memif_realloc); + } + else + memif_realloc_register (lm, realloc); + + if (memif_free != NULL) + memif_free_register (lm, memif_free); + else + memif_free_register (lm, free); + + if (app_name != NULL) + { + uint8_t len = (strlen (app_name) > MEMIF_NAME_LEN) + ? strlen (app_name) : MEMIF_NAME_LEN; + strncpy ((char *) lm->app_name, app_name, len); } else { - lm->app_name = malloc (strlen (MEMIF_DEFAULT_APP_NAME) + sizeof (char)); - memset (lm->app_name, 0, strlen (app_name) + sizeof (char)); strncpy ((char *) lm->app_name, MEMIF_DEFAULT_APP_NAME, strlen (MEMIF_DEFAULT_APP_NAME)); } + lm->poll_cancel_fd = -1; /* register control fd update callback */ if (on_control_fd_update != NULL) - memif_control_fd_update_register (on_control_fd_update); + memif_control_fd_update_register (lm, on_control_fd_update); else { - memif_epfd = epoll_create (1); - memif_control_fd_update_register (memif_control_fd_update); + lm->epfd = epoll_create (1); + memif_control_fd_update_register (lm, memif_control_fd_update); + if ((lm->poll_cancel_fd = eventfd (0, EFD_NONBLOCK)) < 0) + { + err = errno; + DBG ("eventfd: %s", strerror (err)); + return memif_syscall_error_handler (err); + } + lm->control_fd_update (lm->poll_cancel_fd, MEMIF_FD_EVENT_READ, lm->private_ctx); DBG ("libmemif event polling initialized"); } - memset (&lm->ms, 0, sizeof (memif_socket_t)); - lm->control_list_len = 2; lm->interrupt_list_len = 2; - lm->listener_list_len = 1; + lm->socket_list_len = 1; lm->pending_list_len = 1; lm->control_list = - malloc (sizeof (memif_list_elt_t) * lm->control_list_len); + lm->alloc (sizeof (memif_list_elt_t) * lm->control_list_len); + if (lm->control_list == NULL) + { + err = MEMIF_ERR_NOMEM; + goto error; + } lm->interrupt_list = - malloc (sizeof (memif_list_elt_t) * lm->interrupt_list_len); - lm->listener_list = - malloc (sizeof (memif_list_elt_t) * lm->listener_list_len); + lm->alloc (sizeof (memif_list_elt_t) * lm->interrupt_list_len); + if (lm->interrupt_list == NULL) + { + err = MEMIF_ERR_NOMEM; + goto error; + } + lm->socket_list = + lm->alloc (sizeof (memif_list_elt_t) * lm->socket_list_len); + if (lm->socket_list == NULL) + { + err = MEMIF_ERR_NOMEM; + goto error; + } lm->pending_list = - malloc (sizeof (memif_list_elt_t) * lm->pending_list_len); + lm->alloc (sizeof (memif_list_elt_t) * lm->pending_list_len); + if (lm->pending_list == NULL) + { + err = MEMIF_ERR_NOMEM; + goto error; + } int i; for (i = 0; i < lm->control_list_len; i++) @@ -453,10 +605,10 @@ memif_init (memif_control_fd_update_t * on_control_fd_update, char *app_name) lm->interrupt_list[i].key = -1; lm->interrupt_list[i].data_struct = NULL; } - for (i = 0; i < lm->listener_list_len; i++) + for (i = 0; i < lm->socket_list_len; i++) { - lm->listener_list[i].key = -1; - lm->listener_list[i].data_struct = NULL; + lm->socket_list[i].key = -1; + lm->socket_list[i].data_struct = NULL; } for (i = 0; i < lm->pending_list_len; i++) { @@ -469,24 +621,204 @@ memif_init (memif_control_fd_update_t * on_control_fd_update, char *app_name) lm->timerfd = timerfd_create (CLOCK_REALTIME, TFD_NONBLOCK); if (lm->timerfd < 0) { - err = errno; - DBG ("timerfd: %s", strerror (err)); - return memif_syscall_error_handler (err); + err = memif_syscall_error_handler (errno); + goto error; } - lm->arm.it_value.tv_sec = 2; - lm->arm.it_value.tv_nsec = 0; - lm->arm.it_interval.tv_sec = 2; - lm->arm.it_interval.tv_nsec = 0; - memset (&lm->disarm, 0, sizeof (lm->disarm)); + lm->arm.it_value.tv_sec = MEMIF_DEFAULT_RECONNECT_PERIOD_SEC; + lm->arm.it_value.tv_nsec = MEMIF_DEFAULT_RECONNECT_PERIOD_NSEC; + lm->arm.it_interval.tv_sec = MEMIF_DEFAULT_RECONNECT_PERIOD_SEC; + lm->arm.it_interval.tv_nsec = MEMIF_DEFAULT_RECONNECT_PERIOD_NSEC; - if (lm->control_fd_update (lm->timerfd, MEMIF_FD_EVENT_READ) < 0) + if (lm->control_fd_update (lm->timerfd, MEMIF_FD_EVENT_READ, lm->private_ctx) < 0) { DBG ("callback type memif_control_fd_update_t error!"); - return MEMIF_ERR_CB_FDUPDATE; + err = MEMIF_ERR_CB_FDUPDATE; + goto error; } - return 0; + /* Create default socket */ + err = memif_create_socket ((memif_socket_handle_t *) & + lm->default_socket, + MEMIF_DEFAULT_SOCKET_PATH, NULL); + if (err != MEMIF_ERR_SUCCESS) + goto error; + + return err; + +error: + memif_cleanup (); + return err; +} + +int +memif_per_thread_init (memif_per_thread_main_handle_t * pt_main, + void *private_ctx, + memif_control_fd_update_t * on_control_fd_update, + char *app_name, memif_alloc_t * memif_alloc, + memif_realloc_t * memif_realloc, + memif_free_t * memif_free) +{ + memif_err_t err = MEMIF_ERR_SUCCESS; + int i; + libmemif_main_t *lm; + + /* Allocate unique libmemif main */ + if (memif_alloc != NULL) + lm = memif_alloc (sizeof (libmemif_main_t)); + else + lm = malloc (sizeof (libmemif_main_t)); + + if (lm == NULL) + return MEMIF_ERR_NOMEM; + + memset (lm, 0, sizeof (libmemif_main_t)); + + /* register custom memory management */ + if (memif_alloc != NULL) + { + memif_alloc_register (lm, memif_alloc); + } + else + memif_alloc_register (lm, malloc); + + if (memif_realloc != NULL) + { + memif_realloc_register (lm, memif_realloc); + } + else + memif_realloc_register (lm, realloc); + + if (memif_free != NULL) + memif_free_register (lm, memif_free); + else + memif_free_register (lm, free); + + lm->private_ctx = private_ctx; + + /* set app name */ + if (app_name != NULL) + { + uint8_t len = (strlen (app_name) > MEMIF_NAME_LEN) + ? strlen (app_name) : MEMIF_NAME_LEN; + strncpy ((char *) lm->app_name, app_name, len); + } + else + { + strncpy ((char *) lm->app_name, MEMIF_DEFAULT_APP_NAME, + strlen (MEMIF_DEFAULT_APP_NAME)); + } + + lm->poll_cancel_fd = -1; + /* register control fd update callback */ + if (on_control_fd_update != NULL) + memif_control_fd_update_register (lm, on_control_fd_update); + else + { + /* private_ctx only used internally by memif_control_fd_update + * pointer to this libmemif main + */ + lm->private_ctx = lm; + lm->epfd = epoll_create (1); + memif_control_fd_update_register (lm, memif_control_fd_update); + if ((lm->poll_cancel_fd = eventfd (0, EFD_NONBLOCK)) < 0) + { + err = errno; + DBG ("eventfd: %s", strerror (err)); + return memif_syscall_error_handler (err); + } + lm->control_fd_update (lm->poll_cancel_fd, MEMIF_FD_EVENT_READ, + lm->private_ctx); + DBG ("libmemif event polling initialized"); + } + + /* Initialize lists */ + lm->control_list_len = 2; + lm->interrupt_list_len = 2; + lm->socket_list_len = 1; + lm->pending_list_len = 1; + + lm->control_list = + lm->alloc (sizeof (memif_list_elt_t) * lm->control_list_len); + if (lm->control_list == NULL) + { + err = MEMIF_ERR_NOMEM; + goto error; + } + lm->interrupt_list = + lm->alloc (sizeof (memif_list_elt_t) * lm->interrupt_list_len); + if (lm->interrupt_list == NULL) + { + err = MEMIF_ERR_NOMEM; + goto error; + } + lm->socket_list = + lm->alloc (sizeof (memif_list_elt_t) * lm->socket_list_len); + if (lm->socket_list == NULL) + { + err = MEMIF_ERR_NOMEM; + goto error; + } + lm->pending_list = + lm->alloc (sizeof (memif_list_elt_t) * lm->pending_list_len); + if (lm->pending_list == NULL) + { + err = MEMIF_ERR_NOMEM; + goto error; + } + + for (i = 0; i < lm->control_list_len; i++) + { + lm->control_list[i].key = -1; + lm->control_list[i].data_struct = NULL; + } + for (i = 0; i < lm->interrupt_list_len; i++) + { + lm->interrupt_list[i].key = -1; + lm->interrupt_list[i].data_struct = NULL; + } + for (i = 0; i < lm->socket_list_len; i++) + { + lm->socket_list[i].key = -1; + lm->socket_list[i].data_struct = NULL; + } + for (i = 0; i < lm->pending_list_len; i++) + { + lm->pending_list[i].key = -1; + lm->pending_list[i].data_struct = NULL; + } + + /* Initialize autoconnect */ + lm->disconn_slaves = 0; + + lm->timerfd = timerfd_create (CLOCK_REALTIME, TFD_NONBLOCK); + if (lm->timerfd < 0) + { + err = memif_syscall_error_handler (errno); + goto error; + } + + lm->arm.it_value.tv_sec = MEMIF_DEFAULT_RECONNECT_PERIOD_SEC; + lm->arm.it_value.tv_nsec = MEMIF_DEFAULT_RECONNECT_PERIOD_NSEC; + lm->arm.it_interval.tv_sec = MEMIF_DEFAULT_RECONNECT_PERIOD_SEC; + lm->arm.it_interval.tv_nsec = MEMIF_DEFAULT_RECONNECT_PERIOD_NSEC; + + if (lm->control_fd_update (lm->timerfd, MEMIF_FD_EVENT_READ, + lm->private_ctx) < 0) + { + DBG ("callback type memif_control_fd_update_t error!"); + err = MEMIF_ERR_CB_FDUPDATE; + goto error; + } + + *pt_main = lm; + + return err; + +error: + *pt_main = lm; + memif_per_thread_cleanup (pt_main); + return err; } static inline memif_ring_t * @@ -495,7 +827,7 @@ memif_get_ring (memif_connection_t * conn, memif_ring_type_t type, { if (&conn->regions[0] == NULL) return NULL; - void *p = conn->regions[0].shm; + void *p = conn->regions[0].addr; int ring_size = sizeof (memif_ring_t) + sizeof (memif_desc_t) * (1 << conn->run_args.log2_ring_size); @@ -522,254 +854,459 @@ memif_set_rx_mode (memif_conn_handle_t c, memif_rx_mode_t rx_mode, return MEMIF_ERR_SUCCESS; } -int -memif_create (memif_conn_handle_t * c, memif_conn_args_t * args, - memif_connection_update_t * on_connect, - memif_connection_update_t * on_disconnect, - memif_interrupt_t * on_interrupt, void *private_ctx) +static int +memif_socket_start_listening (memif_socket_t * ms) { - int err, i, index, sockfd = -1; - memif_list_elt_t list_elt; - memif_connection_t *conn = (memif_connection_t *) * c; - if (conn != NULL) + libmemif_main_t *lm = get_libmemif_main (ms); + memif_list_elt_t elt; + struct stat file_stat; + struct sockaddr_un un = { 0 }; + int on = 1; + int err = MEMIF_ERR_SUCCESS; + + if (ms->type == MEMIF_SOCKET_TYPE_CLIENT) + return MEMIF_ERR_INVAL_ARG; + + /* check if file exists */ + if (stat ((char *) ms->filename, &file_stat) == 0) { - DBG ("This handle already points to existing memif."); - return MEMIF_ERR_CONN; + if (S_ISSOCK (file_stat.st_mode)) + unlink ((char *) ms->filename); + else + return memif_syscall_error_handler (errno); } - conn = (memif_connection_t *) malloc (sizeof (memif_connection_t)); - if (conn == NULL) + + ms->fd = socket (AF_UNIX, SOCK_SEQPACKET, 0); + if (ms->fd < 0) { err = memif_syscall_error_handler (errno); goto error; } - memset (conn, 0, sizeof (memif_connection_t)); - libmemif_main_t *lm = &libmemif_main; + DBG ("socket %d created", ms->fd); + un.sun_family = AF_UNIX; + strncpy ((char *) un.sun_path, (char *) ms->filename, + sizeof (un.sun_path) - 1); + if (setsockopt (ms->fd, SOL_SOCKET, SO_PASSCRED, &on, sizeof (on)) < 0) + { + err = memif_syscall_error_handler (errno); + goto error; + } + if (bind (ms->fd, (struct sockaddr *) &un, sizeof (un)) < 0) + { + err = memif_syscall_error_handler (errno); + goto error; + } + if (listen (ms->fd, 1) < 0) + { + err = memif_syscall_error_handler (errno); + goto error; + } + if (stat ((char *) ms->filename, &file_stat) < 0) + { + err = memif_syscall_error_handler (errno); + goto error; + } - conn->args.interface_id = args->interface_id; + /* add socket to libmemif main */ + elt.key = ms->fd; + elt.data_struct = ms; + add_list_elt (lm, &elt, &lm->socket_list, &lm->socket_list_len); + /* if lm->private_ctx == lm event polling is done by libmemif */ + lm->control_fd_update (ms->fd, MEMIF_FD_EVENT_READ, lm->private_ctx); - if (args->log2_ring_size == 0) - args->log2_ring_size = MEMIF_DEFAULT_LOG2_RING_SIZE; - if (args->buffer_size == 0) - args->buffer_size = MEMIF_DEFAULT_BUFFER_SIZE; - if (args->num_s2m_rings == 0) - args->num_s2m_rings = MEMIF_DEFAULT_TX_QUEUES; - if (args->num_m2s_rings == 0) - args->num_m2s_rings = MEMIF_DEFAULT_RX_QUEUES; + ms->type = MEMIF_SOCKET_TYPE_LISTENER; - conn->args.num_s2m_rings = args->num_s2m_rings; - conn->args.num_m2s_rings = args->num_m2s_rings; - conn->args.buffer_size = args->buffer_size; - conn->args.log2_ring_size = args->log2_ring_size; - conn->args.is_master = args->is_master; - conn->args.mode = args->mode; - conn->msg_queue = NULL; - conn->regions = NULL; - conn->tx_queues = NULL; - conn->rx_queues = NULL; - conn->fd = -1; - conn->on_connect = on_connect; - conn->on_disconnect = on_disconnect; - conn->on_interrupt = on_interrupt; - conn->private_ctx = private_ctx; - memset (&conn->run_args, 0, sizeof (memif_conn_run_args_t)); + return err; - uint8_t l = strlen ((char *) args->interface_name); - strncpy ((char *) conn->args.interface_name, (char *) args->interface_name, - l); +error: + if (ms->fd > 0) + { + close (ms->fd); + ms->fd = -1; + } + return err; +} - l = strlen ((char *) args->instance_name); - strncpy ((char *) conn->args.instance_name, (char *) args->instance_name, - l); +int +memif_create_socket (memif_socket_handle_t * sock, const char *filename, + void *private_ctx) +{ + libmemif_main_t *lm = &libmemif_main; + memif_socket_t *ms = (memif_socket_t *) * sock; + int i, err = MEMIF_ERR_SUCCESS; - /* allocate and initialize socket_filename so it can be copyed to sun_path - without memory leaks */ - conn->args.socket_filename = malloc (sizeof (char *) * 108); - memset (conn->args.socket_filename, 0, 108 * sizeof (char *)); + for (i = 0; i < lm->socket_list_len; i++) + { + if ((ms = (memif_socket_t *) lm->socket_list[i].data_struct) != NULL) + { + if (strncmp ((char *) ms->filename, filename, + strlen ((char *) ms->filename)) == 0) + return MEMIF_ERR_INVAL_ARG; + } + } - if (args->socket_filename) + /* allocate memif_socket_t */ + ms = NULL; + ms = lm->alloc (sizeof (memif_socket_t)); + if (ms == NULL) + { + err = MEMIF_ERR_NOMEM; + goto error; + } + memset (ms, 0, sizeof (memif_socket_t)); + /* set filename */ + ms->filename = lm->alloc (strlen (filename) + sizeof (char)); + if (ms->filename == NULL) { - if (conn->args.socket_filename == NULL) + err = MEMIF_ERR_NOMEM; + goto error; + } + memset (ms->filename, 0, strlen (filename) + sizeof (char)); + strncpy ((char *) ms->filename, filename, strlen (filename)); + + ms->type = MEMIF_SOCKET_TYPE_NONE; + + ms->interface_list_len = 1; + ms->interface_list = + lm->alloc (sizeof (memif_list_elt_t) * ms->interface_list_len); + if (ms->interface_list == NULL) + { + err = MEMIF_ERR_NOMEM; + goto error; + } + ms->interface_list[0].key = -1; + ms->interface_list[0].data_struct = NULL; + + *sock = ms; + + return err; + +error: + if (ms != NULL) + { + if (ms->filename != NULL) { - err = memif_syscall_error_handler (errno); - goto error; + lm->free (ms->filename); + ms->filename = NULL; + } + if (ms->fd > 0) + { + close (ms->fd); + ms->fd = -1; } - strncpy ((char *) conn->args.socket_filename, - (char *) args->socket_filename, - strlen ((char *) args->socket_filename)); + if (ms->interface_list != NULL) + { + lm->free (ms->interface_list); + ms->interface_list = NULL; + ms->interface_list_len = 0; + } + lm->free (ms); + *sock = ms = NULL; } - else + return err; +} + +int +memif_per_thread_create_socket (memif_per_thread_main_handle_t pt_main, + memif_socket_handle_t * sock, + const char *filename, void *private_ctx) +{ + libmemif_main_t *lm = (libmemif_main_t *) pt_main; + memif_socket_t *ms = (memif_socket_t *) * sock; + int i, err = MEMIF_ERR_SUCCESS; + + if (lm == NULL) + return MEMIF_ERR_INVAL_ARG; + + for (i = 0; i < lm->socket_list_len; i++) { - uint16_t sdl = strlen (MEMIF_DEFAULT_SOCKET_DIR); - uint16_t sfl = strlen (MEMIF_DEFAULT_SOCKET_FILENAME); - if (conn->args.socket_filename == NULL) + if ((ms = (memif_socket_t *) lm->socket_list[i].data_struct) != NULL) { - err = memif_syscall_error_handler (errno); - goto error; + if (strncmp ((char *) ms->filename, filename, + strlen ((char *) ms->filename)) == 0) + return MEMIF_ERR_INVAL_ARG; } - strncpy ((char *) conn->args.socket_filename, - MEMIF_DEFAULT_SOCKET_DIR, sdl); - conn->args.socket_filename[sdl] = '/'; - strncpy ((char *) (conn->args.socket_filename + 1 + sdl), - MEMIF_DEFAULT_SOCKET_FILENAME, sfl); } - if (args->secret) + /* allocate memif_socket_t */ + ms = NULL; + ms = lm->alloc (sizeof (memif_socket_t)); + if (ms == NULL) { - l = strlen ((char *) args->secret); - strncpy ((char *) conn->args.secret, (char *) args->secret, l); + err = MEMIF_ERR_NOMEM; + goto error; + } + memset (ms, 0, sizeof (memif_socket_t)); + ms->lm = lm; + /* set filename */ + ms->filename = lm->alloc (strlen (filename) + sizeof (char)); + if (ms->filename == NULL) + { + err = MEMIF_ERR_NOMEM; + goto error; } + memset (ms->filename, 0, strlen (filename) + sizeof (char)); + strncpy ((char *) ms->filename, filename, strlen (filename)); - if (conn->args.is_master) + ms->type = MEMIF_SOCKET_TYPE_NONE; + + ms->interface_list_len = 1; + ms->interface_list = + lm->alloc (sizeof (memif_list_elt_t) * ms->interface_list_len); + if (ms->interface_list == NULL) + { + err = MEMIF_ERR_NOMEM; + goto error; + } + ms->interface_list[0].key = -1; + ms->interface_list[0].data_struct = NULL; + + *sock = ms; + + return err; + +error: + if (ms != NULL) { - conn->run_args.buffer_size = conn->args.buffer_size; - memif_socket_t *ms; - memif_list_elt_t elt; - for (i = 0; i < lm->listener_list_len; i++) + if (ms->filename != NULL) { - if ((ms = - (memif_socket_t *) lm->listener_list[i].data_struct) != NULL) - { - if (strncmp - ((char *) ms->filename, (char *) conn->args.socket_filename, - strlen ((char *) ms->filename)) == 0) - { - /* add interface to listener socket */ - elt.key = conn->args.interface_id; - *c = elt.data_struct = conn; - add_list_elt (&elt, &ms->interface_list, - &ms->interface_list_len); - ms->use_count++; - conn->listener_fd = ms->fd; - break; - } - } - else - { - struct stat file_stat; - if (stat ((char *) conn->args.socket_filename, &file_stat) == 0) - { - if (S_ISSOCK (file_stat.st_mode)) - unlink ((char *) conn->args.socket_filename); - else - return memif_syscall_error_handler (errno); - } - DBG ("creating socket file"); - ms = malloc (sizeof (memif_socket_t)); - ms->filename = - malloc (strlen ((char *) conn->args.socket_filename) + - sizeof (char)); - memset (ms->filename, 0, - strlen ((char *) conn->args.socket_filename) + - sizeof (char)); - strncpy ((char *) ms->filename, - (char *) conn->args.socket_filename, - strlen ((char *) conn->args.socket_filename)); - ms->interface_list_len = 1; - ms->interface_list = - malloc (sizeof (memif_list_elt_t) * ms->interface_list_len); - ms->interface_list[0].key = -1; - ms->interface_list[0].data_struct = NULL; - struct sockaddr_un un = { 0 }; - int on = 1; - - ms->fd = socket (AF_UNIX, SOCK_SEQPACKET, 0); - if (ms->fd < 0) - { - err = memif_syscall_error_handler (errno); - goto error; - } - DBG ("socket %d created", ms->fd); - un.sun_family = AF_UNIX; - strncpy ((char *) un.sun_path, (char *) ms->filename, - sizeof (un.sun_path) - 1); - DBG ("sockopt"); - if (setsockopt - (ms->fd, SOL_SOCKET, SO_PASSCRED, &on, sizeof (on)) < 0) - { - err = memif_syscall_error_handler (errno); - goto error; - } - DBG ("bind"); - if (bind (ms->fd, (struct sockaddr *) &un, sizeof (un)) < 0) - { - err = memif_syscall_error_handler (errno); - goto error; - } - DBG ("listen"); - if (listen (ms->fd, 1) < 0) - { - err = memif_syscall_error_handler (errno); - goto error; - } - DBG ("stat"); - if (stat ((char *) ms->filename, &file_stat) < 0) - { - err = memif_syscall_error_handler (errno); - goto error; - } + lm->free (ms->filename); + ms->filename = NULL; + } + if (ms->fd > 0) + { + close (ms->fd); + ms->fd = -1; + } + if (ms->interface_list != NULL) + { + lm->free (ms->interface_list); + ms->interface_list = NULL; + ms->interface_list_len = 0; + } + lm->free (ms); + *sock = ms = NULL; + } + return err; +} - /* add interface to listener socket */ - elt.key = conn->args.interface_id; - *c = elt.data_struct = conn; - add_list_elt (&elt, &ms->interface_list, - &ms->interface_list_len); - ms->use_count = 1; - conn->listener_fd = ms->fd; - - /* add listener socket to libmemif main */ - elt.key = ms->fd; - elt.data_struct = ms; - add_list_elt (&elt, &lm->listener_list, &lm->listener_list_len); - lm->control_fd_update (ms->fd, MEMIF_FD_EVENT_READ); - break; - } +int +memif_create (memif_conn_handle_t * c, memif_conn_args_t * args, + memif_connection_update_t * on_connect, + memif_connection_update_t * on_disconnect, + memif_interrupt_t * on_interrupt, void *private_ctx) +{ + libmemif_main_t *lm = get_libmemif_main (args->socket); + int err, index = 0; + memif_list_elt_t elt; + memif_connection_t *conn = (memif_connection_t *) * c; + memif_socket_t *ms; + + if (conn != NULL) + { + DBG ("This handle already points to existing memif."); + return MEMIF_ERR_CONN; + } + + conn = (memif_connection_t *) lm->alloc (sizeof (memif_connection_t)); + if (conn == NULL) + { + err = MEMIF_ERR_NOMEM; + goto error; + } + memset (conn, 0, sizeof (memif_connection_t)); + + conn->args.interface_id = args->interface_id; + + if (args->log2_ring_size == 0) + args->log2_ring_size = MEMIF_DEFAULT_LOG2_RING_SIZE; + else if (args->log2_ring_size > MEMIF_MAX_LOG2_RING_SIZE) + { + err = MEMIF_ERR_MAX_RING; + goto error; + } + if (args->buffer_size == 0) + args->buffer_size = MEMIF_DEFAULT_BUFFER_SIZE; + if (args->num_s2m_rings == 0) + args->num_s2m_rings = MEMIF_DEFAULT_TX_QUEUES; + if (args->num_m2s_rings == 0) + args->num_m2s_rings = MEMIF_DEFAULT_RX_QUEUES; + + conn->args.num_s2m_rings = args->num_s2m_rings; + conn->args.num_m2s_rings = args->num_m2s_rings; + conn->args.buffer_size = args->buffer_size; + conn->args.log2_ring_size = args->log2_ring_size; + conn->args.is_master = args->is_master; + conn->args.mode = args->mode; + conn->msg_queue = NULL; + conn->regions = NULL; + conn->tx_queues = NULL; + conn->rx_queues = NULL; + conn->fd = -1; + conn->on_connect = on_connect; + conn->on_disconnect = on_disconnect; + conn->on_interrupt = on_interrupt; + conn->private_ctx = private_ctx; + memset (&conn->run_args, 0, sizeof (memif_conn_run_args_t)); + + uint8_t l = strlen ((char *) args->interface_name); + strncpy ((char *) conn->args.interface_name, (char *) args->interface_name, + l); + + if ((l = strlen ((char *) args->secret)) > 0) + strncpy ((char *) conn->args.secret, (char *) args->secret, l); + + if (args->socket != NULL) + conn->args.socket = args->socket; + else if (lm->default_socket != NULL) + conn->args.socket = lm->default_socket; + else + { + err = MEMIF_ERR_INVAL_ARG; + goto error; + } + + ms = (memif_socket_t *) conn->args.socket; + + if ((conn->args.is_master && ms->type == MEMIF_SOCKET_TYPE_CLIENT) || + (!conn->args.is_master && ms->type == MEMIF_SOCKET_TYPE_LISTENER)) + { + err = MEMIF_ERR_INVAL_ARG; + goto error; + } + + elt.key = conn->args.interface_id; + elt.data_struct = conn; + add_list_elt (lm, &elt, &ms->interface_list, &ms->interface_list_len); + ms->use_count++; + + if (conn->args.is_master) + { + if (ms->type == MEMIF_SOCKET_TYPE_NONE) + { + err = memif_socket_start_listening (ms); + if (err != MEMIF_ERR_SUCCESS) + goto error; } } else { - if (lm->disconn_slaves == 0) + elt.key = -1; + elt.data_struct = conn; + if ((index = + add_list_elt (lm, &elt, &lm->control_list, + &lm->control_list_len)) < 0) + { + err = MEMIF_ERR_NOMEM; + goto error; + } + + conn->index = index; + + /* try connectiong to master */ + err = memif_request_connection (conn); + if ((err != MEMIF_ERR_SUCCESS) && (lm->disconn_slaves == 0)) { + /* connection failed, arm reconnect timer (if not armed) */ if (timerfd_settime (lm->timerfd, 0, &lm->arm, NULL) < 0) { err = memif_syscall_error_handler (errno); goto error; } } - lm->disconn_slaves++; + } - list_elt.key = -1; - *c = list_elt.data_struct = conn; - if ((index = - add_list_elt (&list_elt, &lm->control_list, - &lm->control_list_len)) < 0) + *c = conn; + + return 0; + +error: + if (conn != NULL) + lm->free (conn); + *c = conn = NULL; + return err; +} + +int +memif_request_connection (memif_conn_handle_t c) +{ + memif_connection_t *conn = (memif_connection_t *) c; + libmemif_main_t *lm; + memif_socket_t *ms; + int err = MEMIF_ERR_SUCCESS; + int sockfd = -1; + struct sockaddr_un sun; + + if (conn == NULL) + return MEMIF_ERR_NOCONN; + + ms = (memif_socket_t *) conn->args.socket; + lm = get_libmemif_main (ms); + + + if (conn->args.is_master || ms->type == MEMIF_SOCKET_TYPE_LISTENER) + return MEMIF_ERR_INVAL_ARG; + if (conn->fd > 0) + return MEMIF_ERR_ALRCONN; + + sockfd = socket (AF_UNIX, SOCK_SEQPACKET, 0); + if (sockfd < 0) + { + err = memif_syscall_error_handler (errno); + goto error; + } + + sun.sun_family = AF_UNIX; + + strncpy (sun.sun_path, (char *) ms->filename, sizeof (sun.sun_path) - 1); + + if (connect (sockfd, (struct sockaddr *) &sun, + sizeof (struct sockaddr_un)) == 0) + { + conn->fd = sockfd; + conn->read_fn = memif_conn_fd_read_ready; + conn->write_fn = memif_conn_fd_write_ready; + conn->error_fn = memif_conn_fd_error; + + lm->control_list[conn->index].key = conn->fd; + lm->control_fd_update (sockfd, + MEMIF_FD_EVENT_READ | + MEMIF_FD_EVENT_WRITE, lm->private_ctx); + + lm->disconn_slaves--; + if (lm->disconn_slaves == 0) { - err = MEMIF_ERR_NOMEM; - goto error; + if (timerfd_settime (lm->timerfd, 0, &lm->disarm, NULL) < 0) + { + err = memif_syscall_error_handler (errno); + return err; + } } } + else + { + err = memif_syscall_error_handler (errno); + strcpy ((char *) conn->remote_disconnect_string, memif_strerror (err)); + goto error; + } - conn->index = index; + ms->type = MEMIF_SOCKET_TYPE_CLIENT; - return 0; + return err; error: if (sockfd > 0) close (sockfd); sockfd = -1; - if (conn->args.socket_filename) - free (conn->args.socket_filename); - if (conn != NULL) - free (conn); - *c = conn = NULL; return err; } int memif_control_fd_handler (int fd, uint8_t events) { - int i, rv, sockfd = -1, err = MEMIF_ERR_SUCCESS; /* 0 */ + int i, err = MEMIF_ERR_SUCCESS; /* 0 */ uint16_t num; memif_list_elt_t *e = NULL; memif_connection_t *conn; @@ -779,6 +1316,10 @@ memif_control_fd_handler (int fd, uint8_t events) uint64_t b; ssize_t size; size = read (fd, &b, sizeof (b)); + + if (size == -1) + goto error; + for (i = 0; i < lm->control_list_len; i++) { if ((lm->control_list[i].key < 0) @@ -787,50 +1328,123 @@ memif_control_fd_handler (int fd, uint8_t events) conn = lm->control_list[i].data_struct; if (conn->args.is_master) continue; - - struct sockaddr_un sun; - sockfd = socket (AF_UNIX, SOCK_SEQPACKET, 0); - if (sockfd < 0) + err = memif_request_connection (conn); + if (err != MEMIF_ERR_SUCCESS) + DBG ("memif_request_connection: %s", memif_strerror (err)); + } + } + } + else + { + get_list_elt (&e, lm->interrupt_list, lm->interrupt_list_len, fd); + if (e != NULL) + { + if (((memif_connection_t *) e->data_struct)->on_interrupt != NULL) + { + num = + (((memif_connection_t *) e->data_struct)-> + args.is_master) ? ((memif_connection_t *) e-> + data_struct)->run_args. + num_s2m_rings : ((memif_connection_t *) e->data_struct)-> + run_args.num_m2s_rings; + for (i = 0; i < num; i++) { - err = memif_syscall_error_handler (errno); - goto error; + if (((memif_connection_t *) e->data_struct)-> + rx_queues[i].int_fd == fd) + { + ((memif_connection_t *) e->data_struct)-> + on_interrupt ((void *) e->data_struct, + ((memif_connection_t *) e-> + data_struct)->private_ctx, i); + return MEMIF_ERR_SUCCESS; + } } + } + return MEMIF_ERR_SUCCESS; + } + get_list_elt (&e, lm->socket_list, lm->socket_list_len, fd); + if (e != NULL + && ((memif_socket_t *) e->data_struct)->type == + MEMIF_SOCKET_TYPE_LISTENER) + { + err = + memif_conn_fd_accept_ready ((memif_socket_t *) e->data_struct); + return err; + } - sun.sun_family = AF_UNIX; + get_list_elt (&e, lm->pending_list, lm->pending_list_len, fd); + if (e != NULL) + { + err = memif_read_ready (lm, fd); + return err; + } - strncpy (sun.sun_path, conn->args.socket_filename, - sizeof (sun.sun_path) - 1); + get_list_elt (&e, lm->control_list, lm->control_list_len, fd); + if (e != NULL) + { + if (events & MEMIF_FD_EVENT_READ) + { + err = + ((memif_connection_t *) e->data_struct)-> + read_fn (e->data_struct); + if (err != MEMIF_ERR_SUCCESS) + return err; + } + if (events & MEMIF_FD_EVENT_WRITE) + { + err = + ((memif_connection_t *) e->data_struct)-> + write_fn (e->data_struct); + if (err != MEMIF_ERR_SUCCESS) + return err; + } + if (events & MEMIF_FD_EVENT_ERROR) + { + err = + ((memif_connection_t *) e->data_struct)-> + error_fn (e->data_struct); + if (err != MEMIF_ERR_SUCCESS) + return err; + } + } + } - if (connect (sockfd, (struct sockaddr *) &sun, - sizeof (struct sockaddr_un)) == 0) - { - conn->fd = sockfd; - conn->read_fn = memif_conn_fd_read_ready; - conn->write_fn = memif_conn_fd_write_ready; - conn->error_fn = memif_conn_fd_error; + return MEMIF_ERR_SUCCESS; /* 0 */ - lm->control_list[conn->index].key = conn->fd; +error: + return err; +} - lm->control_fd_update (sockfd, - MEMIF_FD_EVENT_READ | - MEMIF_FD_EVENT_WRITE); +int +memif_per_thread_control_fd_handler (memif_per_thread_main_handle_t pt_main, + int fd, uint8_t events) +{ + int i, err = MEMIF_ERR_SUCCESS; /* 0 */ + uint16_t num; + memif_list_elt_t *e = NULL; + memif_connection_t *conn; + libmemif_main_t *lm = (libmemif_main_t *) pt_main; - lm->disconn_slaves--; - if (lm->disconn_slaves == 0) - { - if (timerfd_settime (lm->timerfd, 0, &lm->disarm, NULL) - < 0) - { - err = memif_syscall_error_handler (errno); - goto error; - } - } - } - else - { - err = memif_syscall_error_handler (errno); - goto error; - } + if (fd == lm->timerfd) + { + uint64_t b; + ssize_t size; + size = read (fd, &b, sizeof (b)); + + if (size == -1) + goto error; + + for (i = 0; i < lm->control_list_len; i++) + { + if ((lm->control_list[i].key < 0) + && (lm->control_list[i].data_struct != NULL)) + { + conn = lm->control_list[i].data_struct; + if (conn->args.is_master) + continue; + err = memif_request_connection (conn); + if (err != MEMIF_ERR_SUCCESS) + DBG ("memif_request_connection: %s", memif_strerror (err)); } } } @@ -862,18 +1476,21 @@ memif_control_fd_handler (int fd, uint8_t events) } return MEMIF_ERR_SUCCESS; } - get_list_elt (&e, lm->listener_list, lm->listener_list_len, fd); - if (e != NULL) + get_list_elt (&e, lm->socket_list, lm->socket_list_len, fd); + if (e != NULL + && ((memif_socket_t *) e->data_struct)->type == + MEMIF_SOCKET_TYPE_LISTENER) { - memif_conn_fd_accept_ready ((memif_socket_t *) e->data_struct); - return MEMIF_ERR_SUCCESS; + err = + memif_conn_fd_accept_ready ((memif_socket_t *) e->data_struct); + return err; } get_list_elt (&e, lm->pending_list, lm->pending_list_len, fd); if (e != NULL) { - memif_read_ready (fd); - return MEMIF_ERR_SUCCESS; + err = memif_read_ready (lm, fd); + return err; } get_list_elt (&e, lm->control_list, lm->control_list_len, fd); @@ -909,9 +1526,6 @@ memif_control_fd_handler (int fd, uint8_t events) return MEMIF_ERR_SUCCESS; /* 0 */ error: - if (sockfd > 0) - close (sockfd); - sockfd = -1; return err; } @@ -919,23 +1533,75 @@ int memif_poll_event (int timeout) { libmemif_main_t *lm = &libmemif_main; - memif_list_elt_t *elt; - struct epoll_event evt, *e; - int en = 0, err = MEMIF_ERR_SUCCESS, i = 0; /* 0 */ - uint16_t num; + struct epoll_event evt; + int en = 0, err = MEMIF_ERR_SUCCESS; /* 0 */ uint32_t events = 0; + uint64_t counter = 0; + ssize_t r = 0; memset (&evt, 0, sizeof (evt)); evt.events = EPOLLIN | EPOLLOUT; sigset_t sigset; sigemptyset (&sigset); - en = epoll_pwait (memif_epfd, &evt, 1, timeout, &sigset); + en = epoll_pwait (lm->epfd, &evt, 1, timeout, &sigset); if (en < 0) { - DBG ("epoll_pwait: %s", strerror (errno)); - return -1; + err = errno; + DBG ("epoll_pwait: %s", strerror (err)); + return memif_syscall_error_handler (err); + } + if (en > 0) + { + if (evt.data.fd == lm->poll_cancel_fd) + { + r = read (evt.data.fd, &counter, sizeof (counter)); + if (r == -1) + return MEMIF_ERR_DISCONNECTED; + + return MEMIF_ERR_POLL_CANCEL; + } + if (evt.events & EPOLLIN) + events |= MEMIF_FD_EVENT_READ; + if (evt.events & EPOLLOUT) + events |= MEMIF_FD_EVENT_WRITE; + if (evt.events & EPOLLERR) + events |= MEMIF_FD_EVENT_ERROR; + err = memif_control_fd_handler (evt.data.fd, events); + return err; + } + return 0; +} + +int +memif_per_thread_poll_event (memif_per_thread_main_handle_t pt_main, + int timeout) +{ + libmemif_main_t *lm = (libmemif_main_t *) pt_main; + struct epoll_event evt; + int en = 0, err = MEMIF_ERR_SUCCESS; /* 0 */ + uint32_t events = 0; + uint64_t counter = 0; + ssize_t r = 0; + memset (&evt, 0, sizeof (evt)); + evt.events = EPOLLIN | EPOLLOUT; + sigset_t sigset; + sigemptyset (&sigset); + en = epoll_pwait (lm->epfd, &evt, 1, timeout, &sigset); + if (en < 0) + { + err = errno; + DBG ("epoll_pwait: %s", strerror (err)); + return memif_syscall_error_handler (err); } if (en > 0) { + if (evt.data.fd == lm->poll_cancel_fd) + { + r = read (evt.data.fd, &counter, sizeof (counter)); + if (r == -1) + return MEMIF_ERR_DISCONNECTED; + + return MEMIF_ERR_POLL_CANCEL; + } if (evt.events & EPOLLIN) events |= MEMIF_FD_EVENT_READ; if (evt.events & EPOLLOUT) @@ -948,13 +1614,48 @@ memif_poll_event (int timeout) return 0; } +int +memif_cancel_poll_event () +{ + libmemif_main_t *lm = &libmemif_main; + uint64_t counter = 1; + ssize_t w = 0; + + if (lm->poll_cancel_fd == -1) + return 0; + w = write (lm->poll_cancel_fd, &counter, sizeof (counter)); + if (w < sizeof (counter)) + return MEMIF_ERR_INT_WRITE; + + return 0; +} + +int +memif_per_thread_cancel_poll_event (memif_per_thread_main_handle_t pt_main) +{ + libmemif_main_t *lm = (libmemif_main_t *) pt_main; + uint64_t counter = 1; + ssize_t w = 0; + + if (lm == NULL) + return MEMIF_ERR_INVAL_ARG; + + if (lm->poll_cancel_fd == -1) + return 0; + w = write (lm->poll_cancel_fd, &counter, sizeof (counter)); + if (w < sizeof (counter)) + return MEMIF_ERR_INT_WRITE; + + return 0; +} + static void -memif_msg_queue_free (memif_msg_queue_elt_t ** e) +memif_msg_queue_free (libmemif_main_t * lm, memif_msg_queue_elt_t ** e) { if (*e == NULL) return; - memif_msg_queue_free (&(*e)->next); - free (*e); + memif_msg_queue_free (lm, &(*e)->next); + lm->free (*e); *e = NULL; return; } @@ -963,23 +1664,25 @@ memif_msg_queue_free (memif_msg_queue_elt_t ** e) int memif_disconnect_internal (memif_connection_t * c) { + int err = MEMIF_ERR_SUCCESS, i; /* 0 */ + memif_queue_t *mq; + libmemif_main_t *lm; + memif_list_elt_t *e; + if (c == NULL) { DBG ("no connection"); return MEMIF_ERR_NOCONN; } - uint16_t num; - int err = MEMIF_ERR_SUCCESS, i; /* 0 */ - memif_queue_t *mq; - libmemif_main_t *lm = &libmemif_main; - memif_list_elt_t *e; + + lm = get_libmemif_main (c->args.socket); c->on_disconnect ((void *) c, c->private_ctx); if (c->fd > 0) { - memif_msg_send_disconnect (c->fd, "interface deleted", 0); - lm->control_fd_update (c->fd, MEMIF_FD_EVENT_DEL); + memif_msg_send_disconnect (c->fd, (uint8_t *) "interface deleted", 0); + lm->control_fd_update (c->fd, MEMIF_FD_EVENT_DEL, lm->private_ctx); close (c->fd); } get_list_elt (&e, lm->control_list, lm->control_list_len, c->fd); @@ -992,10 +1695,7 @@ memif_disconnect_internal (memif_connection_t * c) if (c->tx_queues != NULL) { - num = - (c->args.is_master) ? c->run_args.num_m2s_rings : c-> - run_args.num_s2m_rings; - for (i = 0; i < num; i++) + for (i = 0; i < c->tx_queues_num; i++) { mq = &c->tx_queues[i]; if (mq != NULL) @@ -1007,16 +1707,14 @@ memif_disconnect_internal (memif_connection_t * c) mq->int_fd = -1; } } - free (c->tx_queues); + lm->free (c->tx_queues); c->tx_queues = NULL; } + c->tx_queues_num = 0; if (c->rx_queues != NULL) { - num = - (c->args.is_master) ? c->run_args.num_s2m_rings : c-> - run_args.num_m2s_rings; - for (i = 0; i < num; i++) + for (i = 0; i < c->rx_queues_num; i++) { mq = &c->rx_queues[i]; if (mq != NULL) @@ -1024,7 +1722,8 @@ memif_disconnect_internal (memif_connection_t * c) if (mq->int_fd > 0) { if (c->on_interrupt != NULL) - lm->control_fd_update (mq->int_fd, MEMIF_FD_EVENT_DEL); + lm->control_fd_update (mq->int_fd, MEMIF_FD_EVENT_DEL, + lm->private_ctx); close (mq->int_fd); } free_list_elt (lm->interrupt_list, lm->interrupt_list_len, @@ -1032,24 +1731,37 @@ memif_disconnect_internal (memif_connection_t * c) mq->int_fd = -1; } } - free (c->rx_queues); + lm->free (c->rx_queues); c->rx_queues = NULL; } + c->rx_queues_num = 0; - if (c->regions != NULL) + for (i = 0; i < c->regions_num; i++) { - if (munmap (c->regions[0].shm, c->regions[0].region_size) < 0) - return memif_syscall_error_handler (errno); - if (c->regions[0].fd > 0) - close (c->regions[0].fd); - c->regions[0].fd = -1; - free (c->regions); - c->regions = NULL; + if (&c->regions[i] == NULL) + continue; + if (c->regions[i].is_external != 0) + { + lm->del_external_region (c->regions[i].addr, + c->regions[i].region_size, + c->regions[i].fd, c->private_ctx); + } + else + { + if (munmap (c->regions[i].addr, c->regions[i].region_size) < 0) + return memif_syscall_error_handler (errno); + if (c->regions[i].fd > 0) + close (c->regions[i].fd); + c->regions[i].fd = -1; + } } + lm->free (c->regions); + c->regions = NULL; + c->regions_num = 0; memset (&c->run_args, 0, sizeof (memif_conn_run_args_t)); - memif_msg_queue_free (&c->msg_queue); + memif_msg_queue_free (lm, &c->msg_queue); if (!(c->args.is_master)) { @@ -1058,7 +1770,7 @@ memif_disconnect_internal (memif_connection_t * c) if (timerfd_settime (lm->timerfd, 0, &lm->arm, NULL) < 0) { err = memif_syscall_error_handler (errno); - DBG_UNIX ("timerfd_settime: arm"); + DBG ("timerfd_settime: arm"); } } lm->disconn_slaves++; @@ -1067,20 +1779,52 @@ memif_disconnect_internal (memif_connection_t * c) return err; } +const char * +memif_get_socket_filename (memif_socket_handle_t sock) +{ + memif_socket_t *ms = (memif_socket_t *) sock; + + if (ms == NULL) + return NULL; + + return (char *) ms->filename; +} + +int +memif_delete_socket (memif_socket_handle_t * sock) +{ + memif_socket_t *ms = (memif_socket_t *) * sock; + libmemif_main_t *lm; + + /* check if socket is in use */ + if (ms == NULL || ms->use_count > 0) + return MEMIF_ERR_INVAL_ARG; + + lm = get_libmemif_main (ms); + + lm->free (ms->interface_list); + ms->interface_list = NULL; + lm->free (ms->filename); + ms->filename = NULL; + lm->free (ms); + *sock = ms = NULL; + + return MEMIF_ERR_SUCCESS; +} + int memif_delete (memif_conn_handle_t * conn) { memif_connection_t *c = (memif_connection_t *) * conn; + libmemif_main_t *lm; + memif_socket_t *ms = NULL; + int err = MEMIF_ERR_SUCCESS; + if (c == NULL) { DBG ("no connection"); return MEMIF_ERR_NOCONN; } - libmemif_main_t *lm = &libmemif_main; - memif_list_elt_t *e = NULL; - memif_socket_t *ms = NULL; - - int err = MEMIF_ERR_SUCCESS; if (c->fd > 0) { @@ -1090,35 +1834,29 @@ memif_delete (memif_conn_handle_t * conn) return err; } + lm = get_libmemif_main (c->args.socket); + free_list_elt_ctx (lm->control_list, lm->control_list_len, c); - if (c->args.is_master) + ms = (memif_socket_t *) c->args.socket; + ms->use_count--; + free_list_elt (ms->interface_list, ms->interface_list_len, + c->args.interface_id); + if (ms->use_count <= 0) { - get_list_elt (&e, lm->listener_list, lm->listener_list_len, - c->listener_fd); - if (e != NULL) + /* stop listening on this socket */ + if (ms->type == MEMIF_SOCKET_TYPE_LISTENER) { - ms = (memif_socket_t *) e->data_struct; - ms->use_count--; - free_list_elt (ms->interface_list, ms->interface_list_len, - c->args.interface_id); - if (ms->use_count <= 0) - { - lm->control_fd_update (c->listener_fd, MEMIF_FD_EVENT_DEL); - free_list_elt (lm->listener_list, lm->listener_list_len, - c->listener_fd); - close (c->listener_fd); - c->listener_fd = ms->fd = -1; - free (ms->interface_list); - ms->interface_list = NULL; - free (ms->filename); - ms->filename = NULL; - free (ms); - ms = NULL; - } + lm->control_fd_update (ms->fd, MEMIF_FD_EVENT_DEL, lm->private_ctx); + free_list_elt (lm->socket_list, lm->socket_list_len, ms->fd); + close (ms->fd); + ms->fd = -1; } + /* socket not in use */ + ms->type = MEMIF_SOCKET_TYPE_NONE; } - else + + if (!c->args.is_master) { lm->disconn_slaves--; if (lm->disconn_slaves <= 0) @@ -1131,11 +1869,7 @@ memif_delete (memif_conn_handle_t * conn) } } - if (c->args.socket_filename) - free (c->args.socket_filename); - c->args.socket_filename = NULL; - - free (c); + lm->free (c); c = NULL; *conn = c; @@ -1145,57 +1879,72 @@ memif_delete (memif_conn_handle_t * conn) int memif_connect1 (memif_connection_t * c) { - libmemif_main_t *lm = &libmemif_main; - memif_region_t *mr = c->regions; + libmemif_main_t *lm; + memif_region_t *mr; memif_queue_t *mq; int i; - uint16_t num; - if (mr != NULL) + if (c == NULL) + return MEMIF_ERR_INVAL_ARG; + + lm = get_libmemif_main (c->args.socket); + + for (i = 0; i < c->regions_num; i++) { - if (!mr->shm) + mr = &c->regions[i]; + if (mr != NULL) { - if (mr->fd < 0) - return MEMIF_ERR_NO_SHMFD; - - if ((mr->shm = mmap (NULL, mr->region_size, PROT_READ | PROT_WRITE, - MAP_SHARED, mr->fd, 0)) == MAP_FAILED) + if (!mr->addr) { - return memif_syscall_error_handler (errno); + if (mr->is_external) + { + if (lm->get_external_region_addr == NULL) + return MEMIF_ERR_INVAL_ARG; + mr->addr = + lm->get_external_region_addr (mr->region_size, mr->fd, + c->private_ctx); + } + else + { + if (mr->fd < 0) + return MEMIF_ERR_NO_SHMFD; + + if ((mr->addr = + mmap (NULL, mr->region_size, PROT_READ | PROT_WRITE, + MAP_SHARED, mr->fd, 0)) == MAP_FAILED) + { + return memif_syscall_error_handler (errno); + } + } } } } - num = - (c->args.is_master) ? c->run_args.num_m2s_rings : c-> - run_args.num_s2m_rings; - for (i = 0; i < num; i++) + for (i = 0; i < c->rx_queues_num; i++) { - mq = &c->tx_queues[i]; + mq = &c->rx_queues[i]; if (mq != NULL) { - mq->ring = c->regions[mq->region].shm + mq->offset; + mq->ring = c->regions[mq->region].addr + mq->offset; if (mq->ring->cookie != MEMIF_COOKIE) { - DBG ("wrong cookie on tx ring %u", i); + DBG ("wrong cookie on rx ring %u", i); return MEMIF_ERR_COOKIE; } mq->ring->head = mq->ring->tail = mq->last_head = mq->alloc_bufs = 0; } } - num = - (c->args.is_master) ? c->run_args.num_s2m_rings : c-> - run_args.num_m2s_rings; - for (i = 0; i < num; i++) + + for (i = 0; i < c->tx_queues_num; i++) { - mq = &c->rx_queues[i]; + mq = &c->tx_queues[i]; if (mq != NULL) { - mq->ring = c->regions[mq->region].shm + mq->offset; + mq->ring = c->regions[mq->region].addr + mq->offset; if (mq->ring->cookie != MEMIF_COOKIE) { - DBG ("wrong cookie on rx ring %u", i); + DBG ("wrong cookie on tx ring %u", i); return MEMIF_ERR_COOKIE; } mq->ring->head = mq->ring->tail = mq->last_head = mq->alloc_bufs = @@ -1203,49 +1952,68 @@ memif_connect1 (memif_connection_t * c) } } - lm->control_fd_update (c->fd, MEMIF_FD_EVENT_READ | MEMIF_FD_EVENT_MOD); + lm->control_fd_update (c->fd, MEMIF_FD_EVENT_READ | MEMIF_FD_EVENT_MOD, + lm->private_ctx); return 0; } -int -memif_init_regions_and_queues (memif_connection_t * conn) +static inline int +memif_add_region (libmemif_main_t * lm, memif_connection_t * conn, + uint8_t has_buffers) { - memif_ring_t *ring = NULL; - uint64_t buffer_offset; memif_region_t *r; - int i, j; - libmemif_main_t *lm = &libmemif_main; - memif_list_elt_t e; - conn->regions = (memif_region_t *) malloc (sizeof (memif_region_t)); - if (conn->regions == NULL) - return memif_syscall_error_handler (errno); - r = conn->regions; + r = + lm->realloc (conn->regions, + sizeof (memif_region_t) * ++conn->regions_num); + if (r == NULL) + return MEMIF_ERR_NOMEM; - buffer_offset = - (conn->run_args.num_s2m_rings + - conn->run_args.num_m2s_rings) * (sizeof (memif_ring_t) + - sizeof (memif_desc_t) * - (1 << conn->run_args.log2_ring_size)); + conn->regions = r; + r = &conn->regions[conn->regions_num - 1]; + memset (r, 0, sizeof (memif_region_t)); + + if (has_buffers != 0) + { + r->buffer_offset = 0; + } + else + { + r->buffer_offset = + (conn->run_args.num_s2m_rings + + conn->run_args.num_m2s_rings) * (sizeof (memif_ring_t) + + sizeof (memif_desc_t) * + (1 << conn-> + run_args.log2_ring_size)); + } - r->region_size = buffer_offset + + r->region_size = (has_buffers == 0) ? r->buffer_offset : r->buffer_offset + conn->run_args.buffer_size * (1 << conn->run_args.log2_ring_size) * (conn->run_args.num_s2m_rings + conn->run_args.num_m2s_rings); if ((r->fd = memfd_create ("memif region 0", MFD_ALLOW_SEALING)) == -1) return memif_syscall_error_handler (errno); -/* - if ((fcntl (r->fd, F_ADD_SEALS, F_SEAL_SHRINK)) == -1) - return memif_syscall_error_handler (errno); -*/ + + if ((fcntl (r->fd, F_ADD_SEALS, F_SEAL_SHRINK)) == -1) + return memif_syscall_error_handler (errno); + if ((ftruncate (r->fd, r->region_size)) == -1) return memif_syscall_error_handler (errno); - if ((r->shm = mmap (NULL, r->region_size, PROT_READ | PROT_WRITE, - MAP_SHARED, r->fd, 0)) == MAP_FAILED) + if ((r->addr = mmap (NULL, r->region_size, PROT_READ | PROT_WRITE, + MAP_SHARED, r->fd, 0)) == MAP_FAILED) return memif_syscall_error_handler (errno); + return MEMIF_ERR_SUCCESS; +} + +static inline int +memif_init_queues (libmemif_main_t * lm, memif_connection_t * conn) +{ + int i, j; + memif_ring_t *ring; + for (i = 0; i < conn->run_args.num_s2m_rings; i++) { ring = memif_get_ring (conn, MEMIF_RING_S2M, i); @@ -1256,10 +2024,11 @@ memif_init_regions_and_queues (memif_connection_t * conn) for (j = 0; j < (1 << conn->run_args.log2_ring_size); j++) { uint16_t slot = i * (1 << conn->run_args.log2_ring_size) + j; - ring->desc[j].region = 0; - ring->desc[j].offset = buffer_offset + + ring->desc[j].region = 1; + ring->desc[j].offset = + conn->regions[1].buffer_offset + (uint32_t) (slot * conn->run_args.buffer_size); - ring->desc[j].buffer_length = conn->run_args.buffer_size; + ring->desc[j].length = conn->run_args.buffer_size; } } for (i = 0; i < conn->run_args.num_m2s_rings; i++) @@ -1271,193 +2040,313 @@ memif_init_regions_and_queues (memif_connection_t * conn) ring->flags = 0; for (j = 0; j < (1 << conn->run_args.log2_ring_size); j++) { - uint16_t slot = - (i + - conn->run_args.num_s2m_rings) * + uint16_t slot = (i + conn->run_args.num_s2m_rings) * (1 << conn->run_args.log2_ring_size) + j; - ring->desc[j].region = 0; - ring->desc[j].offset = buffer_offset + + ring->desc[j].region = 1; + ring->desc[j].offset = + conn->regions[1].buffer_offset + (uint32_t) (slot * conn->run_args.buffer_size); - ring->desc[j].buffer_length = conn->run_args.buffer_size; + ring->desc[j].length = conn->run_args.buffer_size; } } memif_queue_t *mq; + DBG ("alloc: %p", lm->alloc); + DBG ("size: %lu", sizeof (memif_queue_t) * conn->run_args.num_s2m_rings); mq = - (memif_queue_t *) malloc (sizeof (memif_queue_t) * - conn->run_args.num_s2m_rings); + (memif_queue_t *) lm->alloc (sizeof (memif_queue_t) * + conn->run_args.num_s2m_rings); if (mq == NULL) - return memif_syscall_error_handler (errno); + return MEMIF_ERR_NOMEM; + int x; + memif_list_elt_t e; for (x = 0; x < conn->run_args.num_s2m_rings; x++) { if ((mq[x].int_fd = eventfd (0, EFD_NONBLOCK)) < 0) return memif_syscall_error_handler (errno); - /* add int fd to interrupt fd list */ e.key = mq[x].int_fd; e.data_struct = conn; - add_list_elt (&e, &lm->interrupt_list, &lm->interrupt_list_len); + add_list_elt (lm, &e, &lm->interrupt_list, &lm->interrupt_list_len); mq[x].ring = memif_get_ring (conn, MEMIF_RING_S2M, x); DBG ("RING: %p I: %d", mq[x].ring, x); mq[x].log2_ring_size = conn->run_args.log2_ring_size; mq[x].region = 0; mq[x].offset = - (void *) mq[x].ring - (void *) conn->regions[mq->region].shm; - mq[x].last_head = 0; + (void *) mq[x].ring - (void *) conn->regions[mq->region].addr; + mq[x].last_head = mq[x].last_tail = 0; mq[x].alloc_bufs = 0; } conn->tx_queues = mq; + conn->tx_queues_num = conn->run_args.num_s2m_rings; mq = - (memif_queue_t *) malloc (sizeof (memif_queue_t) * - conn->run_args.num_m2s_rings); + (memif_queue_t *) lm->alloc (sizeof (memif_queue_t) * + conn->run_args.num_m2s_rings); if (mq == NULL) - return memif_syscall_error_handler (errno); + return MEMIF_ERR_NOMEM; + for (x = 0; x < conn->run_args.num_m2s_rings; x++) { if ((mq[x].int_fd = eventfd (0, EFD_NONBLOCK)) < 0) return memif_syscall_error_handler (errno); - /* add int fd to interrupt fd list */ e.key = mq[x].int_fd; e.data_struct = conn; - add_list_elt (&e, &lm->interrupt_list, &lm->interrupt_list_len); + add_list_elt (lm, &e, &lm->interrupt_list, &lm->interrupt_list_len); mq[x].ring = memif_get_ring (conn, MEMIF_RING_M2S, x); DBG ("RING: %p I: %d", mq[x].ring, x); mq[x].log2_ring_size = conn->run_args.log2_ring_size; mq[x].region = 0; mq[x].offset = - (void *) mq[x].ring - (void *) conn->regions[mq->region].shm; - mq[x].last_head = 0; + (void *) mq[x].ring - (void *) conn->regions[mq->region].addr; + mq[x].last_head = mq[x].last_tail = 0; mq[x].alloc_bufs = 0; } conn->rx_queues = mq; + conn->rx_queues_num = conn->run_args.num_m2s_rings; + + return MEMIF_ERR_SUCCESS; +} + +int +memif_init_regions_and_queues (memif_connection_t * conn) +{ + memif_region_t *r; + libmemif_main_t *lm; + + if (conn == NULL) + return MEMIF_ERR_INVAL_ARG; + + lm = get_libmemif_main (conn->args.socket); + + /* region 0. rings */ + memif_add_region (lm, conn, /* has_buffers */ 0); + + /* region 1. buffers */ + if (lm->add_external_region) + { + r = + (memif_region_t *) lm->realloc (conn->regions, + sizeof (memif_region_t) * + ++conn->regions_num); + if (r == NULL) + return MEMIF_ERR_NOMEM; + conn->regions = r; + + conn->regions[1].region_size = + conn->run_args.buffer_size * (1 << conn->run_args.log2_ring_size) * + (conn->run_args.num_s2m_rings + conn->run_args.num_m2s_rings); + conn->regions[1].buffer_offset = 0; + lm->add_external_region (&conn->regions[1].addr, + conn->regions[1].region_size, + &conn->regions[1].fd, conn->private_ctx); + conn->regions[1].is_external = 1; + } + else + { + memif_add_region (lm, conn, 1); + } + + memif_init_queues (lm, conn); return 0; } int -memif_buffer_alloc (memif_conn_handle_t conn, uint16_t qid, - memif_buffer_t * bufs, uint16_t count, - uint16_t * count_out, uint16_t size) +memif_buffer_enq_tx (memif_conn_handle_t conn, uint16_t qid, + memif_buffer_t * bufs, uint16_t count, + uint16_t * count_out) { memif_connection_t *c = (memif_connection_t *) conn; - if (c == NULL) + if (EXPECT_FALSE (c == NULL)) return MEMIF_ERR_NOCONN; - if (c->fd < 0) + if (EXPECT_FALSE (c->fd < 0)) return MEMIF_ERR_DISCONNECTED; uint8_t num = (c->args.is_master) ? c->run_args.num_m2s_rings : c-> run_args.num_s2m_rings; - if (qid >= num) + if (EXPECT_FALSE (qid >= num)) return MEMIF_ERR_QID; + if (EXPECT_FALSE (!count_out)) + return MEMIF_ERR_INVAL_ARG; + if (EXPECT_FALSE (c->args.is_master)) + return MEMIF_ERR_INVAL_ARG; + memif_queue_t *mq = &c->tx_queues[qid]; memif_ring_t *ring = mq->ring; - memif_buffer_t *b0, *b1; - uint8_t chain_buf0, chain_buf1; + memif_buffer_t *b0; uint16_t mask = (1 << mq->log2_ring_size) - 1; - uint16_t s0, s1, ns; + uint16_t ring_size; + uint16_t slot, ns; + int err = MEMIF_ERR_SUCCESS; /* 0 */ *count_out = 0; - int i, err = MEMIF_ERR_SUCCESS; /* 0 */ - if (ring->tail != ring->head) - { - if (ring->head > ring->tail) - ns = (1 << mq->log2_ring_size) - ring->head + ring->tail; - else - ns = ring->tail - ring->head; - } - else - ns = (1 << mq->log2_ring_size); + ring_size = (1 << mq->log2_ring_size); + slot = (c->args.is_master) ? ring->tail : ring->head; + slot += mq->alloc_bufs; + + /* can only be called by slave */ + ns = ring_size - (ring->head + mq->alloc_bufs) + ring->tail; - /* (head == tail) ? receive function will asume that no packets are available */ - ns -= 1; + b0 = bufs; while (count && ns) { - while ((count > 2) && (ns > 2)) + if (EXPECT_FALSE ((b0->flags & MEMIF_BUFFER_FLAG_RX) == 0)) { - s0 = (ring->head + mq->alloc_bufs + *count_out) & mask; - chain_buf0 = size / ring->desc[s0].buffer_length; - if (((size % ring->desc[s0].buffer_length) != 0) || (size == 0)) - chain_buf0++; - - if (chain_buf0 > ns) - break; - - s1 = (ring->head + mq->alloc_bufs + *count_out + chain_buf0) & mask; - chain_buf1 = size / ring->desc[s1].buffer_length; - if (((size % ring->desc[s1].buffer_length) != 0) || (size == 0)) - chain_buf1++; - - if ((chain_buf0 + chain_buf1) > ns) - break; - - b0 = (bufs + *count_out); - b1 = (bufs + *count_out + 1); - - b0->desc_index = s0; - b1->desc_index = s1; - b0->buffer_len = ring->desc[s0].buffer_length * chain_buf0; - b1->buffer_len = ring->desc[s1].buffer_length * chain_buf1; - /* TODO: support multiple regions -> ring descriptor contains region index */ - b0->data = c->regions->shm + ring->desc[s0].offset; - b1->data = c->regions->shm + ring->desc[s1].offset; - - for (i = 0; i < (memif_min (chain_buf0, chain_buf1) - 1); i++) - { - ring->desc[(s0 + i) & mask].flags |= MEMIF_DESC_FLAG_NEXT; - ring->desc[(s1 + i) & mask].flags |= MEMIF_DESC_FLAG_NEXT; - DBG ("allocating chained buffers"); - } + /* not a valid buffer */ + count--; + continue; + } + b0->flags &= ~MEMIF_BUFFER_FLAG_RX; - if (chain_buf0 > chain_buf1) - { - for (; i < (chain_buf0 - 1); i++) - ring->desc[(s0 + i) & mask].flags |= MEMIF_DESC_FLAG_NEXT; - } - else - { - for (; i < (chain_buf1 - 1); i++) - ring->desc[(s1 + i) & mask].flags |= MEMIF_DESC_FLAG_NEXT; - } + ((memif_ring_t *) b0->ring)->desc[b0->desc_index & mask].offset = ring->desc[slot & mask].offset; /* put free buffer on rx ring */ - mq->alloc_bufs += chain_buf0 + chain_buf1; + ring->desc[slot & mask].offset = + (uint32_t) (b0->data - + c->regions[ring->desc[slot & mask].region].addr); + ring->desc[slot & mask].flags &= ~MEMIF_DESC_FLAG_NEXT; + ring->desc[slot & mask].flags |= + (b0->flags & MEMIF_BUFFER_FLAG_NEXT) ? MEMIF_DESC_FLAG_NEXT : 0; - DBG ("allocated ring slots %u, %u", s0, s1); - count -= 2; - ns -= chain_buf0 + chain_buf1; - *count_out += 2; - } - s0 = (ring->head + mq->alloc_bufs + *count_out) & mask; + b0->desc_index = slot; + + mq->alloc_bufs++; + slot++; + + count--; + ns--; + b0++; + *count_out += 1; + } + + DBG ("allocated: %u/%u bufs. Total %u allocated bufs", *count_out, count, + mq->alloc_bufs); + + if (count) + { + DBG ("ring buffer full! qid: %u", qid); + err = MEMIF_ERR_NOBUF_RING; + } + + return err; +} + +int +memif_buffer_alloc (memif_conn_handle_t conn, uint16_t qid, + memif_buffer_t * bufs, uint16_t count, + uint16_t * count_out, uint16_t size) +{ + memif_connection_t *c = (memif_connection_t *) conn; + if (EXPECT_FALSE (c == NULL)) + return MEMIF_ERR_NOCONN; + if (EXPECT_FALSE (c->fd < 0)) + return MEMIF_ERR_DISCONNECTED; + uint8_t num = + (c->args.is_master) ? c->run_args.num_m2s_rings : c-> + run_args.num_s2m_rings; + if (EXPECT_FALSE (qid >= num)) + return MEMIF_ERR_QID; + if (EXPECT_FALSE (!count_out)) + return MEMIF_ERR_INVAL_ARG; + + libmemif_main_t *lm = get_libmemif_main (c->args.socket); + memif_queue_t *mq = &c->tx_queues[qid]; + memif_ring_t *ring = mq->ring; + memif_buffer_t *b0; + uint16_t mask = (1 << mq->log2_ring_size) - 1; + uint32_t offset_mask = c->run_args.buffer_size - 1; + uint16_t ring_size; + uint16_t slot, ns; + int err = MEMIF_ERR_SUCCESS; /* 0 */ + uint16_t dst_left, src_left; + uint16_t saved_count; + memif_buffer_t *saved_b; + *count_out = 0; + + ring_size = (1 << mq->log2_ring_size); + slot = (c->args.is_master) ? ring->tail : ring->head; + slot += mq->alloc_bufs; + + if (c->args.is_master) + ns = ring->head - (ring->tail + mq->alloc_bufs); + else + ns = ring_size - (ring->head + mq->alloc_bufs) + ring->tail; + while (count && ns) + { b0 = (bufs + *count_out); - chain_buf0 = size / ring->desc[s0].buffer_length; - if (((size % ring->desc[s0].buffer_length) != 0) || (size == 0)) - chain_buf0++; + saved_b = b0; + saved_count = count; - if (chain_buf0 > ns) - break; + b0->desc_index = slot; + ring->desc[slot & mask].flags = 0; - b0->desc_index = s0; - b0->buffer_len = ring->desc[s0].buffer_length * chain_buf0; - b0->data = c->regions->shm + ring->desc[s0].offset; + /* slave can produce buffer with original length */ + dst_left = (c->args.is_master) ? ring->desc[slot & mask].length : + c->run_args.buffer_size; + src_left = size; - for (i = 0; i < (chain_buf0 - 1); i++) + while (src_left) { - ring->desc[(s0 + i) & mask].flags |= MEMIF_DESC_FLAG_NEXT; - DBG ("allocating chained buffers"); - } + if (EXPECT_FALSE (dst_left == 0)) + { + if (count && ns) + { + slot++; + *count_out += 1; + mq->alloc_bufs++; + ns--; + + ring->desc[b0->desc_index & mask].flags |= + MEMIF_DESC_FLAG_NEXT; + b0->flags |= MEMIF_BUFFER_FLAG_NEXT; + + b0 = (bufs + *count_out); + b0->desc_index = slot; + dst_left = + (c->args.is_master) ? ring->desc[slot & mask]. + length : c->run_args.buffer_size; + ring->desc[slot & mask].flags = 0; + } + else + { + /* rollback allocated chain buffers */ + memset (saved_b, 0, sizeof (memif_buffer_t) + * (saved_count - count + 1)); + *count_out -= saved_count - count; + mq->alloc_bufs = saved_count - count; + goto no_ns; + } + } + b0->len = memif_min (dst_left, src_left); + + /* slave resets buffer offset */ + if (c->args.is_master == 0) + { + memif_desc_t *d = &ring->desc[slot & mask]; + if (lm->get_external_buffer_offset) + d->offset = lm->get_external_buffer_offset (c->private_ctx); + else + d->offset = d->offset - (d->offset & offset_mask); + } + b0->data = memif_get_buffer (c, ring, slot & mask); - mq->alloc_bufs += chain_buf0; + src_left -= b0->len; + dst_left -= b0->len; + } - DBG ("allocated ring slot %u", s0); - count--; - ns -= chain_buf0; + slot++; *count_out += 1; + mq->alloc_bufs++; + ns--; + count--; } +no_ns: + DBG ("allocated: %u/%u bufs. Total %u allocated bufs", *count_out, count, mq->alloc_bufs); @@ -1471,70 +2360,55 @@ memif_buffer_alloc (memif_conn_handle_t conn, uint16_t qid, } int -memif_buffer_free (memif_conn_handle_t conn, uint16_t qid, - memif_buffer_t * bufs, uint16_t count, - uint16_t * count_out) +memif_refill_queue (memif_conn_handle_t conn, uint16_t qid, uint16_t count, + uint16_t headroom) { memif_connection_t *c = (memif_connection_t *) conn; - if (c == NULL) + if (EXPECT_FALSE (c == NULL)) return MEMIF_ERR_NOCONN; - if (c->fd < 0) + if (EXPECT_FALSE (c->fd < 0)) return MEMIF_ERR_DISCONNECTED; uint8_t num = (c->args.is_master) ? c->run_args.num_s2m_rings : c-> run_args.num_m2s_rings; - if (qid >= num) + if (EXPECT_FALSE (qid >= num)) return MEMIF_ERR_QID; - libmemif_main_t *lm = &libmemif_main; + libmemif_main_t *lm = get_libmemif_main (c->args.socket); memif_queue_t *mq = &c->rx_queues[qid]; memif_ring_t *ring = mq->ring; - uint16_t tail = ring->tail; uint16_t mask = (1 << mq->log2_ring_size) - 1; - uint8_t chain_buf0, chain_buf1; - memif_buffer_t *b0, *b1; - *count_out = 0; - - if (mq->alloc_bufs < count) - count = mq->alloc_bufs; + uint32_t offset_mask = c->run_args.buffer_size - 1; + uint16_t slot; - while (count) + if (c->args.is_master) { - while (count > 2) - { - b0 = (bufs + *count_out); - b1 = (bufs + *count_out + 1); - chain_buf0 = - b0->buffer_len / ring->desc[b0->desc_index].buffer_length; - if ((b0->buffer_len % ring->desc[b0->desc_index].buffer_length) != - 0) - chain_buf0++; - chain_buf1 = - b1->buffer_len / ring->desc[b1->desc_index].buffer_length; - if ((b1->buffer_len % ring->desc[b1->desc_index].buffer_length) != - 0) - chain_buf1++; - tail = (b0->desc_index + chain_buf0) & mask; - tail = (b1->desc_index + chain_buf1) & mask; - b0->data = NULL; - b1->data = NULL; - - count -= 2; - *count_out += 2; - mq->alloc_bufs -= chain_buf0 + chain_buf1; - } - b0 = (bufs + *count_out); - chain_buf0 = b0->buffer_len / ring->desc[b0->desc_index].buffer_length; - if ((b0->buffer_len % ring->desc[b0->desc_index].buffer_length) != 0) - chain_buf0++; - tail = (b0->desc_index + chain_buf0) & mask; - b0->data = NULL; + MEMIF_MEMORY_BARRIER (); + ring->tail = + (ring->tail + count <= + mq->last_head) ? ring->tail + count : mq->last_head; + return MEMIF_ERR_SUCCESS; + } - count--; - *count_out += 1; - mq->alloc_bufs -= chain_buf0; + uint16_t head = ring->head; + uint16_t ns = (1 << mq->log2_ring_size) - head + mq->last_tail; + head += (count < ns) ? count : ns; + + slot = ring->head; + memif_desc_t *d; + while (slot < head) + { + d = &ring->desc[slot & mask]; + d->region = 1; + d->length = c->run_args.buffer_size - headroom; + if (lm->get_external_buffer_offset) + d->offset = lm->get_external_buffer_offset (c->private_ctx); + else + d->offset = d->offset - (d->offset & offset_mask) + headroom; + slot++; } - MEMIF_MEORY_BARRIER (); - ring->tail = tail; + + MEMIF_MEMORY_BARRIER (); + ring->head = head; return MEMIF_ERR_SUCCESS; /* 0 */ } @@ -1544,143 +2418,56 @@ memif_tx_burst (memif_conn_handle_t conn, uint16_t qid, memif_buffer_t * bufs, uint16_t count, uint16_t * tx) { memif_connection_t *c = (memif_connection_t *) conn; - if (c == NULL) + if (EXPECT_FALSE (c == NULL)) return MEMIF_ERR_NOCONN; - if (c->fd < 0) + if (EXPECT_FALSE (c->fd < 0)) return MEMIF_ERR_DISCONNECTED; uint8_t num = (c->args.is_master) ? c->run_args.num_m2s_rings : c-> run_args.num_s2m_rings; - if (qid >= num) + if (EXPECT_FALSE (qid >= num)) return MEMIF_ERR_QID; + if (EXPECT_FALSE (!tx)) + return MEMIF_ERR_INVAL_ARG; + memif_queue_t *mq = &c->tx_queues[qid]; memif_ring_t *ring = mq->ring; - uint16_t head = ring->head; uint16_t mask = (1 << mq->log2_ring_size) - 1; - uint8_t chain_buf0, chain_buf1; + memif_buffer_t *b0; *tx = 0; - uint16_t curr_buf = 0; - memif_buffer_t *b0, *b1; - int i; - - while (count) - { - while (count > 2) - { - b0 = (bufs + curr_buf); - b1 = (bufs + curr_buf + 1); - chain_buf0 = - b0->buffer_len / ring->desc[b0->desc_index].buffer_length; - if ((b0->buffer_len % ring->desc[b0->desc_index].buffer_length) != - 0) - chain_buf0++; - - chain_buf1 = - b1->buffer_len / ring->desc[b1->desc_index].buffer_length; - if ((b1->buffer_len % ring->desc[b1->desc_index].buffer_length) != - 0) - chain_buf1++; - - for (i = 0; i < memif_min (chain_buf0, chain_buf1); i++) - { - ring->desc[(b0->desc_index + i) & mask].length = b0->data_len; - ring->desc[(b1->desc_index + i) & mask].length = b1->data_len; -#ifdef MEMIF_DBG_SHM - print_bytes (b0->data + - ring->desc[(b0->desc_index + - i) & mask].buffer_length * - (chain_buf0 - 1), - ring->desc[(b0->desc_index + - i) & mask].buffer_length, DBG_TX_BUF); - print_bytes (b1->data + - ring->desc[(b1->desc_index + - i) & mask].buffer_length * - (chain_buf1 - 1), - ring->desc[(b1->desc_index + - i) & mask].buffer_length, DBG_TX_BUF); -#endif - } - - if (chain_buf0 > chain_buf1) - { - for (; i < chain_buf0; i++) - { - ring->desc[(b0->desc_index + i) & mask].length = - b0->data_len; -#ifdef MEMIF_DBG_SHM - print_bytes (b0->data + - ring->desc[(b0->desc_index + - i) & mask].buffer_length * - (chain_buf0 - 1), - ring->desc[(b0->desc_index + - i) & mask].buffer_length, - DBG_TX_BUF); -#endif - } - } - else - { - for (; i < chain_buf1; i++) - { - ring->desc[b1->desc_index + i].length = b1->data_len; -#ifdef MEMIF_DBG_SHM - print_bytes (b1->data + - ring->desc[(b1->desc_index + - i) & mask].buffer_length * - (chain_buf1 - 1), - ring->desc[(b1->desc_index + - i) & mask].buffer_length, - DBG_TX_BUF); -#endif - } - } - - head = (b0->desc_index + chain_buf0) & mask; - head = (b1->desc_index + chain_buf1) & mask; - b0->data = NULL; - b0->data_len = 0; - b1->data = NULL; - b1->data_len = 0; + if (count > mq->alloc_bufs) + count = mq->alloc_bufs; - count -= 2; - *tx += chain_buf0 + chain_buf1; - curr_buf += 2; - } + if (EXPECT_FALSE (count == 0)) + return MEMIF_ERR_SUCCESS; + while (count) + { b0 = (bufs + *tx); - chain_buf0 = b0->buffer_len / ring->desc[b0->desc_index].buffer_length; - if ((b0->buffer_len % ring->desc[b0->desc_index].buffer_length) != 0) - chain_buf0++; + ring->desc[b0->desc_index & mask].length = b0->len; - for (i = 0; i < chain_buf0; i++) - { - ring->desc[(b0->desc_index + i) & mask].length = b0->data_len; #ifdef MEMIF_DBG_SHM - print_bytes (b0->data + - ring->desc[(b0->desc_index + i) & mask].buffer_length * - (chain_buf0 - 1), - ring->desc[(b0->desc_index + i) & mask].buffer_length, - DBG_TX_BUF); -#endif - } - - head = (b0->desc_index + chain_buf0) & mask; - - b0->data = NULL; - b0->data_len = 0; - + printf ("offset: %-6d\n", ring->desc[b0->desc_index & mask].offset); + printf ("data: %p\n", + memif_get_buffer (c, ring, b0->desc_index & mask)); + printf ("index: %u\n", b0->desc_index); + print_bytes (memif_get_buffer (c, ring, b0->desc_index & mask), + ring->desc[b0->desc_index & mask].length, DBG_TX_BUF); +#endif /* MEMIF_DBG_SHM */ + + *tx += 1; count--; - *tx += chain_buf0; - curr_buf++; } - MEMIF_MEORY_BARRIER (); - ring->head = head; - mq->alloc_bufs -= *tx; - /* TODO: return num of buffers and packets */ - *tx = curr_buf; + MEMIF_MEMORY_BARRIER (); + if (c->args.is_master) + ring->tail = b0->desc_index + 1; + else + ring->head = b0->desc_index + 1; + + mq->alloc_bufs -= *tx; if ((ring->flags & MEMIF_RING_FLAG_MASK_INT) == 0) { @@ -1698,114 +2485,80 @@ memif_rx_burst (memif_conn_handle_t conn, uint16_t qid, memif_buffer_t * bufs, uint16_t count, uint16_t * rx) { memif_connection_t *c = (memif_connection_t *) conn; - if (c == NULL) + if (EXPECT_FALSE (c == NULL)) return MEMIF_ERR_NOCONN; - if (c->fd < 0) + if (EXPECT_FALSE (c->fd < 0)) return MEMIF_ERR_DISCONNECTED; uint8_t num = (c->args.is_master) ? c->run_args.num_s2m_rings : c-> run_args.num_m2s_rings; - if (qid >= num) + if (EXPECT_FALSE (qid >= num)) return MEMIF_ERR_QID; + if (EXPECT_FALSE (!rx)) + return MEMIF_ERR_INVAL_ARG; + memif_queue_t *mq = &c->rx_queues[qid]; memif_ring_t *ring = mq->ring; - uint16_t head = ring->head; + uint16_t cur_slot, last_slot; uint16_t ns; uint16_t mask = (1 << mq->log2_ring_size) - 1; - memif_buffer_t *b0, *b1; - uint16_t curr_buf = 0; + memif_buffer_t *b0; *rx = 0; - int i; uint64_t b; - ssize_t r = read (mq->int_fd, &b, sizeof (b)); - if ((r == -1) && (errno != EAGAIN)) - return memif_syscall_error_handler (errno); + ssize_t r; - if (head == mq->last_head) - return 0; + cur_slot = (c->args.is_master) ? mq->last_head : mq->last_tail; + last_slot = (c->args.is_master) ? ring->head : ring->tail; + if (cur_slot == last_slot) + { + r = read (mq->int_fd, &b, sizeof (b)); + if (EXPECT_FALSE ((r == -1) && (errno != EAGAIN))) + return memif_syscall_error_handler (errno); - if (head > mq->last_head) - ns = head - mq->last_head; - else - ns = (1 << mq->log2_ring_size) - mq->last_head + head; + return MEMIF_ERR_SUCCESS; + } + + ns = last_slot - cur_slot; while (ns && count) { - while ((ns > 2) && (count > 2)) - { - b0 = (bufs + curr_buf); - b1 = (bufs + curr_buf + 1); - - b0->desc_index = mq->last_head; - i = 0; - do - { - b0->data = memif_get_buffer (conn, ring, mq->last_head); - b0->data_len = ring->desc[mq->last_head].length; - b0->buffer_len = ring->desc[mq->last_head].buffer_length; -#ifdef MEMIF_DBG_SHM - print_bytes (b0->data + - ring->desc[b0->desc_index].buffer_length * i++, - ring->desc[b0->desc_index].buffer_length, - DBG_TX_BUF); -#endif - mq->last_head = (mq->last_head + 1) & mask; - ns--; - *rx += 1; - } - while (ring->desc[mq->last_head].flags & MEMIF_DESC_FLAG_NEXT); - - b1->desc_index = mq->last_head; - i = 0; - do - { - b1->data = memif_get_buffer (conn, ring, mq->last_head); - b1->data_len = ring->desc[mq->last_head].length; - b1->buffer_len = ring->desc[mq->last_head].buffer_length; -#ifdef MEMIF_DBG_SHM - print_bytes (b1->data + - ring->desc[b1->desc_index].buffer_length * i++, - ring->desc[b1->desc_index].buffer_length, - DBG_TX_BUF); -#endif - mq->last_head = (mq->last_head + 1) & mask; - ns--; - *rx += 1; - } - while (ring->desc[mq->last_head].flags & MEMIF_DESC_FLAG_NEXT); + b0 = (bufs + *rx); - count -= 2; - curr_buf += 2; + b0->desc_index = cur_slot; + b0->data = memif_get_buffer (c, ring, cur_slot & mask); + b0->len = ring->desc[cur_slot & mask].length; + /* slave resets buffer length */ + if (c->args.is_master == 0) + { + ring->desc[cur_slot & mask].length = c->run_args.buffer_size; } - b0 = (bufs + curr_buf); - b0->desc_index = mq->last_head; - i = 0; - do + b0->flags = MEMIF_BUFFER_FLAG_RX; + if (ring->desc[cur_slot & mask].flags & MEMIF_DESC_FLAG_NEXT) { - b0->data = memif_get_buffer (conn, ring, mq->last_head); - b0->data_len = ring->desc[mq->last_head].length; - b0->buffer_len = ring->desc[mq->last_head].buffer_length; -#ifdef MEMIF_DBG_SHM - print_bytes (b0->data + - ring->desc[b0->desc_index].buffer_length * i++, - ring->desc[b0->desc_index].buffer_length, DBG_TX_BUF); -#endif - mq->last_head = (mq->last_head + 1) & mask; - ns--; - *rx += 1; + b0->flags |= MEMIF_BUFFER_FLAG_NEXT; + ring->desc[cur_slot & mask].flags &= ~MEMIF_DESC_FLAG_NEXT; } - while (ring->desc[mq->last_head].flags & MEMIF_DESC_FLAG_NEXT); +/* b0->offset = ring->desc[cur_slot & mask].offset;*/ + b0->ring = ring; +#ifdef MEMIF_DBG_SHM + printf ("data: %p\n", b0->data); + printf ("index: %u\n", b0->desc_index); + printf ("ring: %p\n", b0->ring); + print_bytes (b0->data, b0->len, DBG_RX_BUF); +#endif /* MEMIF_DBG_SHM */ + ns--; + *rx += 1; count--; - curr_buf++; + cur_slot++; } - mq->alloc_bufs += *rx; - - /* TODO: return num of buffers and packets */ - *rx = curr_buf; + if (c->args.is_master) + mq->last_head = cur_slot; + else + mq->last_tail = cur_slot; if (ns) { @@ -1813,6 +2566,10 @@ memif_rx_burst (memif_conn_handle_t conn, uint16_t qid, return MEMIF_ERR_NOBUF; } + r = read (mq->int_fd, &b, sizeof (b)); + if (EXPECT_FALSE ((r == -1) && (errno != EAGAIN))) + return memif_syscall_error_handler (errno); + return MEMIF_ERR_SUCCESS; /* 0 */ } @@ -1821,48 +2578,51 @@ memif_get_details (memif_conn_handle_t conn, memif_details_t * md, char *buf, ssize_t buflen) { memif_connection_t *c = (memif_connection_t *) conn; + libmemif_main_t *lm; + memif_socket_t *ms; + int err = MEMIF_ERR_SUCCESS, i; + ssize_t l0 = 0, l1; + if (c == NULL) return MEMIF_ERR_NOCONN; - int err = MEMIF_ERR_SUCCESS, i; - ssize_t l0, l1, total_l; - l0 = 0; + ms = (memif_socket_t *) c->args.socket; + lm = get_libmemif_main (ms); l1 = strlen ((char *) c->args.interface_name); - if (l0 + l1 <= buflen) + if (l0 + l1 < buflen) { - md->if_name = strncpy (buf + l0, (char *) c->args.interface_name, l1); - md->if_name[l0 + l1] = '\0'; + md->if_name = + (uint8_t *) strcpy (buf + l0, (char *) c->args.interface_name); l0 += l1 + 1; } else err = MEMIF_ERR_NOBUF_DET; - l1 = strlen ((char *) c->args.instance_name); - if (l0 + l1 <= buflen) + l1 = strlen ((char *) lm->app_name); + if (l0 + l1 < buflen) { - md->inst_name = strncpy (buf + l0, (char *) c->args.instance_name, l1); - md->inst_name[l0 + l1] = '\0'; + md->inst_name = (uint8_t *) strcpy (buf + l0, (char *) lm->app_name); l0 += l1 + 1; } else err = MEMIF_ERR_NOBUF_DET; l1 = strlen ((char *) c->remote_if_name); - if (l0 + l1 <= buflen) + if (l0 + l1 < buflen) { - md->remote_if_name = strncpy (buf + l0, (char *) c->remote_if_name, l1); - md->remote_if_name[l0 + l1] = '\0'; + md->remote_if_name = + (uint8_t *) strcpy (buf + l0, (char *) c->remote_if_name); l0 += l1 + 1; } else err = MEMIF_ERR_NOBUF_DET; l1 = strlen ((char *) c->remote_name); - if (l0 + l1 <= buflen) + if (l0 + l1 < buflen) { - md->remote_inst_name = strncpy (buf + l0, (char *) c->remote_name, l1); - md->remote_inst_name[l0 + l1] = '\0'; + md->remote_inst_name = + (uint8_t *) strcpy (buf + l0, (char *) c->remote_name); l0 += l1 + 1; } else @@ -1870,30 +2630,59 @@ memif_get_details (memif_conn_handle_t conn, memif_details_t * md, md->id = c->args.interface_id; - if (c->args.secret) + if (strlen ((char *) c->args.secret) > 0) { l1 = strlen ((char *) c->args.secret); - md->secret = strncpy (buf + l0, (char *) c->args.secret, l1); - md->secret[l0 + l1] = '\0'; - l0 += l1 + 1; + if (l0 + l1 < buflen) + { + md->secret = (uint8_t *) strcpy (buf + l0, (char *) c->args.secret); + l0 += l1 + 1; + } + else + err = MEMIF_ERR_NOBUF_DET; } - else - err = MEMIF_ERR_NOBUF_DET; md->role = (c->args.is_master) ? 0 : 1; md->mode = c->args.mode; - l1 = strlen ((char *) c->args.socket_filename); - if (l0 + l1 <= buflen) + l1 = strlen ((char *) ms->filename); + if (l0 + l1 < buflen) { md->socket_filename = - strncpy (buf + l0, (char *) c->args.socket_filename, l1); - md->socket_filename[l0 + l1] = '\0'; + (uint8_t *) strcpy (buf + l0, (char *) ms->filename); + l0 += l1 + 1; + } + else + err = MEMIF_ERR_NOBUF_DET; + + l1 = strlen ((char *) c->remote_disconnect_string); + if (l0 + l1 < buflen) + { + md->error = + (uint8_t *) strcpy (buf + l0, (char *) c->remote_disconnect_string); l0 += l1 + 1; } else err = MEMIF_ERR_NOBUF_DET; + md->regions_num = c->regions_num; + l1 = sizeof (memif_region_details_t) * md->regions_num; + if (l0 + l1 <= buflen) + { + md->regions = (memif_region_details_t *) (buf + l0); + for (i = 0; i < md->regions_num; i++) + { + md->regions[i].index = i; + md->regions[i].addr = c->regions[i].addr; + md->regions[i].size = c->regions[i].region_size; + md->regions[i].fd = c->regions[i].fd; + md->regions[i].is_external = c->regions[i].is_external; + } + l0 += l1; + } + else + err = MEMIF_ERR_NOBUF_DET; + md->rx_queues_num = (c->args.is_master) ? c->run_args.num_s2m_rings : c-> run_args.num_m2s_rings; @@ -1901,19 +2690,22 @@ memif_get_details (memif_conn_handle_t conn, memif_details_t * md, l1 = sizeof (memif_queue_details_t) * md->rx_queues_num; if (l0 + l1 <= buflen) { - md->rx_queues = (memif_queue_details_t *) buf + l0; - l0 = l1 + 1; + md->rx_queues = (memif_queue_details_t *) (buf + l0); + for (i = 0; i < md->rx_queues_num; i++) + { + md->rx_queues[i].region = c->rx_queues[i].region; + md->rx_queues[i].qid = i; + md->rx_queues[i].ring_size = (1 << c->rx_queues[i].log2_ring_size); + md->rx_queues[i].flags = c->rx_queues[i].ring->flags; + md->rx_queues[i].head = c->rx_queues[i].ring->head; + md->rx_queues[i].tail = c->rx_queues[i].ring->tail; + md->rx_queues[i].buffer_size = c->run_args.buffer_size; + } + l0 += l1; } else err = MEMIF_ERR_NOBUF_DET; - for (i = 0; i < md->rx_queues_num; i++) - { - md->rx_queues[i].qid = i; - md->rx_queues[i].ring_size = (1 << c->rx_queues[i].log2_ring_size); - md->rx_queues[i].buffer_size = c->run_args.buffer_size; - } - md->tx_queues_num = (c->args.is_master) ? c->run_args.num_m2s_rings : c-> run_args.num_s2m_rings; @@ -1921,19 +2713,22 @@ memif_get_details (memif_conn_handle_t conn, memif_details_t * md, l1 = sizeof (memif_queue_details_t) * md->tx_queues_num; if (l0 + l1 <= buflen) { - md->tx_queues = (memif_queue_details_t *) buf + l0; - l0 = l1 + 1; + md->tx_queues = (memif_queue_details_t *) (buf + l0); + for (i = 0; i < md->tx_queues_num; i++) + { + md->tx_queues[i].region = c->tx_queues[i].region; + md->tx_queues[i].qid = i; + md->tx_queues[i].ring_size = (1 << c->tx_queues[i].log2_ring_size); + md->tx_queues[i].flags = c->tx_queues[i].ring->flags; + md->tx_queues[i].head = c->tx_queues[i].ring->head; + md->tx_queues[i].tail = c->tx_queues[i].ring->tail; + md->tx_queues[i].buffer_size = c->run_args.buffer_size; + } + l0 += l1; } else err = MEMIF_ERR_NOBUF_DET; - for (i = 0; i < md->tx_queues_num; i++) - { - md->tx_queues[i].qid = i; - md->tx_queues[i].ring_size = (1 << c->tx_queues[i].log2_ring_size); - md->tx_queues[i].buffer_size = c->run_args.buffer_size; - } - md->link_up_down = (c->fd > 0) ? 1 : 0; return err; /* 0 */ @@ -1943,12 +2738,15 @@ int memif_get_queue_efd (memif_conn_handle_t conn, uint16_t qid, int *efd) { memif_connection_t *c = (memif_connection_t *) conn; + uint8_t num; + *efd = -1; if (c == NULL) return MEMIF_ERR_NOCONN; if (c->fd < 0) return MEMIF_ERR_DISCONNECTED; - uint8_t num = + + num = (c->args.is_master) ? c->run_args.num_s2m_rings : c-> run_args.num_m2s_rings; if (qid >= num) @@ -1963,21 +2761,58 @@ int memif_cleanup () { libmemif_main_t *lm = &libmemif_main; - if (lm->app_name) - free (lm->app_name); - lm->app_name = NULL; + int err; + + err = memif_delete_socket ((memif_socket_handle_t *) & lm->default_socket); + if (err != MEMIF_ERR_SUCCESS) + return err; + + if (lm->control_list) + lm->free (lm->control_list); + lm->control_list = NULL; + if (lm->interrupt_list) + lm->free (lm->interrupt_list); + lm->interrupt_list = NULL; + if (lm->socket_list) + lm->free (lm->socket_list); + lm->socket_list = NULL; + if (lm->pending_list) + lm->free (lm->pending_list); + lm->pending_list = NULL; + if (lm->poll_cancel_fd != -1) + close (lm->poll_cancel_fd); + + return MEMIF_ERR_SUCCESS; /* 0 */ +} + +int +memif_per_thread_cleanup (memif_per_thread_main_handle_t * pt_main) +{ + libmemif_main_t *lm = (libmemif_main_t *) * pt_main; + + if (lm == NULL) + return MEMIF_ERR_INVAL_ARG; + + /* No default socket in case of per thread */ + if (lm->control_list) - free (lm->control_list); + lm->free (lm->control_list); lm->control_list = NULL; if (lm->interrupt_list) - free (lm->interrupt_list); + lm->free (lm->interrupt_list); lm->interrupt_list = NULL; - if (lm->listener_list) - free (lm->listener_list); - lm->listener_list = NULL; + if (lm->socket_list) + lm->free (lm->socket_list); + lm->socket_list = NULL; if (lm->pending_list) - free (lm->pending_list); + lm->free (lm->pending_list); lm->pending_list = NULL; + if (lm->poll_cancel_fd != -1) + close (lm->poll_cancel_fd); + + lm->free (lm); + + *pt_main = NULL; return MEMIF_ERR_SUCCESS; /* 0 */ }