X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Flibmemif%2Fsrc%2Fmain.c;h=5f92f029a8abace9528ea3ac72af42492b34a4f3;hb=cbd179cd39ffedbfd0a43a51bde998f09cefe669;hp=6048e4ef80e074807d233ac5c260f63fbb7b1f88;hpb=435f50021556a6be34de972605ed62cbaf3d739e;p=vpp.git diff --git a/extras/libmemif/src/main.c b/extras/libmemif/src/main.c index 6048e4ef80e..5f92f029a8a 100644 --- a/extras/libmemif/src/main.c +++ b/extras/libmemif/src/main.c @@ -15,6 +15,7 @@ *------------------------------------------------------------------ */ +#define _GNU_SOURCE #include #include #include @@ -55,7 +56,7 @@ /* private structs and functions */ #include -#define ERRLIST_LEN 39 +#define ERRLIST_LEN 40 #define MAX_ERRBUF_LEN 256 #if __x86_x64__ @@ -74,6 +75,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 */ @@ -214,8 +217,12 @@ memif_syscall_error_handler (int err_code) return MEMIF_ERR_NOMEM; /* 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) @@ -291,7 +298,7 @@ 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) { if (events & MEMIF_FD_EVENT_DEL) return memif_del_epoll_fd (fd); @@ -312,8 +319,9 @@ int add_list_elt (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) @@ -323,8 +331,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; @@ -347,12 +355,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) @@ -410,6 +419,19 @@ memif_control_fd_update_register (memif_control_fd_update_t * cb) 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 (memif_alloc_t * ma) { @@ -417,6 +439,13 @@ memif_alloc_register (memif_alloc_t * ma) lm->alloc = ma; } +static void +memif_realloc_register (memif_realloc_t * mr) +{ + libmemif_main_t *lm = &libmemif_main; + lm->realloc = mr; +} + static void memif_free_register (memif_free_t * mf) { @@ -424,9 +453,29 @@ memif_free_register (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_init (memif_control_fd_update_t * on_control_fd_update, char *app_name, - memif_alloc_t * memif_alloc, memif_free_t * memif_free) + 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; @@ -439,6 +488,13 @@ memif_init (memif_control_fd_update_t * on_control_fd_update, char *app_name, else memif_alloc_register (malloc); + if (memif_realloc != NULL) + { + memif_realloc_register (memif_realloc); + } + else + memif_realloc_register (realloc); + if (memif_free != NULL) memif_free_register (memif_free); else @@ -469,13 +525,13 @@ memif_init (memif_control_fd_update_t * on_control_fd_update, char *app_name, DBG ("eventfd: %s", strerror (err)); return memif_syscall_error_handler (err); } - lm->control_fd_update (poll_cancel_fd, MEMIF_FD_EVENT_READ); + lm->control_fd_update (poll_cancel_fd, MEMIF_FD_EVENT_READ, NULL); DBG ("libmemif event polling initialized"); } 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 = @@ -492,9 +548,9 @@ memif_init (memif_control_fd_update_t * on_control_fd_update, char *app_name, err = MEMIF_ERR_NOMEM; goto error; } - lm->listener_list = - lm->alloc (sizeof (memif_list_elt_t) * lm->listener_list_len); - if (lm->listener_list == NULL) + 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; @@ -518,10 +574,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++) { @@ -538,12 +594,12 @@ memif_init (memif_control_fd_update_t * on_control_fd_update, char *app_name, 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; + 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, NULL) < 0) { DBG ("callback type memif_control_fd_update_t error!"); err = MEMIF_ERR_CB_FDUPDATE; @@ -563,7 +619,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); @@ -580,8 +636,8 @@ memif_set_rx_mode (memif_conn_handle_t c, memif_rx_mode_t rx_mode, if (conn == NULL) return MEMIF_ERR_NOCONN; uint8_t num = - (conn->args.is_master) ? conn->run_args.num_s2m_rings : conn->run_args. - num_m2s_rings; + (conn->args.is_master) ? conn->run_args.num_s2m_rings : conn-> + run_args.num_m2s_rings; if (qid >= num) return MEMIF_ERR_QID; @@ -590,6 +646,158 @@ memif_set_rx_mode (memif_conn_handle_t c, memif_rx_mode_t rx_mode, return MEMIF_ERR_SUCCESS; } +static int +memif_socket_start_listening (memif_socket_t * ms) +{ + libmemif_main_t *lm = &libmemif_main; + 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) + { + if (S_ISSOCK (file_stat.st_mode)) + unlink ((char *) ms->filename); + else + return memif_syscall_error_handler (errno); + } + + 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); + 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; + } + + /* add socket to libmemif main */ + elt.key = ms->fd; + elt.data_struct = ms; + add_list_elt (&elt, &lm->socket_list, &lm->socket_list_len); + lm->control_fd_update (ms->fd, MEMIF_FD_EVENT_READ, ms->private_ctx); + + ms->type = MEMIF_SOCKET_TYPE_LISTENER; + + return err; + +error: + if (ms->fd > 0) + { + close (ms->fd); + ms->fd = -1; + } + return err; +} + +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; + + 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; + } + } + + /* 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) + { + 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) + { + 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; +} + int memif_create (memif_conn_handle_t * c, memif_conn_args_t * args, memif_connection_update_t * on_connect, @@ -597,9 +805,11 @@ memif_create (memif_conn_handle_t * c, memif_conn_args_t * args, memif_interrupt_t * on_interrupt, void *private_ctx) { libmemif_main_t *lm = &libmemif_main; - int err, i, index, sockfd = -1; - memif_list_elt_t list_elt; + 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."); @@ -650,214 +860,161 @@ memif_create (memif_conn_handle_t * c, memif_conn_args_t * args, strncpy ((char *) conn->args.interface_name, (char *) args->interface_name, l); - /* allocate and initialize socket_filename so it can be copyed to sun_path - without memory leaks */ - conn->args.socket_filename = lm->alloc (sizeof (char *) * 108); - if (conn->args.socket_filename == NULL) - { - err = MEMIF_ERR_NOMEM; - goto error; - } - memset (conn->args.socket_filename, 0, 108 * sizeof (char *)); + if ((l = strlen ((char *) args->secret)) > 0) + strncpy ((char *) conn->args.secret, (char *) args->secret, l); - if (args->socket_filename) - { - if (conn->args.socket_filename == NULL) - { - err = memif_syscall_error_handler (errno); - goto error; - } - strncpy ((char *) conn->args.socket_filename, - (char *) args->socket_filename, - strlen ((char *) args->socket_filename)); - } + if (args->socket != NULL) + conn->args.socket = args->socket; else { - uint16_t sdl = strlen (MEMIF_DEFAULT_SOCKET_DIR); - uint16_t sfl = strlen (MEMIF_DEFAULT_SOCKET_FILENAME); - if (conn->args.socket_filename == NULL) + if (lm->default_socket == NULL) { - err = memif_syscall_error_handler (errno); - goto error; + err = + memif_create_socket ((memif_socket_handle_t *) & + lm->default_socket, + MEMIF_DEFAULT_SOCKET_PATH, NULL); + if (err != MEMIF_ERR_SUCCESS) + goto error; } - 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); + conn->args.socket = lm->default_socket; } + ms = (memif_socket_t *) conn->args.socket; - if ((l = strlen ((char *) args->secret)) > 0) + if ((conn->args.is_master && ms->type == MEMIF_SOCKET_TYPE_CLIENT) || + (!conn->args.is_master && ms->type == MEMIF_SOCKET_TYPE_LISTENER)) { - strncpy ((char *) conn->args.secret, (char *) args->secret, l); + err = MEMIF_ERR_INVAL_ARG; + goto error; } + elt.key = conn->args.interface_id; + elt.data_struct = conn; + add_list_elt (&elt, &ms->interface_list, &ms->interface_list_len); + ms->use_count++; + if (conn->args.is_master) { - 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 = - (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 = lm->alloc (sizeof (memif_socket_t)); - if (ms == NULL) - { - err = MEMIF_ERR_NOMEM; - goto error; - } - ms->filename = - lm->alloc (strlen ((char *) conn->args.socket_filename) + - sizeof (char)); - if (ms->filename == NULL) - { - err = MEMIF_ERR_NOMEM; - goto error; - } - 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 = - 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; - 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; - } - - /* 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; - } - } + 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) + lm->disconn_slaves++; + + elt.key = -1; + elt.data_struct = conn; + if ((index = + add_list_elt (&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 < 0) && (lm->disconn_slaves == 1)) + { + /* 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++; + *c = conn; - 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) + return 0; + +error: + if (conn != NULL) + lm->free (conn); + *c = conn = NULL; + return err; +} + +int +memif_request_connection (memif_conn_handle_t c) +{ + libmemif_main_t *lm = &libmemif_main; + memif_connection_t *conn = (memif_connection_t *) c; + 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; + + 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, conn->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 + { + strcpy ((char *) conn->remote_disconnect_string, + memif_strerror (memif_syscall_error_handler (errno))); + 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) - lm->free (conn->args.socket_filename); - if (conn != NULL) - lm->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; @@ -867,6 +1024,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) @@ -875,50 +1036,9 @@ 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_syscall_error_handler (errno); - goto error; - } - - sun.sun_family = AF_UNIX; - - strncpy (sun.sun_path, (char*) conn->args.socket_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->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; - } + err = memif_request_connection (conn); + if (err != MEMIF_ERR_SUCCESS) + DBG ("memif_request_connection: %s", memif_strerror (err)); } } } @@ -930,39 +1050,41 @@ memif_control_fd_handler (int fd, uint8_t events) 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; + (((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++) { - if (((memif_connection_t *) e->data_struct)->rx_queues[i]. - int_fd == fd) + 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); + ((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->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 (fd); + return err; } get_list_elt (&e, lm->control_list, lm->control_list_len, fd); @@ -971,24 +1093,24 @@ memif_control_fd_handler (int fd, uint8_t events) if (events & MEMIF_FD_EVENT_READ) { err = - ((memif_connection_t *) e->data_struct)->read_fn (e-> - data_struct); + ((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); + ((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); + ((memif_connection_t *) e->data_struct)-> + error_fn (e->data_struct); if (err != MEMIF_ERR_SUCCESS) return err; } @@ -998,20 +1120,14 @@ memif_control_fd_handler (int fd, uint8_t events) return MEMIF_ERR_SUCCESS; /* 0 */ error: - if (sockfd > 0) - close (sockfd); - sockfd = -1; return err; } 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; @@ -1031,6 +1147,9 @@ memif_poll_event (int timeout) if (evt.data.fd == 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) @@ -1091,7 +1210,7 @@ memif_disconnect_internal (memif_connection_t * c) if (c->fd > 0) { memif_msg_send_disconnect (c->fd, (uint8_t *) "interface deleted", 0); - lm->control_fd_update (c->fd, MEMIF_FD_EVENT_DEL); + lm->control_fd_update (c->fd, MEMIF_FD_EVENT_DEL, c->private_ctx); close (c->fd); } get_list_elt (&e, lm->control_list, lm->control_list_len, c->fd); @@ -1105,8 +1224,8 @@ 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; + (c->args.is_master) ? c->run_args.num_m2s_rings : c-> + run_args.num_s2m_rings; for (i = 0; i < num; i++) { mq = &c->tx_queues[i]; @@ -1126,8 +1245,8 @@ memif_disconnect_internal (memif_connection_t * c) if (c->rx_queues != NULL) { num = - (c->args.is_master) ? c->run_args.num_s2m_rings : c->run_args. - num_m2s_rings; + (c->args.is_master) ? c->run_args.num_s2m_rings : c-> + run_args.num_m2s_rings; for (i = 0; i < num; i++) { mq = &c->rx_queues[i]; @@ -1136,7 +1255,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, + c->private_ctx); close (mq->int_fd); } free_list_elt (lm->interrupt_list, lm->interrupt_list_len, @@ -1148,16 +1268,28 @@ memif_disconnect_internal (memif_connection_t * c) c->rx_queues = NULL; } - 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; - lm->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)); @@ -1179,20 +1311,39 @@ memif_disconnect_internal (memif_connection_t * c) return err; } +int +memif_delete_socket (memif_socket_handle_t * sock) +{ + memif_socket_t *ms = (memif_socket_t *) * sock; + libmemif_main_t *lm = &libmemif_main; + + /* check if socket is in use */ + if (ms == NULL || ms->type != MEMIF_SOCKET_TYPE_NONE) + return MEMIF_ERR_INVAL_ARG; + + 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 = &libmemif_main; + 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) { @@ -1204,33 +1355,25 @@ memif_delete (memif_conn_handle_t * conn) 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; - lm->free (ms->interface_list); - ms->interface_list = NULL; - lm->free (ms->filename); - ms->filename = NULL; - lm->free (ms); - ms = NULL; - } + lm->control_fd_update (ms->fd, MEMIF_FD_EVENT_DEL, ms->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) @@ -1243,10 +1386,6 @@ memif_delete (memif_conn_handle_t * conn) } } - if (c->args.socket_filename) - lm->free (c->args.socket_filename); - c->args.socket_filename = NULL; - lm->free (c); c = NULL; @@ -1258,56 +1397,66 @@ int memif_connect1 (memif_connection_t * c) { libmemif_main_t *lm = &libmemif_main; - memif_region_t *mr = c->regions; + memif_region_t *mr; memif_queue_t *mq; int i; - uint16_t num; - if (mr != NULL) + 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 = @@ -1315,37 +1464,46 @@ 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, + c->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; memif_region_t *r; - int i, j; - libmemif_main_t *lm = &libmemif_main; - memif_list_elt_t e; - conn->regions = (memif_region_t *) lm->alloc (sizeof (memif_region_t)); - if (conn->regions == NULL) + r = + lm->realloc (conn->regions, + sizeof (memif_region_t) * ++conn->regions_num); + if (r == NULL) return MEMIF_ERR_NOMEM; - r = conn->regions; - 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)); + conn->regions = r; + r = &conn->regions[conn->regions_num - 1]; + memset (r, 0, sizeof (memif_region_t)); - r->region_size = r->buffer_offset + + 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 = (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) if ((r->fd = memfd_create ("memif region 0", MFD_ALLOW_SEALING)) == -1) return memif_syscall_error_handler (errno); @@ -1355,10 +1513,19 @@ memif_init_regions_and_queues (memif_connection_t * conn) 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); @@ -1369,8 +1536,9 @@ 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 = r->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].length = conn->run_args.buffer_size; } @@ -1384,28 +1552,30 @@ 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 = r->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].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 *) lm->alloc (sizeof (memif_queue_t) * conn->run_args.num_s2m_rings); if (mq == NULL) 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); @@ -1415,8 +1585,8 @@ memif_init_regions_and_queues (memif_connection_t * conn) 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; @@ -1426,11 +1596,11 @@ memif_init_regions_and_queues (memif_connection_t * conn) conn->run_args.num_m2s_rings); if (mq == NULL) 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); @@ -1440,12 +1610,51 @@ memif_init_regions_and_queues (memif_connection_t * conn) 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; + return MEMIF_ERR_SUCCESS; +} + +int +memif_init_regions_and_queues (memif_connection_t * conn) +{ + memif_region_t *r; + libmemif_main_t *lm = &libmemif_main; + + /* 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; } @@ -1460,8 +1669,8 @@ memif_buffer_enq_tx (memif_conn_handle_t conn, uint16_t qid, 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; + (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)) @@ -1475,17 +1684,15 @@ memif_buffer_enq_tx (memif_conn_handle_t conn, uint16_t qid, uint16_t mask = (1 << mq->log2_ring_size) - 1; uint16_t ring_size; uint16_t slot, ns; - int i, err = MEMIF_ERR_SUCCESS; /* 0 */ + int err = MEMIF_ERR_SUCCESS; /* 0 */ *count_out = 0; ring_size = (1 << mq->log2_ring_size); - ns = ring->tail - mq->last_tail; - mq->last_tail += ns; 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 + mq->last_tail; + ns = ring_size - (ring->head + mq->alloc_bufs) + ring->tail; b0 = bufs; @@ -1502,7 +1709,9 @@ memif_buffer_enq_tx (memif_conn_handle_t conn, uint16_t qid, ((memif_ring_t *) b0->ring)->desc[b0->desc_index & mask].offset = ring->desc[slot & mask].offset; /* put free buffer on rx ring */ ring->desc[slot & mask].offset = - (uint32_t) (b0->data - c->regions->shm); + (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; @@ -1526,7 +1735,6 @@ memif_buffer_enq_tx (memif_conn_handle_t conn, uint16_t qid, err = MEMIF_ERR_NOBUF_RING; } -error: return err; } @@ -1541,35 +1749,35 @@ memif_buffer_alloc (memif_conn_handle_t conn, uint16_t qid, 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; + (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 = &libmemif_main; memif_queue_t *mq = &c->tx_queues[qid]; memif_ring_t *ring = mq->ring; - memif_buffer_t *b0, *b1; + 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 i, err = MEMIF_ERR_SUCCESS; /* 0 */ + 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); - ns = ring->tail - mq->last_tail; - mq->last_tail += ns; slot = (c->args.is_master) ? ring->tail : ring->head; slot += mq->alloc_bufs; if (c->args.is_master) - ns = ring->head + mq->alloc_bufs - ring->tail; + ns = ring->head - (ring->tail + mq->alloc_bufs); else - ns = ring_size - ring->head + mq->alloc_bufs + mq->last_tail; + ns = ring_size - (ring->head + mq->alloc_bufs) + ring->tail; while (count && ns) { @@ -1596,7 +1804,6 @@ memif_buffer_alloc (memif_conn_handle_t conn, uint16_t qid, *count_out += 1; mq->alloc_bufs++; ns--; - count--; ring->desc[b0->desc_index & mask].flags |= MEMIF_DESC_FLAG_NEXT; @@ -1605,8 +1812,8 @@ memif_buffer_alloc (memif_conn_handle_t conn, uint16_t qid, b0 = (bufs + *count_out); b0->desc_index = slot; dst_left = - (c->args.is_master) ? ring->desc[slot & mask].length : c-> - run_args.buffer_size; + (c->args.is_master) ? ring->desc[slot & mask]. + length : c->run_args.buffer_size; ring->desc[slot & mask].flags = 0; } else @@ -1624,14 +1831,13 @@ memif_buffer_alloc (memif_conn_handle_t conn, uint16_t qid, /* slave resets buffer offset */ if (c->args.is_master == 0) { - uint16_t x = - (ring->desc[slot & mask].offset - - c->regions->buffer_offset) / c->run_args.buffer_size; - ring->desc[slot & mask].offset = - c->regions->buffer_offset + (x * c->run_args.buffer_size); + 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 = c->regions->shm + ring->desc[slot & mask].offset; + b0->data = memif_get_buffer (c, ring, slot & mask); src_left -= b0->len; dst_left -= b0->len; @@ -1655,7 +1861,6 @@ no_ns: err = MEMIF_ERR_NOBUF_RING; } -error: return err; } @@ -1669,14 +1874,15 @@ memif_refill_queue (memif_conn_handle_t conn, uint16_t qid, uint16_t count, 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; + (c->args.is_master) ? c->run_args.num_s2m_rings : c-> + run_args.num_m2s_rings; if (EXPECT_FALSE (qid >= num)) return MEMIF_ERR_QID; libmemif_main_t *lm = &libmemif_main; memif_queue_t *mq = &c->rx_queues[qid]; memif_ring_t *ring = mq->ring; uint16_t mask = (1 << mq->log2_ring_size) - 1; + uint32_t offset_mask = c->run_args.buffer_size - 1; uint16_t slot; if (c->args.is_master) @@ -1692,20 +1898,18 @@ memif_refill_queue (memif_conn_handle_t conn, uint16_t qid, uint16_t count, uint16_t ns = (1 << mq->log2_ring_size) - head + mq->last_tail; head += (count < ns) ? count : ns; - if (headroom) + slot = ring->head; + memif_desc_t *d; + while (slot < head) { - slot = (c->args.is_master) ? ring->head : ring->tail; - while (slot < head) - { - uint16_t x = - (ring->desc[slot & mask].offset - - c->regions->buffer_offset) / c->run_args.buffer_size; - ring->desc[slot & mask].offset = - c->regions->buffer_offset + (x * c->run_args.buffer_size) + - headroom; - - slot++; - } + 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_MEMORY_BARRIER (); @@ -1724,8 +1928,8 @@ memif_tx_burst (memif_conn_handle_t conn, uint16_t qid, 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; + (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 (!tx)) @@ -1791,8 +1995,8 @@ memif_rx_burst (memif_conn_handle_t conn, uint16_t qid, 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; + (c->args.is_master) ? c->run_args.num_s2m_rings : c-> + run_args.num_m2s_rings; if (EXPECT_FALSE (qid >= num)) return MEMIF_ERR_QID; if (EXPECT_FALSE (!rx)) @@ -1803,7 +2007,7 @@ memif_rx_burst (memif_conn_handle_t conn, uint16_t qid, uint16_t cur_slot, last_slot; uint16_t ns; uint16_t mask = (1 << mq->log2_ring_size) - 1; - memif_buffer_t *b0, *b1; + memif_buffer_t *b0; *rx = 0; uint64_t b; @@ -1872,17 +2076,20 @@ memif_get_details (memif_conn_handle_t conn, memif_details_t * md, { libmemif_main_t *lm = &libmemif_main; memif_connection_t *c = (memif_connection_t *) conn; + 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; l1 = strlen ((char *) c->args.interface_name); if (l0 + l1 < buflen) { - md->if_name = (uint8_t *) strcpy (buf + l0, (char *) c->args.interface_name); + md->if_name = + (uint8_t *) strcpy (buf + l0, (char *) c->args.interface_name); l0 += l1 + 1; } else @@ -1900,7 +2107,8 @@ memif_get_details (memif_conn_handle_t conn, memif_details_t * md, l1 = strlen ((char *) c->remote_if_name); if (l0 + l1 < buflen) { - md->remote_if_name = (uint8_t *) strcpy (buf + l0, (char *) c->remote_if_name); + md->remote_if_name = + (uint8_t *) strcpy (buf + l0, (char *) c->remote_if_name); l0 += l1 + 1; } else @@ -1909,7 +2117,8 @@ memif_get_details (memif_conn_handle_t conn, memif_details_t * md, l1 = strlen ((char *) c->remote_name); if (l0 + l1 < buflen) { - md->remote_inst_name = (uint8_t *) strcpy (buf + l0, (char *) c->remote_name); + md->remote_inst_name = + (uint8_t *) strcpy (buf + l0, (char *) c->remote_name); l0 += l1 + 1; } else @@ -1917,7 +2126,7 @@ memif_get_details (memif_conn_handle_t conn, memif_details_t * md, md->id = c->args.interface_id; - if (strlen((char *) c->args.secret) > 0) + if (strlen ((char *) c->args.secret) > 0) { l1 = strlen ((char *) c->args.secret); if (l0 + l1 < buflen) @@ -1932,62 +2141,90 @@ memif_get_details (memif_conn_handle_t conn, memif_details_t * md, md->role = (c->args.is_master) ? 0 : 1; md->mode = c->args.mode; - l1 = strlen ((char *) c->args.socket_filename); + l1 = strlen ((char *) ms->filename); if (l0 + l1 < buflen) { md->socket_filename = - (uint8_t *) strcpy (buf + l0, (char *) c->args.socket_filename); + (uint8_t *) strcpy (buf + l0, (char *) ms->filename); l0 += l1 + 1; } 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; + 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; - l1 = sizeof (memif_queue_details_t) * md->rx_queues_num; + md->regions_num = c->regions_num; + l1 = sizeof (memif_region_details_t) * md->regions_num; if (l0 + l1 <= buflen) { - md->rx_queues = (memif_queue_details_t *) buf + l0; + 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; - for (i = 0; i < md->rx_queues_num; i++) + md->rx_queues_num = + (c->args.is_master) ? c->run_args.num_s2m_rings : c-> + run_args.num_m2s_rings; + + l1 = sizeof (memif_queue_details_t) * md->rx_queues_num; + if (l0 + l1 <= buflen) { - 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; + 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; md->tx_queues_num = - (c->args.is_master) ? c->run_args.num_m2s_rings : c->run_args. - num_s2m_rings; + (c->args.is_master) ? c->run_args.num_m2s_rings : c-> + run_args.num_s2m_rings; l1 = sizeof (memif_queue_details_t) * md->tx_queues_num; if (l0 + l1 <= buflen) { - md->tx_queues = (memif_queue_details_t *) buf + l0; + 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].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; - } - md->link_up_down = (c->fd > 0) ? 1 : 0; return err; /* 0 */ @@ -1997,14 +2234,17 @@ 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 = - (c->args.is_master) ? c->run_args.num_s2m_rings : c->run_args. - num_m2s_rings; + + num = + (c->args.is_master) ? c->run_args.num_s2m_rings : c-> + run_args.num_m2s_rings; if (qid >= num) return MEMIF_ERR_QID; @@ -2017,15 +2257,18 @@ int memif_cleanup () { libmemif_main_t *lm = &libmemif_main; + + memif_delete_socket ((memif_socket_handle_t *) &lm->default_socket); + 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->listener_list) - lm->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) lm->free (lm->pending_list); lm->pending_list = NULL;