X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Flibmemif%2Fsrc%2Fmain.c;h=ab7a2f04c141d51596a7deaf0f769c5351d640da;hb=be420e59e9590cc7ba5b4ec5a4ab4e252387bd24;hp=dc4a6231118fa743d90775c73075e2f8cebbdb9c;hpb=23d4e8a6b5a3824ef5390061cf3dd7001ca760e8;p=vpp.git diff --git a/extras/libmemif/src/main.c b/extras/libmemif/src/main.c index dc4a6231118..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,7 +56,7 @@ /* private structs and functions */ #include -#define ERRLIST_LEN 39 +#define ERRLIST_LEN 40 #define MAX_ERRBUF_LEN 256 #if __x86_x64__ @@ -73,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 */ @@ -144,7 +148,7 @@ const char *memif_errlist[ERRLIST_LEN] = { /* MEMIF_ERR_SUCCESS */ /* MEMIF_ERR_POLL_CANCEL */ "Memif event polling was canceled.", /* MEMIF_ERR_MAX_RING */ - "Maximum log2 ring size is 15.", + "Maximum log2 ring size is 15", /* MEMIF_ERR_PRIVHDR */ "Private headers not supported." }; @@ -213,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) @@ -323,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; @@ -409,6 +417,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) { @@ -416,6 +437,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) { @@ -425,7 +453,8 @@ memif_free_register (memif_free_t * mf) 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; @@ -438,6 +467,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 @@ -562,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); @@ -579,8 +615,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; @@ -596,7 +632,7 @@ 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; + int err, i, index = 0, sockfd = -1; memif_list_elt_t list_elt; memif_connection_t *conn = (memif_connection_t *) * c; if (conn != NULL) @@ -686,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); } @@ -857,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; @@ -867,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) @@ -886,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, @@ -916,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))); } } } @@ -930,21 +970,20 @@ 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; } } @@ -971,24 +1010,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; } @@ -1007,11 +1046,8 @@ 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; @@ -1031,6 +1067,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) @@ -1090,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); } @@ -1105,8 +1144,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 +1165,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]; @@ -1148,16 +1187,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)); @@ -1258,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 = @@ -1320,33 +1381,41 @@ 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 *) 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; - 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) + 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) @@ -1355,10 +1424,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 +1447,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 = 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 +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].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,9 +1496,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; - mq[x].last_tail = 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; @@ -1427,11 +1507,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); @@ -1441,16 +1521,133 @@ 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; - mq[x].last_tail = 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_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 (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; + 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; + uint16_t mask = (1 << mq->log2_ring_size) - 1; + uint16_t ring_size; + uint16_t slot, ns; + int err = MEMIF_ERR_SUCCESS; /* 0 */ + *count_out = 0; + + ring_size = (1 << mq->log2_ring_size); + slot = (c->args.is_master) ? ring->tail : ring->head; + slot += mq->alloc_bufs; + + /* can only be called by slave */ + ns = ring_size - (ring->head + mq->alloc_bufs) + ring->tail; + + b0 = bufs; + + while (count && ns) + { + if (EXPECT_FALSE ((b0->flags & MEMIF_BUFFER_FLAG_RX) == 0)) + { + /* not a valid buffer */ + count--; + continue; + } + b0->flags &= ~MEMIF_BUFFER_FLAG_RX; + + ((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[ring->desc[slot & mask].region].addr); + ring->desc[slot & mask].flags |= + (b0->flags & MEMIF_BUFFER_FLAG_NEXT) ? MEMIF_DESC_FLAG_NEXT : 0; + + 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, @@ -1462,35 +1659,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) { @@ -1503,12 +1700,13 @@ memif_buffer_alloc (memif_conn_handle_t conn, uint16_t qid, ring->desc[slot & mask].flags = 0; /* slave can produce buffer with original length */ - dst_left = (c->args.is_master) ? ring->desc[slot & mask].length : c->run_args.buffer_size; /* - headroom */ + dst_left = (c->args.is_master) ? ring->desc[slot & mask].length : + c->run_args.buffer_size; src_left = size; while (src_left) { - if (dst_left == 0) + if (EXPECT_FALSE (dst_left == 0)) { if (count && ns) { @@ -1516,7 +1714,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; @@ -1524,7 +1721,9 @@ 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; /* - headroom */ + dst_left = + (c->args.is_master) ? ring->desc[slot & mask]. + length : c->run_args.buffer_size; ring->desc[slot & mask].flags = 0; } else @@ -1538,6 +1737,16 @@ memif_buffer_alloc (memif_conn_handle_t conn, uint16_t qid, } } b0->len = memif_min (dst_left, src_left); + + /* slave resets buffer offset */ + if (c->args.is_master == 0) + { + memif_desc_t *d = &ring->desc[slot & mask]; + if (lm->get_external_buffer_offset) + d->offset = lm->get_external_buffer_offset (c->private_ctx); + else + d->offset = d->offset - (d->offset & offset_mask); + } b0->data = memif_get_buffer (c, ring, slot & mask); src_left -= b0->len; @@ -1566,7 +1775,8 @@ no_ns: } int -memif_refill_queue (memif_conn_handle_t conn, uint16_t qid, uint16_t count) +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 (EXPECT_FALSE (c == NULL)) @@ -1574,13 +1784,16 @@ 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) { @@ -1588,16 +1801,30 @@ memif_refill_queue (memif_conn_handle_t conn, uint16_t qid, uint16_t count) ring->tail = (ring->tail + count <= mq->last_head) ? ring->tail + count : mq->last_head; + return MEMIF_ERR_SUCCESS; } - else + + 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) { - uint16_t head = ring->head; - uint16_t ns = (1 << mq->log2_ring_size) - head + mq->last_tail; - head += ns; - MEMIF_MEMORY_BARRIER (); - ring->head = (ring->head + count <= head) ? ring->head + count : 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_MEMORY_BARRIER (); + ring->head = head; + return MEMIF_ERR_SUCCESS; /* 0 */ } @@ -1611,8 +1838,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)) @@ -1620,32 +1847,40 @@ memif_tx_burst (memif_conn_handle_t conn, uint16_t qid, memif_queue_t *mq = &c->tx_queues[qid]; memif_ring_t *ring = mq->ring; - uint16_t slot; - - slot = (c->args.is_master) ? ring->tail : ring->head; - *tx = (count <= mq->alloc_bufs) ? count : mq->alloc_bufs; - -#ifdef MEMIF_DBG_SHM - uint16_t curr_buf = 0; uint16_t mask = (1 << mq->log2_ring_size) - 1; memif_buffer_t *b0; - for (curr_buf = 0; curr_buf < count; curr_buf++) + *tx = 0; + + if (count > mq->alloc_bufs) + count = mq->alloc_bufs; + + if (EXPECT_FALSE (count == 0)) + return MEMIF_ERR_SUCCESS; + + while (count) { - b0 = (bufs + curr_buf); + b0 = (bufs + *tx); + ring->desc[b0->desc_index & mask].length = b0->len; + +#ifdef MEMIF_DBG_SHM + 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--; } -#endif /* MEMIF_DBG_SHM */ + MEMIF_MEMORY_BARRIER (); if (c->args.is_master) - ring->tail = slot + *tx; + ring->tail = b0->desc_index + 1; else - ring->head = slot + *tx; - - /* zero out buffer fields so the client cant modify transmitted data */ - memset (bufs, 0, sizeof (memif_buffer_t) * *tx); + ring->head = b0->desc_index + 1; mq->alloc_bufs -= *tx; @@ -1670,8 +1905,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)) @@ -1682,12 +1917,12 @@ 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; 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); cur_slot = (c->args.is_master) ? mq->last_head : mq->last_tail; @@ -1709,13 +1944,19 @@ memif_rx_burst (memif_conn_handle_t conn, uint16_t qid, { ring->desc[cur_slot & mask].length = c->run_args.buffer_size; } + + b0->flags = MEMIF_BUFFER_FLAG_RX; if (ring->desc[cur_slot & mask].flags & MEMIF_DESC_FLAG_NEXT) { - b0->flags = MEMIF_BUFFER_FLAG_NEXT; + b0->flags |= MEMIF_BUFFER_FLAG_NEXT; ring->desc[cur_slot & mask].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--; @@ -1749,13 +1990,14 @@ memif_get_details (memif_conn_handle_t conn, memif_details_t * md, 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) { - md->if_name = 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 @@ -1764,7 +2006,7 @@ memif_get_details (memif_conn_handle_t conn, memif_details_t * md, l1 = strlen ((char *) lm->app_name); if (l0 + l1 < buflen) { - md->inst_name = strcpy (buf + l0, (char *) lm->app_name); + md->inst_name = (uint8_t *) strcpy (buf + l0, (char *) lm->app_name); l0 += l1 + 1; } else @@ -1773,7 +2015,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 = 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 @@ -1782,7 +2025,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 = strcpy (buf + l0, (char *) c->remote_name); + md->remote_inst_name = + (uint8_t *) strcpy (buf + l0, (char *) c->remote_name); l0 += l1 + 1; } else @@ -1790,12 +2034,12 @@ 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); if (l0 + l1 < buflen) { - md->secret = strcpy (buf + l0, (char *) c->args.secret); + md->secret = (uint8_t *) strcpy (buf + l0, (char *) c->args.secret); l0 += l1 + 1; } else @@ -1809,58 +2053,86 @@ memif_get_details (memif_conn_handle_t conn, memif_details_t * md, if (l0 + l1 < buflen) { md->socket_filename = - strcpy (buf + l0, (char *) c->args.socket_filename); + (uint8_t *) strcpy (buf + l0, (char *) c->args.socket_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; + 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 */ @@ -1876,8 +2148,8 @@ memif_get_queue_efd (memif_conn_handle_t conn, uint16_t qid, int *efd) 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; + (c->args.is_master) ? c->run_args.num_s2m_rings : c-> + run_args.num_m2s_rings; if (qid >= num) return MEMIF_ERR_QID;