X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Flibmemif%2Fsrc%2Fmain.c;h=ab7a2f04c141d51596a7deaf0f769c5351d640da;hb=be420e59e9590cc7ba5b4ec5a4ab4e252387bd24;hp=49bf50cb5e04ac44ae4d780db32cf3bdfa315136;hpb=b467b2a02be6ea7bab1a4773523afe8a8e3cfd83;p=vpp.git diff --git a/extras/libmemif/src/main.c b/extras/libmemif/src/main.c index 49bf50cb5e0..ab7a2f04c14 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,18 @@ /* 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; +int poll_cancel_fd = -1; static char memif_buf[MAX_ERRBUF_LEN]; @@ -72,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 */ @@ -139,7 +144,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 +172,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 +198,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 +215,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) @@ -310,7 +331,7 @@ add_list_elt (memif_list_elt_t * e, memif_list_elt_t ** list, uint16_t * len) } } 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; @@ -396,22 +417,76 @@ 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) +{ + libmemif_main_t *lm = &libmemif_main; + 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) +{ + libmemif_main_t *lm = &libmemif_main; + lm->free = mf; +} + 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 (memif_alloc != NULL) + { + memif_alloc_register (memif_alloc); + } + else + memif_alloc_register (malloc); + + if (memif_realloc != NULL) + { + memif_realloc_register (memif_realloc); + } + else + memif_realloc_register (realloc); - if (app_name) + if (memif_free != NULL) + memif_free_register (memif_free); + else + memif_free_register (free); + + if (app_name != 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)); + 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)); } @@ -423,24 +498,49 @@ memif_init (memif_control_fd_update_t * on_control_fd_update, char *app_name) { memif_epfd = epoll_create (1); memif_control_fd_update_register (memif_control_fd_update); + if ((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 (poll_cancel_fd, MEMIF_FD_EVENT_READ); 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->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->alloc (sizeof (memif_list_elt_t) * lm->interrupt_list_len); + if (lm->interrupt_list == NULL) + { + err = MEMIF_ERR_NOMEM; + goto error; + } lm->listener_list = - malloc (sizeof (memif_list_elt_t) * lm->listener_list_len); + lm->alloc (sizeof (memif_list_elt_t) * lm->listener_list_len); + if (lm->listener_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++) @@ -469,24 +569,27 @@ 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)); if (lm->control_fd_update (lm->timerfd, MEMIF_FD_EVENT_READ) < 0) { DBG ("callback type memif_control_fd_update_t error!"); - return MEMIF_ERR_CB_FDUPDATE; + err = MEMIF_ERR_CB_FDUPDATE; + goto error; } - return 0; + return err; + +error: + memif_cleanup (); + return err; } static inline memif_ring_t * @@ -495,7 +598,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); @@ -528,7 +631,8 @@ memif_create (memif_conn_handle_t * c, memif_conn_args_t * args, memif_connection_update_t * on_disconnect, memif_interrupt_t * on_interrupt, void *private_ctx) { - int err, i, index, sockfd = -1; + libmemif_main_t *lm = &libmemif_main; + int err, i, index = 0, sockfd = -1; memif_list_elt_t list_elt; memif_connection_t *conn = (memif_connection_t *) * c; if (conn != NULL) @@ -536,20 +640,23 @@ memif_create (memif_conn_handle_t * c, memif_conn_args_t * args, DBG ("This handle already points to existing memif."); return MEMIF_ERR_CONN; } - conn = (memif_connection_t *) malloc (sizeof (memif_connection_t)); + conn = (memif_connection_t *) lm->alloc (sizeof (memif_connection_t)); if (conn == NULL) { - err = memif_syscall_error_handler (errno); + err = MEMIF_ERR_NOMEM; goto error; } memset (conn, 0, sizeof (memif_connection_t)); - libmemif_main_t *lm = &libmemif_main; - 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) @@ -578,13 +685,14 @@ memif_create (memif_conn_handle_t * c, memif_conn_args_t * args, strncpy ((char *) conn->args.interface_name, (char *) args->interface_name, l); - l = strlen ((char *) args->instance_name); - strncpy ((char *) conn->args.instance_name, (char *) args->instance_name, - l); - /* allocate and initialize socket_filename so it can be copyed to sun_path without memory leaks */ - conn->args.socket_filename = malloc (sizeof (char *) * 108); + 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 (args->socket_filename) @@ -614,9 +722,8 @@ memif_create (memif_conn_handle_t * c, memif_conn_args_t * args, MEMIF_DEFAULT_SOCKET_FILENAME, sfl); } - if (args->secret) + if ((l = strlen ((char *) args->secret)) > 0) { - l = strlen ((char *) args->secret); strncpy ((char *) conn->args.secret, (char *) args->secret, l); } @@ -655,10 +762,20 @@ memif_create (memif_conn_handle_t * c, memif_conn_args_t * args, return memif_syscall_error_handler (errno); } DBG ("creating socket file"); - ms = malloc (sizeof (memif_socket_t)); + ms = lm->alloc (sizeof (memif_socket_t)); + if (ms == NULL) + { + err = MEMIF_ERR_NOMEM; + goto error; + } ms->filename = - malloc (strlen ((char *) conn->args.socket_filename) + - sizeof (char)); + 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)); @@ -667,7 +784,13 @@ memif_create (memif_conn_handle_t * c, memif_conn_args_t * args, strlen ((char *) conn->args.socket_filename)); ms->interface_list_len = 1; ms->interface_list = - malloc (sizeof (memif_list_elt_t) * ms->interface_list_len); + 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 }; @@ -759,9 +882,9 @@ error: close (sockfd); sockfd = -1; if (conn->args.socket_filename) - free (conn->args.socket_filename); + lm->free (conn->args.socket_filename); if (conn != NULL) - free (conn); + lm->free (conn); *c = conn = NULL; return err; } @@ -769,7 +892,7 @@ error: int memif_control_fd_handler (int fd, uint8_t events) { - int i, rv, sockfd = -1, err = MEMIF_ERR_SUCCESS; /* 0 */ + int i, sockfd = -1, err = MEMIF_ERR_SUCCESS; /* 0 */ uint16_t num; memif_list_elt_t *e = NULL; memif_connection_t *conn; @@ -779,6 +902,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) @@ -798,7 +925,7 @@ memif_control_fd_handler (int fd, uint8_t events) sun.sun_family = AF_UNIX; - strncpy (sun.sun_path, conn->args.socket_filename, + strncpy (sun.sun_path, (char *) conn->args.socket_filename, sizeof (sun.sun_path) - 1); if (connect (sockfd, (struct sockaddr *) &sun, @@ -828,8 +955,9 @@ memif_control_fd_handler (int fd, uint8_t events) } else { - err = memif_syscall_error_handler (errno); - goto error; + strcpy ((char *) conn->remote_disconnect_string, + memif_strerror (memif_syscall_error_handler + (errno))); } } } @@ -918,12 +1046,11 @@ error: 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; @@ -931,11 +1058,20 @@ memif_poll_event (int timeout) en = epoll_pwait (memif_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 == 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 +1084,28 @@ memif_poll_event (int timeout) return 0; } +int +memif_cancel_poll_event () +{ + uint64_t counter = 1; + ssize_t w = 0; + + if (poll_cancel_fd == -1) + return 0; + w = write (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; } @@ -978,7 +1129,7 @@ memif_disconnect_internal (memif_connection_t * c) if (c->fd > 0) { - memif_msg_send_disconnect (c->fd, "interface deleted", 0); + memif_msg_send_disconnect (c->fd, (uint8_t *) "interface deleted", 0); lm->control_fd_update (c->fd, MEMIF_FD_EVENT_DEL); close (c->fd); } @@ -1007,7 +1158,7 @@ memif_disconnect_internal (memif_connection_t * c) mq->int_fd = -1; } } - free (c->tx_queues); + lm->free (c->tx_queues); c->tx_queues = NULL; } @@ -1032,24 +1183,36 @@ memif_disconnect_internal (memif_connection_t * c) mq->int_fd = -1; } } - free (c->rx_queues); + lm->free (c->rx_queues); 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; - 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 +1221,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++; @@ -1109,11 +1272,11 @@ memif_delete (memif_conn_handle_t * conn) c->listener_fd); close (c->listener_fd); c->listener_fd = ms->fd = -1; - free (ms->interface_list); + lm->free (ms->interface_list); ms->interface_list = NULL; - free (ms->filename); + lm->free (ms->filename); ms->filename = NULL; - free (ms); + lm->free (ms); ms = NULL; } } @@ -1132,10 +1295,10 @@ memif_delete (memif_conn_handle_t * conn) } if (c->args.socket_filename) - free (c->args.socket_filename); + lm->free (c->args.socket_filename); c->args.socket_filename = NULL; - free (c); + lm->free (c); c = NULL; *conn = c; @@ -1146,56 +1309,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 99; /* FIXME: proper error report */ + 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 = @@ -1208,44 +1381,62 @@ memif_connect1 (memif_connection_t * c) 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)); - r->region_size = 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) 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 +1447,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,28 +1463,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 = 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); @@ -1302,22 +1496,22 @@ 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; 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); @@ -1327,137 +1521,247 @@ 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; } 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; - /* (head == tail) ? receive function will asume that no packets are available */ - ns -= 1; + /* can only be called by slave */ + ns = ring_size - (ring->head + mq->alloc_bufs) + ring->tail; + + 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 |= + (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 = &libmemif_main; + 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); - mq->alloc_bufs += chain_buf0; + /* 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); - DBG ("allocated ring slot %u", s0); - count--; - ns -= chain_buf0; + src_left -= b0->len; + dst_left -= b0->len; + } + + 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 +1775,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; 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; + uint32_t offset_mask = c->run_args.buffer_size - 1; + uint16_t slot; - if (mq->alloc_bufs < count) - count = mq->alloc_bufs; - - 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 +1833,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 +1900,76 @@ 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)) + if (EXPECT_FALSE ((r == -1) && (errno != EAGAIN))) return memif_syscall_error_handler (errno); - 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) + return MEMIF_ERR_SUCCESS; - if (head > mq->last_head) - ns = head - mq->last_head; - else - ns = (1 << mq->log2_ring_size) - mq->last_head + head; + 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); + b0 = (bufs + *rx); - 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); - - 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) { @@ -1820,49 +1984,49 @@ int memif_get_details (memif_conn_handle_t conn, memif_details_t * md, char *buf, ssize_t buflen) { + libmemif_main_t *lm = &libmemif_main; memif_connection_t *c = (memif_connection_t *) conn; if (c == NULL) return MEMIF_ERR_NOCONN; int err = MEMIF_ERR_SUCCESS, i; - ssize_t l0, l1, total_l; + ssize_t l0, l1; l0 = 0; 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 +2034,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) + 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 *) c->args.socket_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; @@ -1902,18 +2095,21 @@ memif_get_details (memif_conn_handle_t conn, memif_details_t * md, if (l0 + l1 <= buflen) { md->rx_queues = (memif_queue_details_t *) buf + l0; - l0 = l1 + 1; + 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; @@ -1922,18 +2118,21 @@ memif_get_details (memif_conn_handle_t conn, memif_details_t * md, if (l0 + l1 <= buflen) { md->tx_queues = (memif_queue_details_t *) buf + l0; - l0 = l1 + 1; + 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 */ @@ -1963,21 +2162,20 @@ int memif_cleanup () { libmemif_main_t *lm = &libmemif_main; - if (lm->app_name) - free (lm->app_name); - lm->app_name = NULL; 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->free (lm->listener_list); lm->listener_list = NULL; if (lm->pending_list) - free (lm->pending_list); + lm->free (lm->pending_list); lm->pending_list = NULL; + if (poll_cancel_fd != -1) + close (poll_cancel_fd); return MEMIF_ERR_SUCCESS; /* 0 */ }