struct io_u **events;
unsigned int nr_events;
- struct async_head_user *ahu;
+ struct async_head_user ahu;
struct syslet_uatom **ring;
- unsigned int ring_index;
+
+ struct syslet_uatom *head, *tail;
+ struct syslet_uatom **event_map;
+ unsigned int event_map_idx;
};
-/*
- * Inspect the ring to see if we have completed events
- */
-static void fio_syslet_complete(struct thread_data *td)
+static void fio_syslet_complete_atom(struct thread_data *td,
+ struct syslet_uatom *atom)
{
struct syslet_data *sd = td->io_ops->data;
+ struct io_u *io_u;
+ int i, end;
- do {
- struct syslet_uatom *atom;
- struct io_u *io_u;
- long ret;
+ if (!sd->event_map_idx)
+ return;
- atom = sd->ring[sd->ring_index];
- if (!atom)
+ /*
+ * Find the start of the string of atoms for this sequence
+ */
+ for (end = sd->event_map_idx - 1; end >= 0; end--)
+ if (atom == sd->event_map[end])
break;
- sd->ring[sd->ring_index] = NULL;
- if (++sd->ring_index == td->iodepth)
- sd->ring_index = 0;
+ 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);
+
+ /*
+ * now complete in right order
+ */
+ for (i = 0; i <= end; i++) {
+ long ret;
+
+ atom = sd->event_map[i];
io_u = atom->private;
ret = *atom->ret_ptr;
if (ret > 0)
else if (ret < 0)
io_u->error = ret;
+ assert(sd->nr_events < td->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;
+
+ memmove(sd->event_map, &sd->event_map[end + 1], nr * sizeof(struct syslet_uatom *));
+ sd->event_map_idx = nr;
+ }
+}
+
+/*
+ * Inspect the ring to see if we have completed events
+ */
+static void fio_syslet_complete(struct thread_data *td)
+{
+ struct syslet_data *sd = td->io_ops->data;
+
+ do {
+ struct syslet_uatom *atom;
+
+ atom = sd->ring[sd->ahu.user_ring_idx];
+ if (!atom)
+ break;
+
+ sd->ring[sd->ahu.user_ring_idx] = NULL;
+ if (++sd->ahu.user_ring_idx == td->iodepth)
+ sd->ahu.user_ring_idx = 0;
+
+ fio_syslet_complete_atom(td, atom);
} while (1);
}
struct timespec fio_unused *t)
{
struct syslet_data *sd = td->io_ops->data;
- int get_events;
long ret;
do {
/*
* OK, we need to wait for some events...
*/
- get_events = min - sd->nr_events;
- ret = async_wait(get_events);
+ ret = async_wait(1, sd->ahu.user_ring_idx, &sd->ahu);
if (ret < 0)
- return errno;
+ return -errno;
} while (1);
ret = sd->nr_events;
return 0;
}
-static int fio_syslet_queue(struct thread_data *td, struct io_u *io_u)
+static void cachemiss_thread_start(void)
+{
+ while (1)
+ 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;
+}
+
+static int fio_syslet_commit(struct thread_data *td)
{
struct syslet_data *sd = td->io_ops->data;
- long ret;
+ struct syslet_uatom *done;
+
+ if (!sd->head)
+ return 0;
+
+ if (!sd->ahu.new_thread_stack)
+ sd->ahu.new_thread_stack = thread_stack_alloc();
/*
* On sync completion, the atom is returned. So on NULL return
* it's queued asynchronously.
*/
- if (!async_exec(&io_u->req.atom))
- return 0;
+ done = async_exec(sd->head, &sd->ahu);
- /*
- * completed sync
- */
- ret = io_u->req.ret;
- if (ret != (long) io_u->xfer_buflen) {
- if (ret > 0) {
- io_u->resid = io_u->xfer_buflen - ret;
- io_u->error = 0;
- return ret;
- } else
- io_u->error = errno;
- }
+ sd->head = sd->tail = NULL;
- if (!io_u->error)
- sd->events[sd->nr_events++] = io_u;
- else
- td_verror(td, io_u->error);
+ if (done)
+ fio_syslet_complete_atom(td, done);
- return io_u->error;
+ return 0;
+}
+
+static int fio_syslet_queue(struct thread_data *td, struct io_u *io_u)
+{
+ struct syslet_data *sd = td->io_ops->data;
+
+ if (sd->tail) {
+ sd->tail->next = &io_u->req.atom;
+ sd->tail = &io_u->req.atom;
+ } else
+ sd->head = sd->tail = &io_u->req.atom;
+
+ sd->event_map[sd->event_map_idx++] = sd->tail;
+ return FIO_Q_QUEUED;
}
static int async_head_init(struct syslet_data *sd, unsigned int depth)
{
unsigned long ring_size;
- sd->ahu = malloc(sizeof(struct async_head_user));
- memset(sd->ahu, 0, sizeof(struct async_head_user));
+ memset(&sd->ahu, 0, sizeof(struct async_head_user));
ring_size = sizeof(struct syslet_uatom *) * depth;
sd->ring = malloc(ring_size);
memset(sd->ring, 0, ring_size);
- sd->ahu->completion_ring = sd->ring;
- sd->ahu->ring_size_bytes = ring_size;
- sd->ahu->max_nr_threads = -1;
-
- if (async_register(sd->ahu, sizeof(*sd->ahu)) < 0) {
- perror("async_register");
- fprintf(stderr, "fio: syslet likely not supported\n");
- free(sd->ring);
- free(sd->ahu);
- return 1;
- }
+ sd->ahu.user_ring_idx = 0;
+ 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;
return 0;
}
static void async_head_exit(struct syslet_data *sd)
{
- if (async_unregister(sd->ahu, sizeof(*sd->ahu)) < 0)
- perror("async_register");
-
- free(sd->ahu);
free(sd->ring);
}
if (sd) {
async_head_exit(sd);
free(sd->events);
+ free(sd->event_map);
free(sd);
td->io_ops->data = NULL;
}
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);
/*
* This will handily fail for kernels where syslet isn't available
.init = fio_syslet_init,
.prep = fio_syslet_prep,
.queue = fio_syslet_queue,
+ .commit = fio_syslet_commit,
.getevents = fio_syslet_getevents,
.event = fio_syslet_event,
.cleanup = fio_syslet_cleanup,
projects / fio.git / blobdiff