};
#define DEPTH 128
-
#define BATCH_SUBMIT 32
#define BATCH_COMPLETE 32
struct drand48_data rand;
struct io_sq_ring sq_ring;
struct io_uring_sqe *sqes;
- struct iovec iovecs[DEPTH];
struct io_cq_ring cq_ring;
int inflight;
unsigned long reaps;
struct file files[MAX_FDS];
unsigned nr_files;
unsigned cur_file;
+ struct iovec iovecs[];
};
-static struct submitter submitters[1];
+static struct submitter *submitter;
static volatile int finish;
+static int depth = DEPTH;
+static int batch_submit = BATCH_SUBMIT;
+static int batch_complete = BATCH_COMPLETE;
static int polled = 1; /* use IO polling */
static int fixedbufs = 1; /* use fixed user buffers */
static int register_files = 1; /* use fixed files */
static int io_uring_register_buffers(struct submitter *s)
{
- struct io_uring_register_buffers reg = {
- .iovecs = s->iovecs,
- .nr_iovecs = DEPTH
- };
-
if (do_nop)
return 0;
return syscall(__NR_sys_io_uring_register, s->ring_fd,
- IORING_REGISTER_BUFFERS, ®);
+ IORING_REGISTER_BUFFERS, s->iovecs, depth);
}
static int io_uring_register_files(struct submitter *s)
{
- struct io_uring_register_files reg;
int i;
if (do_nop)
s->fds[i] = s->files[i].real_fd;
s->files[i].fixed_fd = i;
}
- reg.fds = s->fds;
- reg.nr_fds = s->nr_files;
return syscall(__NR_sys_io_uring_register, s->ring_fd,
- IORING_REGISTER_FILES, ®);
+ IORING_REGISTER_FILES, s->fds, s->nr_files);
}
static int io_uring_setup(unsigned entries, struct io_uring_params *p)
unsigned int min_complete, unsigned int flags)
{
return syscall(__NR_sys_io_uring_enter, s->ring_fd, to_submit,
- min_complete, flags);
+ min_complete, flags, NULL, 0);
}
static int gettid(void)
static unsigned file_depth(struct submitter *s)
{
- return (DEPTH + s->nr_files - 1) / s->nr_files;
+ return (depth + s->nr_files - 1) / s->nr_files;
}
static void init_io(struct submitter *s, unsigned index)
}
if (fixedbufs) {
sqe->opcode = IORING_OP_READ_FIXED;
- sqe->addr = s->iovecs[index].iov_base;
+ sqe->addr = (unsigned long) s->iovecs[index].iov_base;
sqe->len = BS;
sqe->buf_index = index;
} else {
sqe->opcode = IORING_OP_READV;
- sqe->addr = &s->iovecs[index];
+ sqe->addr = (unsigned long) &s->iovecs[index];
sqe->len = 1;
sqe->buf_index = 0;
}
f->pending_ios--;
if (cqe->res != BS) {
printf("io: unexpected ret=%d\n", cqe->res);
+ if (polled && cqe->res == -EOPNOTSUPP)
+ printf("Your filesystem doesn't support poll\n");
return -1;
}
}
do {
int to_wait, to_submit, this_reap, to_prep;
- if (!prepped && s->inflight < DEPTH) {
- to_prep = min(DEPTH - s->inflight, BATCH_SUBMIT);
+ if (!prepped && s->inflight < depth) {
+ to_prep = min(depth - s->inflight, batch_submit);
prepped = prep_more_ios(s, to_prep);
}
s->inflight += prepped;
submit_more:
to_submit = prepped;
submit:
- if (to_submit && (s->inflight + to_submit <= DEPTH))
+ if (to_submit && (s->inflight + to_submit <= depth))
to_wait = 0;
else
- to_wait = min(s->inflight + to_submit, BATCH_COMPLETE);
+ to_wait = min(s->inflight + to_submit, batch_complete);
/*
* Only need to call io_uring_enter if we're not using SQ thread
if (to_wait)
flags = IORING_ENTER_GETEVENTS;
+ if ((*ring->flags & IORING_SQ_NEED_WAKEUP))
+ flags |= IORING_ENTER_SQ_WAKEUP;
ret = io_uring_enter(s, to_submit, to_wait, flags);
s->calls++;
}
static void sig_int(int sig)
{
printf("Exiting on signal %d\n", sig);
- submitters[0].finish = 1;
+ submitter->finish = 1;
finish = 1;
}
}
}
- fd = io_uring_setup(DEPTH, &p);
+ fd = io_uring_setup(depth, &p);
if (fd < 0) {
perror("io_uring_setup");
return 1;
static void file_depths(char *buf)
{
- struct submitter *s = &submitters[0];
+ struct submitter *s = submitter;
char *p;
int i;
}
}
+static void usage(char *argv)
+{
+ printf("%s [options] -- [filenames]\n"
+ " -d <int> : IO Depth, default %d\n"
+ " -s <int> : Batch submit, default %d\n"
+ " -c <int> : Batch complete, default %d\n",
+ argv, DEPTH, BATCH_SUBMIT, BATCH_COMPLETE);
+ exit(0);
+}
+
int main(int argc, char *argv[])
{
- struct submitter *s = &submitters[0];
+ struct submitter *s;
unsigned long done, calls, reap, cache_hit, cache_miss;
- int err, i, flags, fd;
+ int err, i, flags, fd, opt;
char *fdepths;
void *ret;
if (!do_nop && argc < 2) {
- printf("%s: filename\n", argv[0]);
+ printf("%s: filename [options]\n", argv[0]);
return 1;
}
+ while ((opt = getopt(argc, argv, "d:s:c:h?")) != -1) {
+ switch (opt) {
+ case 'd':
+ depth = atoi(optarg);
+ break;
+ case 's':
+ batch_submit = atoi(optarg);
+ break;
+ case 'c':
+ batch_complete = atoi(optarg);
+ break;
+ case 'h':
+ case '?':
+ default:
+ usage(argv[0]);
+ break;
+ }
+ }
+
+ submitter = malloc(sizeof(*submitter) + depth * sizeof(struct iovec));
+ memset(submitter, 0, sizeof(*submitter) + depth * sizeof(struct iovec));
+ s = submitter;
+
flags = O_RDONLY | O_NOATIME;
if (!buffered)
flags |= O_DIRECT;
- i = 1;
+ i = optind;
while (!do_nop && i < argc) {
- struct file *f = &s->files[s->nr_files];
+ struct file *f;
+ if (s->nr_files == MAX_FDS) {
+ printf("Max number of files (%d) reached\n", MAX_FDS);
+ break;
+ }
fd = open(argv[i], flags);
if (fd < 0) {
perror("open");
return 1;
}
+
+ f = &s->files[s->nr_files];
f->real_fd = fd;
if (get_file_size(f)) {
printf("failed getting size of device/file\n");
arm_sig_int();
- for (i = 0; i < DEPTH; i++) {
+ for (i = 0; i < depth; i++) {
void *buf;
if (posix_memalign(&buf, BS, BS)) {
return 1;
}
printf("polled=%d, fixedbufs=%d, buffered=%d", polled, fixedbufs, buffered);
- printf(" QD=%d, sq_ring=%d, cq_ring=%d\n", DEPTH, *s->sq_ring.ring_entries, *s->cq_ring.ring_entries);
+ printf(" QD=%d, sq_ring=%d, cq_ring=%d\n", depth, *s->sq_ring.ring_entries, *s->cq_ring.ring_entries);
pthread_create(&s->thread, NULL, submitter_fn, s);
projects / fio.git / blobdiff