X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fsyslet-rw.c;h=d225cc41630d0a4838da6d41ae1b7da485f11fa6;hp=74a6b31145167c00be9c6d9cadb974a3d69c43d5;hb=b4ba5f302c467dc10c8b89459a8cb97d2958f359;hpb=9ff9de69348f3def14e9a5dde7401d5e760e3c7c diff --git a/engines/syslet-rw.c b/engines/syslet-rw.c index 74a6b311..d225cc41 100644 --- a/engines/syslet-rw.c +++ b/engines/syslet-rw.c @@ -1,5 +1,8 @@ /* - * read/write() engine that uses syslet to be async + * syslet engine + * + * IO engine that does regular pread(2)/pwrite(2) to transfer data, but + * with syslets to make the execution async. * */ #include @@ -7,12 +10,21 @@ #include #include #include +#include #include "../fio.h" #include "../os.h" #ifdef FIO_HAVE_SYSLET +#ifdef __NR_pread64 +#define __NR_fio_pread __NR_pread64 +#define __NR_fio_pwrite __NR_pwrite64 +#else +#define __NR_fio_pread __NR_pread +#define __NR_fio_pwrite __NR_pwrite +#endif + struct syslet_data { struct io_u **events; unsigned int nr_events; @@ -21,63 +33,46 @@ struct syslet_data { struct syslet_uatom **ring; struct syslet_uatom *head, *tail; - struct syslet_uatom **event_map; - unsigned int event_map_idx; }; static void fio_syslet_complete_atom(struct thread_data *td, struct syslet_uatom *atom) { struct syslet_data *sd = td->io_ops->data; + struct syslet_uatom *last; struct io_u *io_u; - int i, end; - - if (!sd->event_map_idx) - return; /* - * Find the start of the string of atoms for this sequence + * complete from the beginning of the sequence up to (and + * including) this atom */ - for (end = sd->event_map_idx - 1; end >= 0; end--) - if (atom == sd->event_map[end]) - break; - - if (end < 0 || atom != sd->event_map[end]) { - printf("didn't find atom\n"); - return; - } - - //printf("end=%d, total %d\n", end, sd->event_map_idx); + last = atom; + io_u = atom->private; + atom = io_u->req.head; /* * now complete in right order */ - for (i = 0; i <= end; i++) { + do { long ret; - atom = sd->event_map[i]; io_u = atom->private; ret = *atom->ret_ptr; - if (ret > 0) + if (ret >= 0) io_u->resid = io_u->xfer_buflen - ret; else if (ret < 0) io_u->error = ret; - assert(sd->nr_events < td->iodepth); + assert(sd->nr_events < td->o.iodepth); sd->events[sd->nr_events++] = io_u; - } - /* - * Move later completions to the front, if we didn't complete all - */ - if (end == (int) sd->event_map_idx - 1) - sd->event_map_idx = 0; - else { - int nr = sd->event_map_idx - end - 1; + if (atom == last) + break; - memmove(sd->event_map, &sd->event_map[end + 1], nr * sizeof(struct syslet_uatom *)); - sd->event_map_idx = nr; - } + atom = atom->next; + } while (1); + + assert(!last->next); } /* @@ -95,7 +90,7 @@ static void fio_syslet_complete(struct thread_data *td) break; sd->ring[sd->ahu.user_ring_idx] = NULL; - if (++sd->ahu.user_ring_idx == td->iodepth) + if (++sd->ahu.user_ring_idx == td->o.iodepth) sd->ahu.user_ring_idx = 0; fio_syslet_complete_atom(td, atom); @@ -171,9 +166,9 @@ static void fio_syslet_prep_rw(struct io_u *io_u, struct fio_file *f) * prepare rw */ if (io_u->ddir == DDIR_READ) - nr = __NR_pread64; + nr = __NR_fio_pread; else - nr = __NR_pwrite64; + nr = __NR_fio_pwrite; init_atom(&io_u->req.atom, nr, &f->fd, &io_u->xfer_buf, &io_u->xfer_buflen, &io_u->offset, &io_u->req.ret, 0, io_u); @@ -194,14 +189,31 @@ static int fio_syslet_prep(struct thread_data fio_unused *td, struct io_u *io_u) static void cachemiss_thread_start(void) { while (1) - async_thread(); + async_thread(NULL, NULL); } #define THREAD_STACK_SIZE (16384) static unsigned long thread_stack_alloc() { - return (unsigned long)malloc(THREAD_STACK_SIZE) + THREAD_STACK_SIZE; + return (unsigned long) malloc(THREAD_STACK_SIZE) + THREAD_STACK_SIZE; +} + +static void fio_syslet_queued(struct thread_data *td, struct syslet_data *sd) +{ + struct syslet_uatom *atom; + struct timeval now; + + fio_gettime(&now, NULL); + + atom = sd->head; + while (atom) { + struct io_u *io_u = atom->private; + + memcpy(&io_u->issue_time, &now, sizeof(now)); + io_u_queued(td, io_u); + atom = atom->next; + } } static int fio_syslet_commit(struct thread_data *td) @@ -212,15 +224,24 @@ static int fio_syslet_commit(struct thread_data *td) if (!sd->head) return 0; + assert(!sd->tail->next); + if (!sd->ahu.new_thread_stack) sd->ahu.new_thread_stack = thread_stack_alloc(); + fio_syslet_queued(td, sd); + /* * On sync completion, the atom is returned. So on NULL return * it's queued asynchronously. */ done = async_exec(sd->head, &sd->ahu); + if (done == (void *) -1) { + log_err("fio: syslets don't appear to work\n"); + return -1; + } + sd->head = sd->tail = NULL; if (done) @@ -239,7 +260,7 @@ static int fio_syslet_queue(struct thread_data *td, struct io_u *io_u) } else sd->head = sd->tail = &io_u->req.atom; - sd->event_map[sd->event_map_idx++] = sd->tail; + io_u->req.head = sd->head; return FIO_Q_QUEUED; } @@ -257,8 +278,8 @@ static int async_head_init(struct syslet_data *sd, unsigned int depth) sd->ahu.completion_ring = sd->ring; sd->ahu.ring_size_bytes = ring_size; sd->ahu.head_stack = thread_stack_alloc(); - sd->ahu.head_eip = (unsigned long)cachemiss_thread_start; - sd->ahu.new_thread_eip = (unsigned long)cachemiss_thread_start; + sd->ahu.head_eip = (unsigned long) cachemiss_thread_start; + sd->ahu.new_thread_eip = (unsigned long) cachemiss_thread_start; return 0; } @@ -268,6 +289,19 @@ static void async_head_exit(struct syslet_data *sd) free(sd->ring); } +static int check_syslet_support(struct syslet_data *sd) +{ + struct syslet_uatom atom; + void *ret; + + init_atom(&atom, __NR_getpid, NULL, NULL, NULL, NULL, NULL, 0, NULL); + ret = async_exec(sd->head, &sd->ahu); + if (ret == (void *) -1) + return 1; + + return 0; +} + static void fio_syslet_cleanup(struct thread_data *td) { struct syslet_data *sd = td->io_ops->data; @@ -275,7 +309,6 @@ static void fio_syslet_cleanup(struct thread_data *td) if (sd) { async_head_exit(sd); free(sd->events); - free(sd->event_map); free(sd); td->io_ops->data = NULL; } @@ -285,18 +318,22 @@ static int fio_syslet_init(struct thread_data *td) { struct syslet_data *sd; - sd = malloc(sizeof(*sd)); memset(sd, 0, sizeof(*sd)); - sd->events = malloc(sizeof(struct io_u *) * td->iodepth); - memset(sd->events, 0, sizeof(struct io_u *) * td->iodepth); - sd->event_map = malloc(sizeof(struct syslet_uatom *) * td->iodepth); - memset(sd->event_map, 0, sizeof(struct syslet_uatom *) * td->iodepth); + sd->events = malloc(sizeof(struct io_u *) * td->o.iodepth); + memset(sd->events, 0, sizeof(struct io_u *) * td->o.iodepth); /* * This will handily fail for kernels where syslet isn't available */ - if (async_head_init(sd, td->iodepth)) { + if (async_head_init(sd, td->o.iodepth)) { + free(sd->events); + free(sd); + return 1; + } + + if (check_syslet_support(sd)) { + log_err("fio: syslets do not appear to work\n"); free(sd->events); free(sd); return 1; @@ -316,6 +353,8 @@ static struct ioengine_ops ioengine = { .getevents = fio_syslet_getevents, .event = fio_syslet_event, .cleanup = fio_syslet_cleanup, + .open_file = generic_open_file, + .close_file = generic_close_file, }; #else /* FIO_HAVE_SYSLET */