@@ -1,51 +1,29 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright (c) 2004 SuSE, Inc. All Rights Reserved.
+ * Copyright (C) 2021 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
+ */
+
+/*\
+ * [Description]
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like. Any license provided herein, whether implied or
- * otherwise, applies only to this software file. Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA 94043, or:
- *
- *
- * aio-stress
- *
- * will open or create each file on the command line, and start a series
+ * Will open or create each file on the command line, and start a series
* of aio to it.
*
- * aio is done in a rotating loop. first file1 gets 8 requests, then
- * file2, then file3 etc. As each file finishes writing, it is switched
- * to reads
- *
- * io buffers are aligned in case you want to do raw io
+ * aio is done in a rotating loop. First file1.bin gets 8 requests, then
+ * file2.bin, then file3.bin etc. As each file finishes writing, it is switched
+ * to reads.
*
- * compile with gcc -Wall -laio -lpthread -o aio-stress aio-stress.c
- *
- * run aio-stress -h to see the options
- *
- * Please mail Chris Mason (mason@suse.com) with bug reports or patches
+ * io buffers are aligned in case you want to do raw io.
*/
+
#define _FILE_OFFSET_BITS 64
-#define PROG_VERSION "0.21"
#define NEW_GETEVENTS
#define _GNU_SOURCE
+#include "tst_test.h"
+
+#ifdef HAVE_LIBAIO
#include <stdio.h>
#include <errno.h>
#include <assert.h>
@@ -60,12 +38,9 @@
#include <sys/mman.h>
#include <string.h>
#include <pthread.h>
-
-#include "config.h"
-#include "tst_res_flags.h"
-
-#ifdef HAVE_LIBAIO
#include <libaio.h>
+#include "tst_safe_pthread.h"
+#include "tst_safe_sysv_ipc.h"
#define IO_FREE 0
#define IO_PENDING 1
@@ -83,52 +58,52 @@ enum {
#define USE_SHM 1
#define USE_SHMFS 2
-/*
- * various globals, these are effectively read only by the time the threads
- * are started
- */
-long stages = 0;
-unsigned long page_size_mask;
-int o_direct = 0;
-int o_sync = 0;
-int latency_stats = 0;
-int completion_latency_stats = 0;
-int io_iter = 8;
-int iterations = RUN_FOREVER;
-int max_io_submit = 0;
-long rec_len = 64 * 1024;
-int depth = 64;
-int num_threads = 1;
-int num_contexts = 1;
-off_t context_offset = 2 * 1024 * 1024;
-int fsync_stages = 1;
-int use_shm = 0;
-int shm_id;
-char *unaligned_buffer = NULL;
-char *aligned_buffer = NULL;
-int padded_reclen = 0;
-int stonewall = 1;
-int verify = 0;
-char *verify_buf = NULL;
-int unlink_files = 0;
-
-struct io_unit;
-struct thread_info;
-
-/* pthread mutexes and other globals for keeping the threads in sync */
-pthread_cond_t stage_cond = PTHREAD_COND_INITIALIZER;
-pthread_mutex_t stage_mutex = PTHREAD_MUTEX_INITIALIZER;
-int threads_ending = 0;
-int threads_starting = 0;
-struct timeval global_stage_start_time;
-struct thread_info *global_thread_info;
+static char *str_num_files;
+static char *str_max_io_submit;
+static char *str_num_contexts;
+static char *str_context_offset;
+static char *str_file_size;
+static char *str_rec_len;
+static char *str_depth;
+static char *str_io_iter;
+static char *str_iterations;
+static char *str_o_flag;
+static char *str_stages;
+static char *str_use_shm;
+static char *str_num_threads;
+
+static int num_files = 1;
+static long long file_size = 1024 * 1024 * 1024;
+static long stages;
+static unsigned long page_size_mask;
+static int o_flag;
+static char *latency_stats;
+static char *completion_latency_stats;
+static int io_iter = 8;
+static int iterations = RUN_FOREVER;
+static int max_io_submit;
+static long rec_len = 64 * 1024;
+static int depth = 64;
+static int num_threads = 1;
+static int num_contexts = 1;
+static long long context_offset = 2 * 1024 * 1024;
+static char *no_fsync_stages;
+static int use_shm;
+static int shm_id;
+static char *unaligned_buffer;
+static char *aligned_buffer;
+static int padded_reclen;
+static char *no_stonewall;
+static char *verify;
+static char *verify_buf;
+static char *unlink_files;
/*
* latencies during io_submit are measured, these are the
* granularities for deviations
*/
#define DEVIATIONS 6
-int deviations[DEVIATIONS] = { 100, 250, 500, 1000, 5000, 10000 };
+static int deviations[DEVIATIONS] = { 100, 250, 500, 1000, 5000, 10000 };
struct io_latency {
double max;
@@ -140,7 +115,8 @@ struct io_latency {
/* container for a series of operations to a file */
struct io_oper {
- /* already open file descriptor, valid for whatever operation you want */
+ /* already open file descriptor, valid for whatever operation you want
+ */
int fd;
/* starting byte of the operation */
@@ -210,7 +186,7 @@ struct io_unit {
struct io_unit *next;
- struct timeval io_start_time; /* time of io_submit */
+ struct timeval io_start_time; /* time of io_submit */
};
struct thread_info {
@@ -255,6 +231,14 @@ struct thread_info {
struct io_latency io_completion_latency;
};
+/* pthread mutexes and other globals for keeping the threads in sync */
+static pthread_cond_t stage_cond = PTHREAD_COND_INITIALIZER;
+static pthread_mutex_t stage_mutex = PTHREAD_MUTEX_INITIALIZER;
+static int threads_ending;
+static int threads_starting;
+static struct timeval global_stage_start_time;
+static struct thread_info *global_thread_info;
+
/*
* return seconds between start_tv and stop_tv in double precision
*/
@@ -262,6 +246,7 @@ static double time_since(struct timeval *start_tv, struct timeval *stop_tv)
{
double sec, usec;
double ret;
+
sec = stop_tv->tv_sec - start_tv->tv_sec;
usec = stop_tv->tv_usec - start_tv->tv_usec;
if (sec > 0 && usec < 0) {
@@ -280,6 +265,7 @@ static double time_since(struct timeval *start_tv, struct timeval *stop_tv)
static double time_since_now(struct timeval *start_tv)
{
struct timeval stop_time;
+
gettimeofday(&stop_time, NULL);
return time_since(start_tv, &stop_time);
}
@@ -292,6 +278,7 @@ static void calc_latency(struct timeval *start_tv, struct timeval *stop_tv,
{
double delta;
int i;
+
delta = time_since(start_tv, stop_tv);
delta = delta * 1000;
@@ -320,7 +307,6 @@ static void oper_list_add(struct io_oper *oper, struct io_oper **list)
oper->next = *list;
(*list)->prev->next = oper;
(*list)->prev = oper;
- return;
}
static void oper_list_del(struct io_oper *oper, struct io_oper **list)
@@ -338,11 +324,13 @@ static void oper_list_del(struct io_oper *oper, struct io_oper **list)
/* worker func to check error fields in the io unit */
static int check_finished_io(struct io_unit *io)
{
+ char out[4 * 1024];
int i;
- if (io->res != io->buf_size) {
+ if (io->res != io->buf_size) {
struct stat s;
- fstat(io->io_oper->fd, &s);
+
+ SAFE_FSTAT(io->io_oper->fd, &s);
/*
* If file size is large enough for the read, then this short
@@ -351,32 +339,30 @@ static int check_finished_io(struct io_unit *io)
if ((io->io_oper->rw == READ || io->io_oper->rw == RREAD) &&
s.st_size > (io->iocb.u.c.offset + io->res)) {
- fprintf(stderr,
- "io err %lu (%s) op %d, off %Lu size %d\n",
- io->res, strerror(-io->res),
- io->iocb.aio_lio_opcode, io->iocb.u.c.offset,
- io->buf_size);
+ tst_res(TINFO, "io err %lu (%s) op %d, off %llu size %d",
+ io->res, tst_strerrno(-io->res), io->iocb.aio_lio_opcode,
+ io->iocb.u.c.offset, io->buf_size);
io->io_oper->last_err = io->res;
io->io_oper->num_err++;
return -1;
}
}
+
if (verify && io->io_oper->rw == READ) {
if (memcmp(io->buf, verify_buf, io->io_oper->reclen)) {
- fprintf(stderr,
- "verify error, file %s offset %Lu contents (offset:bad:good):\n",
+ tst_res(TINFO, "verify error, file %s offset %llu contents (offset:bad:good):",
io->io_oper->file_name, io->iocb.u.c.offset);
for (i = 0; i < io->io_oper->reclen; i++) {
if (io->buf[i] != verify_buf[i]) {
- fprintf(stderr, "%d:%c:%c ", i,
+ tst_res(TINFO, "%d:%c:%c ", i,
io->buf[i], verify_buf[i]);
}
}
- fprintf(stderr, "\n");
+ tst_res(TINFO, "%s", out);
}
-
}
+
return 0;
}
@@ -392,7 +378,7 @@ static int grab_iou(struct io_unit *io, struct io_oper *oper)
return 0;
}
-char *stage_name(int rw)
+static char *stage_name(int rw)
{
switch (rw) {
case WRITE:
@@ -409,8 +395,7 @@ char *stage_name(int rw)
static inline double oper_mb_trans(struct io_oper *oper)
{
- return ((double)oper->started_ios * (double)oper->reclen) /
- (double)(1024 * 1024);
+ return ((double)oper->started_ios * (double)oper->reclen) / (double)(1024 * 1024);
}
static void print_time(struct io_oper *oper)
@@ -422,38 +407,45 @@ static void print_time(struct io_oper *oper)
runtime = time_since_now(&oper->start_time);
mb = oper_mb_trans(oper);
tput = mb / runtime;
- fprintf(stderr, "%s on %s (%.2f MB/s) %.2f MB in %.2fs\n",
+
+ tst_res(TINFO, "%s on %s (%.2f MB/s) %.2f MB in %.2fs",
stage_name(oper->rw), oper->file_name, tput, mb, runtime);
}
static void print_lat(char *str, struct io_latency *lat)
{
+ char out[4 * 1024];
+ char *ptr = out;
double avg = lat->total_lat / lat->total_io;
int i;
double total_counted = 0;
- fprintf(stderr, "%s min %.2f avg %.2f max %.2f\n\t",
- str, lat->min, avg, lat->max);
+
+ tst_res(TINFO, "%s min %.2f avg %.2f max %.2f", str, lat->min, avg, lat->max);
for (i = 0; i < DEVIATIONS; i++) {
- fprintf(stderr, " %.0f < %d", lat->deviations[i],
- deviations[i]);
+ ptr += sprintf(ptr, "%.0f < %d", lat->deviations[i], deviations[i]);
total_counted += lat->deviations[i];
}
+
if (total_counted && lat->total_io - total_counted)
- fprintf(stderr, " < %.0f", lat->total_io - total_counted);
- fprintf(stderr, "\n");
+ ptr += sprintf(ptr, " < %.0f", lat->total_io - total_counted);
+
+ tst_res(TINFO, "%s", out);
+
memset(lat, 0, sizeof(*lat));
}
static void print_latency(struct thread_info *t)
{
struct io_latency *lat = &t->io_submit_latency;
+
print_lat("latency", lat);
}
static void print_completion_latency(struct thread_info *t)
{
struct io_latency *lat = &t->io_completion_latency;
+
print_lat("completion latency", lat);
}
@@ -461,8 +453,8 @@ static void print_completion_latency(struct thread_info *t)
* updates the fields in the io operation struct that belongs to this
* io unit, and make the io unit reusable again
*/
-void finish_io(struct thread_info *t, struct io_unit *io, long result,
- struct timeval *tv_now)
+static void finish_io(struct thread_info *t, struct io_unit *io, long result,
+ struct timeval *tv_now)
{
struct io_oper *oper = io->io_oper;
@@ -480,7 +472,7 @@ void finish_io(struct thread_info *t, struct io_unit *io, long result,
}
}
-int read_some_events(struct thread_info *t)
+static int read_some_events(struct thread_info *t)
{
struct io_unit *event_io;
struct io_event *event;
@@ -493,8 +485,7 @@ int read_some_events(struct thread_info *t)
min_nr = t->num_global_pending;
#ifdef NEW_GETEVENTS
- nr = io_getevents(t->io_ctx, min_nr, t->num_global_events, t->events,
- NULL);
+ nr = io_getevents(t->io_ctx, min_nr, t->num_global_events, t->events, NULL);
#else
nr = io_getevents(t->io_ctx, t->num_global_events, t->events, NULL);
#endif
@@ -524,7 +515,7 @@ retry:
event_io = t->free_ious;
t->free_ious = t->free_ious->next;
if (grab_iou(event_io, oper)) {
- fprintf(stderr, "io unit on free list but not free\n");
+ tst_res(TINFO, "io unit on free list but not free");
abort();
}
return event_io;
@@ -533,7 +524,8 @@ retry:
if (nr > 0)
goto retry;
else
- fprintf(stderr, "no free ious after read_some_events\n");
+ tst_res(TINFO, "no free ious after read_some_events");
+
return NULL;
}
@@ -545,22 +537,22 @@ static int io_oper_wait(struct thread_info *t, struct io_oper *oper)
struct io_event event;
struct io_unit *event_io;
- if (oper == NULL) {
+ if (!oper)
return 0;
- }
if (oper->num_pending == 0)
goto done;
- /* this func is not speed sensitive, no need to go wild reading
- * more than one event at a time
- */
+ /* this func is not speed sensitive, no need to go wild reading
+ * more than one event at a time
+ */
#ifdef NEW_GETEVENTS
while (io_getevents(t->io_ctx, 1, 1, &event, NULL) > 0) {
#else
while (io_getevents(t->io_ctx, 1, &event, NULL) > 0) {
#endif
struct timeval tv_now;
+
event_io = (struct io_unit *)((unsigned long)event.obj);
gettimeofday(&tv_now, NULL);
@@ -570,14 +562,13 @@ static int io_oper_wait(struct thread_info *t, struct io_oper *oper)
break;
}
done:
- if (oper->num_err) {
- fprintf(stderr, "%u errors on oper, last %u\n",
- oper->num_err, oper->last_err);
- }
+ if (oper->num_err)
+ tst_res(TINFO, "%u errors on oper, last %u", oper->num_err, oper->last_err);
+
return 0;
}
-off_t random_byte_offset(struct io_oper * oper)
+static off_t random_byte_offset(struct io_oper *oper)
{
off_t num;
off_t rand_byte = oper->start;
@@ -603,9 +594,9 @@ off_t random_byte_offset(struct io_oper * oper)
num = (num + page_size_mask) & ~page_size_mask;
rand_byte += num;
- if (rand_byte + oper->reclen > oper->end) {
+ if (rand_byte + oper->reclen > oper->end)
rand_byte -= oper->reclen;
- }
+
return rand_byte;
}
@@ -623,33 +614,27 @@ static struct io_unit *build_iocb(struct thread_info *t, struct io_oper *oper)
off_t rand_byte;
io = find_iou(t, oper);
- if (!io) {
- fprintf(stderr, "unable to find io unit\n");
- return NULL;
- }
+ if (!io)
+ tst_brk(TBROK, "unable to find io unit");
switch (oper->rw) {
case WRITE:
- io_prep_pwrite(&io->iocb, oper->fd, io->buf, oper->reclen,
- oper->last_offset);
+ io_prep_pwrite(&io->iocb, oper->fd, io->buf, oper->reclen, oper->last_offset);
oper->last_offset += oper->reclen;
break;
case READ:
- io_prep_pread(&io->iocb, oper->fd, io->buf, oper->reclen,
- oper->last_offset);
+ io_prep_pread(&io->iocb, oper->fd, io->buf, oper->reclen, oper->last_offset);
oper->last_offset += oper->reclen;
break;
case RREAD:
rand_byte = random_byte_offset(oper);
oper->last_offset = rand_byte;
- io_prep_pread(&io->iocb, oper->fd, io->buf, oper->reclen,
- rand_byte);
+ io_prep_pread(&io->iocb, oper->fd, io->buf, oper->reclen, rand_byte);
break;
case RWRITE:
rand_byte = random_byte_offset(oper);
oper->last_offset = rand_byte;
- io_prep_pwrite(&io->iocb, oper->fd, io->buf, oper->reclen,
- rand_byte);
+ io_prep_pwrite(&io->iocb, oper->fd, io->buf, oper->reclen, rand_byte);
break;
}
@@ -667,10 +652,10 @@ static int finish_oper(struct thread_info *t, struct io_oper *oper)
io_oper_wait(t, oper);
last_err = oper->last_err;
- if (oper->num_pending > 0) {
- fprintf(stderr, "oper num_pending is %d\n", oper->num_pending);
- }
- close(oper->fd);
+ if (oper->num_pending > 0)
+ tst_res(TINFO, "oper num_pending is %d", oper->num_pending);
+
+ SAFE_CLOSE(oper->fd);
free(oper);
return last_err;
}
@@ -680,16 +665,11 @@ static int finish_oper(struct thread_info *t, struct io_oper *oper)
* null on error
*/
static struct io_oper *create_oper(int fd, int rw, off_t start, off_t end,
- int reclen, int depth, int iter,
- char *file_name)
+ int reclen, int depth, char *file_name)
{
struct io_oper *oper;
- oper = malloc(sizeof(*oper));
- if (!oper) {
- fprintf(stderr, "unable to allocate io oper\n");
- return NULL;
- }
+ oper = SAFE_MALLOC(sizeof(*oper));
memset(oper, 0, sizeof(*oper));
oper->depth = depth;
@@ -709,8 +689,8 @@ static struct io_oper *create_oper(int fd, int rw, off_t start, off_t end,
* does setup on num_ios worth of iocbs, but does not actually
* start any io
*/
-int build_oper(struct thread_info *t, struct io_oper *oper, int num_ios,
- struct iocb **my_iocbs)
+static int build_oper(struct thread_info *t, struct io_oper *oper, int num_ios,
+ struct iocb **my_iocbs)
{
int i;
struct io_unit *io;
@@ -726,9 +706,9 @@ int build_oper(struct thread_info *t, struct io_oper *oper, int num_ios,
for (i = 0; i < num_ios; i++) {
io = build_iocb(t, oper);
- if (!io) {
+ if (!io)
return -1;
- }
+
my_iocbs[i] = &io->iocb;
}
return num_ios;
@@ -738,21 +718,21 @@ int build_oper(struct thread_info *t, struct io_oper *oper, int num_ios,
* runs through the iocbs in the array provided and updates
* counters in the associated oper struct
*/
-static void update_iou_counters(struct iocb **my_iocbs, int nr,
- struct timeval *tv_now)
+static void update_iou_counters(struct iocb **my_iocbs, int nr, struct timeval *tv_now)
{
struct io_unit *io;
int i;
+
for (i = 0; i < nr; i++) {
io = (struct io_unit *)(my_iocbs[i]);
io->io_oper->num_pending++;
io->io_oper->started_ios++;
- io->io_start_time = *tv_now; /* set time of io_submit */
+ io->io_start_time = *tv_now; /* set time of io_submit */
}
}
/* starts some io for a given file, returns zero if all went well */
-int run_built(struct thread_info *t, int num_ios, struct iocb **my_iocbs)
+static int run_built(struct thread_info *t, int num_ios, struct iocb **my_iocbs)
{
int ret;
struct timeval start_time;
@@ -778,17 +758,17 @@ resubmit:
*/
if (ret > 0 || ret == -EAGAIN) {
int old_ret = ret;
- if ((ret = read_some_events(t) > 0)) {
+
+ ret = read_some_events(t);
+ if (ret > 0) {
goto resubmit;
} else {
- fprintf(stderr, "ret was %d and now is %d\n",
- ret, old_ret);
+ tst_res(TINFO, "ret was %d and now is %d", ret, old_ret);
abort();
}
}
- fprintf(stderr, "ret %d (%s) on io_submit\n", ret,
- strerror(-ret));
+ tst_res(TINFO, "ret %d (%s) on io_submit", ret, tst_strerrno(-ret));
return -1;
}
update_iou_counters(my_iocbs, ret, &stop_time);
@@ -803,6 +783,7 @@ resubmit:
static int restart_oper(struct io_oper *oper)
{
int new_rw = 0;
+
if (oper->last_err)
return 0;
@@ -811,12 +792,18 @@ static int restart_oper(struct io_oper *oper)
case WRITE:
if (stages & (1 << READ))
new_rw = READ;
+ break;
case READ:
if (!new_rw && stages & (1 << RWRITE))
new_rw = RWRITE;
+ break;
case RWRITE:
if (!new_rw && stages & (1 << RREAD))
new_rw = RREAD;
+ break;
+ default:
+ /* fallthrough */
+ break;
}
if (new_rw) {
@@ -840,24 +827,21 @@ static int restart_oper(struct io_oper *oper)
static int oper_runnable(struct io_oper *oper)
{
struct stat buf;
- int ret;
/* first context is always runnable, if started_ios > 0, no need to
* redo the calculations
*/
if (oper->started_ios || oper->start == 0)
return 1;
- /*
- * only the sequential phases force delays in starting */
+
+ /* only the sequential phases force delays in starting */
if (oper->rw >= RWRITE)
return 1;
- ret = fstat(oper->fd, &buf);
- if (ret < 0) {
- perror("fstat");
- exit(1);
- }
+
+ SAFE_FSTAT(oper->fd, &buf);
if (S_ISREG(buf.st_mode) && buf.st_size < oper->start)
return 0;
+
return 1;
}
@@ -872,8 +856,7 @@ static int oper_runnable(struct io_oper *oper)
* active list. Any operations that have finished are moved onto
* the finished_opers list.
*/
-static int run_active_list(struct thread_info *t,
- int io_iter, int max_io_submit)
+static int run_active_list(struct thread_info *t, int io_iter, int max_io_submit)
{
struct io_oper *oper;
struct io_oper *built_opers = NULL;
@@ -903,10 +886,9 @@ static int run_active_list(struct thread_info *t,
}
if (num_built) {
ret = run_built(t, num_built, t->iocbs);
- if (ret < 0) {
- fprintf(stderr, "error %d on run_built\n", ret);
- exit(1);
- }
+ if (ret < 0)
+ tst_brk(TBROK, "error %d on run_built", ret);
+
while (built_opers) {
oper = built_opers;
oper_list_del(oper, &built_opers);
@@ -917,46 +899,28 @@ static int run_active_list(struct thread_info *t,
}
}
}
- return 0;
-}
-void drop_shm()
-{
- int ret;
- struct shmid_ds ds;
- if (use_shm != USE_SHM)
- return;
-
- ret = shmctl(shm_id, IPC_RMID, &ds);
- if (ret) {
- perror("shmctl IPC_RMID");
- }
+ return 0;
}
-void aio_setup(io_context_t * io_ctx, int n)
+static void aio_setup(io_context_t *io_ctx, int n)
{
int res = io_queue_init(n, io_ctx);
- if (res != 0) {
- fprintf(stderr, "io_queue_setup(%d) returned %d (%s)\n",
- n, res, strerror(-res));
- exit(3);
- }
+
+ if (res != 0)
+ tst_brk(TBROK, "io_queue_setup(%d) returned %d (%s)", n, res, tst_strerrno(-res));
}
/*
* allocate io operation and event arrays for a given thread
*/
-int setup_ious(struct thread_info *t,
- int num_files, int depth, int reclen, int max_io_submit)
+static void setup_ious(struct thread_info *t, int num_files, int depth, int reclen, int max_io_submit)
{
int i;
size_t bytes = num_files * depth * sizeof(*t->ios);
- t->ios = malloc(bytes);
- if (!t->ios) {
- fprintf(stderr, "unable to allocate io units\n");
- return -1;
- }
+ t->ios = SAFE_MALLOC(bytes);
+
memset(t->ios, 0, bytes);
for (i = 0; i < depth * num_files; i++) {
@@ -975,30 +939,14 @@ int setup_ious(struct thread_info *t,
memset(verify_buf, 'b', reclen);
}
- t->iocbs = malloc(sizeof(struct iocb *) * max_io_submit);
- if (!t->iocbs) {
- fprintf(stderr, "unable to allocate iocbs\n");
- goto free_buffers;
- }
-
+ t->iocbs = SAFE_MALLOC(sizeof(struct iocb *) * max_io_submit);
memset(t->iocbs, 0, max_io_submit * sizeof(struct iocb *));
- t->events = malloc(sizeof(struct io_event) * depth * num_files);
- if (!t->events) {
- fprintf(stderr, "unable to allocate ram for events\n");
- goto free_buffers;
- }
+ t->events = SAFE_MALLOC(sizeof(struct io_event) * depth * num_files);
memset(t->events, 0, num_files * sizeof(struct io_event) * depth);
t->num_global_ios = num_files * depth;
t->num_global_events = t->num_global_ios;
- return 0;
-
-free_buffers:
- free(t->ios);
- free(t->iocbs);
- free(t->events);
- return -1;
}
/*
@@ -1008,8 +956,7 @@ free_buffers:
* and without trying to find a special place in each thread to map the
* buffers to
*/
-int setup_shared_mem(int num_threads, int num_files, int depth,
- int reclen, int max_io_submit)
+static int setup_shared_mem(int num_threads, int num_files, int depth, int reclen)
{
char *p = NULL;
size_t total_ram;
@@ -1024,63 +971,40 @@ int setup_shared_mem(int num_threads, int num_files, int depth,
total_ram += page_size_mask;
if (use_shm == USE_MALLOC) {
- p = malloc(total_ram);
+ p = SAFE_MALLOC(total_ram);
} else if (use_shm == USE_SHM) {
- shm_id = shmget(IPC_PRIVATE, total_ram, IPC_CREAT | 0700);
- if (shm_id < 0) {
- perror("shmget");
- drop_shm();
- goto free_buffers;
- }
- p = shmat(shm_id, (char *)0x50000000, 0);
- if ((long)p == -1) {
- perror("shmat");
- goto free_buffers;
- }
- /* won't really be dropped until we shmdt */
- drop_shm();
+ SAFE_SHMGET(IPC_PRIVATE, total_ram, IPC_CREAT | 0700);
+ p = SAFE_SHMAT(shm_id, (char *)0x50000000, 0);
} else if (use_shm == USE_SHMFS) {
- char mmap_name[16]; /* /dev/shm/ + null + XXXXXX */
+ char mmap_name[16]; /* /dev/shm/ + null + XXXXXX */
int fd;
strcpy(mmap_name, "/dev/shm/XXXXXX");
fd = mkstemp(mmap_name);
- if (fd < 0) {
- perror("mkstemp");
- goto free_buffers;
- }
- unlink(mmap_name);
- ftruncate(fd, total_ram);
+ if (fd < 0)
+ tst_brk(TBROK, "mkstemp error");
+
+ SAFE_UNLINK(mmap_name);
+ SAFE_FTRUNCATE(fd, total_ram);
+
shm_id = fd;
- p = mmap((char *)0x50000000, total_ram,
- PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
- if (p == MAP_FAILED) {
- perror("mmap");
- goto free_buffers;
- }
- }
- if (!p) {
- fprintf(stderr, "unable to allocate buffers\n");
- goto free_buffers;
+ p = SAFE_MMAP((char *)0x50000000, total_ram,
+ PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
}
+
unaligned_buffer = p;
- p = (char *)((intptr_t) (p + page_size_mask) & ~page_size_mask);
+ p = (char *)((intptr_t)(p + page_size_mask) & ~page_size_mask);
aligned_buffer = p;
- return 0;
-free_buffers:
- drop_shm();
- if (unaligned_buffer)
- free(unaligned_buffer);
- return -1;
+ return 0;
}
/*
* runs through all the thread_info structs and calculates a combined
* throughput
*/
-void global_thread_throughput(struct thread_info *t, char *this_stage)
+static void global_thread_throughput(struct thread_info *t, char *this_stage)
{
int i;
double runtime = time_since_now(&global_stage_start_time);
@@ -1093,12 +1017,10 @@ void global_thread_throughput(struct thread_info *t, char *this_stage)
min_trans = t->stage_mb_trans;
}
if (total_mb) {
- fprintf(stderr, "%s throughput (%.2f MB/s) ", this_stage,
- total_mb / runtime);
- fprintf(stderr, "%.2f MB in %.2fs", total_mb, runtime);
- if (stonewall)
- fprintf(stderr, " min transfer %.2fMB", min_trans);
- fprintf(stderr, "\n");
+ tst_res(TINFO, "%s throughput (%.2f MB/s)", this_stage, total_mb / runtime);
+ tst_res(TINFO, "%.2f MB in %.2fs", total_mb, runtime);
+ if (no_stonewall)
+ tst_res(TINFO, "min transfer %.2fMB", min_trans);
}
}
@@ -1111,7 +1033,7 @@ void global_thread_throughput(struct thread_info *t, char *this_stage)
* various timings are printed in between the stages, along with
* thread synchronization if there are more than one threads.
*/
-int worker(struct thread_info *t)
+static int *worker(struct thread_info *t)
{
struct io_oper *oper;
char *this_stage = NULL;
@@ -1143,9 +1065,8 @@ restart:
cnt = 0;
/* first we send everything through aio */
- while (t->active_opers
- && (cnt < iterations || iterations == RUN_FOREVER)) {
- if (stonewall && threads_ending) {
+ while (t->active_opers && (cnt < iterations || iterations == RUN_FOREVER)) {
+ if (!no_stonewall && threads_ending) {
oper = t->active_opers;
oper->stonewalled = 1;
oper_list_del(oper, &t->active_opers);
@@ -1175,8 +1096,8 @@ restart:
*/
oper = t->finished_opers;
while (oper) {
- if (fsync_stages)
- fsync(oper->fd);
+ if (!no_fsync_stages)
+ SAFE_FSYNC(oper->fd);
t->stage_mb_trans += oper_mb_trans(oper);
if (restart_oper(oper)) {
oper_list_del(oper, &t->finished_opers);
@@ -1191,11 +1112,10 @@ restart:
if (t->stage_mb_trans && t->num_files > 0) {
double seconds = time_since_now(&stage_time);
- fprintf(stderr,
- "thread %td %s totals (%.2f MB/s) %.2f MB in %.2fs\n",
+
+ tst_res(TINFO, "thread %td %s totals (%.2f MB/s) %.2f MB in %.2fs",
t - global_thread_info, this_stage,
- t->stage_mb_trans / seconds, t->stage_mb_trans,
- seconds);
+ t->stage_mb_trans / seconds, t->stage_mb_trans, seconds);
}
if (num_threads > 1) {
@@ -1224,210 +1144,115 @@ restart:
status = finish_oper(t, oper);
}
- if (t->num_global_pending) {
- fprintf(stderr, "global num pending is %d\n",
- t->num_global_pending);
- }
+ if (t->num_global_pending)
+ tst_res(TINFO, "global num pending is %d", t->num_global_pending);
+
io_queue_release(t->io_ctx);
- return status;
+ return (void *)(intptr_t)status;
}
-typedef void *(*start_routine) (void *);
-int run_workers(struct thread_info *t, int num_threads)
+typedef void *(*start_routine)(void *);
+static int run_workers(struct thread_info *t, int num_threads)
{
- int ret;
+ void *retval;
+ int ret = 0;
int i;
+ for (i = 0; i < num_threads; i++)
+ SAFE_PTHREAD_CREATE(&t[i].tid, NULL, (start_routine)worker, t + i);
+
for (i = 0; i < num_threads; i++) {
- ret =
- pthread_create(&t[i].tid, NULL, (start_routine) worker,
- t + i);
- if (ret) {
- perror("pthread_create");
- exit(1);
- }
- }
- for (i = 0; i < num_threads; i++) {
- ret = pthread_join(t[i].tid, NULL);
- if (ret) {
- perror("pthread_join");
- exit(1);
- }
+ SAFE_PTHREAD_JOIN(t[i].tid, &retval);
+ ret = (intptr_t)retval;
}
- return 0;
-}
-off_t parse_size(char *size_arg, off_t mult)
-{
- char c;
- int num;
- off_t ret;
- c = size_arg[strlen(size_arg) - 1];
- if (c > '9') {
- size_arg[strlen(size_arg) - 1] = '\0';
- }
- num = atoi(size_arg);
- switch (c) {
- case 'g':
- case 'G':
- mult = 1024 * 1024 * 1024;
- break;
- case 'm':
- case 'M':
- mult = 1024 * 1024;
- break;
- case 'k':
- case 'K':
- mult = 1024;
- break;
- case 'b':
- case 'B':
- mult = 1;
- break;
- }
- ret = mult * num;
return ret;
}
-void print_usage(void)
+static void setup(void)
{
- printf
- ("usage: aio-stress [-s size] [-r size] [-a size] [-d num] [-b num]\n");
- printf
- (" [-i num] [-t num] [-c num] [-C size] [-nxhOS ]\n");
- printf(" file1 [file2 ...]\n");
- printf("\t-a size in KB at which to align buffers\n");
- printf("\t-b max number of iocbs to give io_submit at once\n");
- printf("\t-c number of io contexts per file\n");
- printf("\t-C offset between contexts, default 2MB\n");
- printf("\t-s size in MB of the test file(s), default 1024MB\n");
- printf("\t-r record size in KB used for each io, default 64KB\n");
- printf
- ("\t-d number of pending aio requests for each file, default 64\n");
- printf("\t-i number of I/O per file sent before switching\n"
- "\t to the next file, default 8\n");
- printf("\t-I total number of ayncs I/O the program will run, "
- "default is run until Cntl-C\n");
- printf("\t-O Use O_DIRECT (not available in 2.4 kernels),\n");
- printf("\t-S Use O_SYNC for writes\n");
- printf("\t-o add an operation to the list: write=0, read=1,\n");
- printf("\t random write=2, random read=3.\n");
- printf("\t repeat -o to specify multiple ops: -o 0 -o 1 etc.\n");
- printf
- ("\t-m shm use ipc shared memory for io buffers instead of malloc\n");
- printf("\t-m shmfs mmap a file in /dev/shm for io buffers\n");
- printf("\t-n no fsyncs between write stage and read stage\n");
- printf("\t-l print io_submit latencies after each stage\n");
- printf("\t-L print io completion latencies after each stage\n");
- printf("\t-t number of threads to run\n");
- printf("\t-u unlink files after completion\n");
- printf("\t-v verification of bytes written\n");
- printf("\t-x turn off thread stonewalling\n");
- printf("\t-h this message\n");
- printf
- ("\n\t the size options (-a -s and -r) allow modifiers -s 400{k,m,g}\n");
- printf("\t translate to 400KB, 400MB and 400GB\n");
- printf("version %s\n", PROG_VERSION);
+ int maxaio;
+ int stages_i;
+
+ page_size_mask = tst_dev_block_size(".");
+
+ SAFE_FILE_SCANF("/proc/sys/fs/aio-max-nr", "%d", &maxaio);
+ tst_res(TINFO, "Maximum AIO blocks: %d", maxaio);
+
+ if (tst_parse_int(str_num_files, &num_files, 1, INT_MAX))
+ tst_brk(TBROK, "Invalid number of files to generate '%s'", str_num_files);
+
+ if (tst_parse_int(str_max_io_submit, &max_io_submit, 0, INT_MAX))
+ tst_brk(TBROK, "Invalid number of iocbs '%s'", str_max_io_submit);
+
+ if (max_io_submit > maxaio)
+ tst_res(TCONF, "Number of async IO blocks passed the maximum (%d)", maxaio);
+
+ if (tst_parse_int(str_num_contexts, &num_contexts, 1, INT_MAX))
+ tst_brk(TBROK, "Invalid number of contexts per file '%s'", str_num_contexts);
+
+ if (tst_parse_filesize(str_context_offset, &context_offset, 1, LLONG_MAX))
+ tst_brk(TBROK, "Invalid offset between contexts '%s'", str_context_offset);
+
+ if (tst_parse_filesize(str_file_size, &file_size, 1, LLONG_MAX))
+ tst_brk(TBROK, "Invalid file size '%s'", str_file_size);
+
+ if (tst_parse_long(str_rec_len, &rec_len, 1, LONG_MAX))
+ tst_brk(TBROK, "Invalid record size '%s'", str_rec_len);
+
+ if (tst_parse_int(str_depth, &depth, 1, INT_MAX))
+ tst_brk(TBROK, "Invalid number of pending aio requests '%s'", str_depth);
+
+ if (tst_parse_int(str_io_iter, &io_iter, 1, INT_MAX))
+ tst_brk(TBROK, "Invalid number of I/O per file '%s'", str_io_iter);
+
+ if (tst_parse_int(str_iterations, &iterations, 1, INT_MAX))
+ tst_brk(TBROK, "Invalid number of total ayncs I/O '%s'", str_iterations);
+
+ if (iterations == INT_MAX)
+ iterations = RUN_FOREVER;
+
+ if (tst_parse_int(str_stages, &stages_i, 0, INT_MAX))
+ tst_brk(TBROK, "Invalid stage number '%s'", str_stages);
+
+ if (stages_i) {
+ stages |= 1 << stages_i;
+ tst_res(TINFO, "Adding stage %s", stage_name(stages_i));
+ }
+
+ if (tst_parse_int(str_num_threads, &num_threads, 1, INT_MAX))
+ tst_brk(TBROK, "Invalid number of threads '%s'", str_num_threads);
+
+ if (str_o_flag)
+ o_flag = O_DIRECT;
+ else
+ o_flag = O_SYNC;
+
+ if (str_use_shm) {
+ if (!strcmp(str_use_shm, "shm")) {
+ tst_res(TINFO, "using ipc shm");
+ use_shm = USE_SHM;
+ } else if (!strcmp(str_use_shm, "shmfs")) {
+ tst_res(TINFO, "using /dev/shm for buffers");
+ use_shm = USE_SHMFS;
+ } else {
+ tst_brk(TBROK, "Invalid shm option '%s'", str_use_shm);
+ }
+ }
}
-int main(int ac, char **av)
+static void run(void)
{
- int rwfd;
- int i;
- int j;
- int c;
-
- off_t file_size = 1 * 1024 * 1024 * 1024;
+ char files[num_files][265];
int first_stage = WRITE;
struct io_oper *oper;
int status = 0;
- int num_files = 0;
int open_fds = 0;
struct thread_info *t;
-
- page_size_mask = getpagesize() - 1;
-
- while (1) {
- c = getopt(ac, av, "a:b:c:C:m:s:r:d:i:I:o:t:lLnhOSxvu");
- if (c < 0)
- break;
-
- switch (c) {
- case 'a':
- page_size_mask = parse_size(optarg, 1024);
- page_size_mask--;
- break;
- case 'c':
- num_contexts = atoi(optarg);
- break;
- case 'C':
- context_offset = parse_size(optarg, 1024 * 1024);
- case 'b':
- max_io_submit = atoi(optarg);
- break;
- case 's':
- file_size = parse_size(optarg, 1024 * 1024);
- break;
- case 'd':
- depth = atoi(optarg);
- break;
- case 'r':
- rec_len = parse_size(optarg, 1024);
- break;
- case 'i':
- io_iter = atoi(optarg);
- break;
- case 'I':
- iterations = atoi(optarg);
- break;
- case 'n':
- fsync_stages = 0;
- break;
- case 'l':
- latency_stats = 1;
- break;
- case 'L':
- completion_latency_stats = 1;
- break;
- case 'm':
- if (!strcmp(optarg, "shm")) {
- fprintf(stderr, "using ipc shm\n");
- use_shm = USE_SHM;
- } else if (!strcmp(optarg, "shmfs")) {
- fprintf(stderr, "using /dev/shm for buffers\n");
- use_shm = USE_SHMFS;
- }
- break;
- case 'o':
- i = atoi(optarg);
- stages |= 1 << i;
- fprintf(stderr, "adding stage %s\n", stage_name(i));
- break;
- case 'O':
- o_direct = O_DIRECT;
- break;
- case 'S':
- o_sync = O_SYNC;
- break;
- case 't':
- num_threads = atoi(optarg);
- break;
- case 'x':
- stonewall = 0;
- break;
- case 'u':
- unlink_files = 1;
- break;
- case 'v':
- verify = 1;
- break;
- case 'h':
- default:
- print_usage();
- exit(1);
- }
- }
+ int rwfd;
+ int i;
+ int j;
/*
* make sure we don't try to submit more I/O than we have allocated
@@ -1435,28 +1260,15 @@ int main(int ac, char **av)
*/
if (depth < io_iter) {
io_iter = depth;
- fprintf(stderr, "dropping io_iter to %d\n", io_iter);
+ tst_res(TINFO, "dropping io_iter to %d", io_iter);
}
- if (optind >= ac) {
- print_usage();
- exit(1);
- }
-
- num_files = ac - optind;
-
if (num_threads > (num_files * num_contexts)) {
num_threads = num_files * num_contexts;
- fprintf(stderr,
- "dropping thread count to the number of contexts %d\n",
- num_threads);
+ tst_res(TINFO, "Dropping thread count to the number of contexts %d", num_threads);
}
- t = malloc(num_threads * sizeof(*t));
- if (!t) {
- perror("malloc");
- exit(1);
- }
+ t = SAFE_MALLOC(num_threads * sizeof(*t));
memset(t, 0, num_threads * sizeof(*t));
global_thread_info = t;
@@ -1471,100 +1283,108 @@ int main(int ac, char **av)
*/
if (max_io_submit < io_iter) {
io_iter = max_io_submit;
- fprintf(stderr, "dropping io_iter to %d\n", io_iter);
+ tst_res(TINFO, "dropping io_iter to %d", io_iter);
}
if (!stages) {
- stages =
- (1 << WRITE) | (1 << READ) | (1 << RREAD) | (1 << RWRITE);
+ stages = (1 << WRITE) | (1 << READ) | (1 << RREAD) | (1 << RWRITE);
} else {
for (i = 0; i < LAST_STAGE; i++) {
if (stages & (1 << i)) {
first_stage = i;
- fprintf(stderr, "starting with %s\n",
- stage_name(i));
+ tst_res(TINFO, "starting with %s", stage_name(i));
break;
}
}
}
if (file_size < num_contexts * context_offset) {
- fprintf(stderr, "file size %ld too small for %d contexts\n",
+ tst_brk(TBROK, "file size %ld too small for %d contexts",
(long)file_size, num_contexts);
- exit(1);
}
- fprintf(stderr, "file size %ldMB, record size %ldKB, depth %d, "
- "I/O per iteration %d\n",
- (long)(file_size / (1024 * 1024)),
- rec_len / 1024, depth, io_iter);
- fprintf(stderr, "max io_submit %d, buffer alignment set to %luKB\n",
+ tst_res(TINFO, "file size %ldMB, record size %ldKB, depth %d, I/O per iteration %d",
+ (long)(file_size / (1024 * 1024)), rec_len / 1024, depth, io_iter);
+ tst_res(TINFO, "max io_submit %d, buffer alignment set to %luKB",
max_io_submit, (page_size_mask + 1) / 1024);
- fprintf(stderr, "threads %d files %d contexts %d context offset %ldMB "
- "verification %s\n", num_threads, num_files, num_contexts,
+ tst_res(TINFO, "threads %d files %d contexts %d context offset %ldMB verification %s",
+ num_threads, num_files, num_contexts,
(long)(context_offset / (1024 * 1024)), verify ? "on" : "off");
+
/* open all the files and do any required setup for them */
- for (i = optind; i < ac; i++) {
+ for (i = 0; i < num_files; i++) {
int thread_index;
+
+ snprintf(files[i], sizeof(files[i]), "file%d.bin", i);
+
for (j = 0; j < num_contexts; j++) {
thread_index = open_fds % num_threads;
open_fds++;
- rwfd =
- open(av[i], O_CREAT | O_RDWR | o_direct | o_sync,
- 0600);
- if (rwfd == -1) {
- fprintf(stderr,
- "error while creating file %s: %s",
- av[i], strerror(errno));
- exit(1);
- }
+ rwfd = SAFE_OPEN(files[i], O_CREAT | O_RDWR | o_flag, 0600);
+
+ oper = create_oper(rwfd, first_stage, j * context_offset,
+ file_size - j * context_offset,
+ rec_len, depth, files[i]);
+ if (!oper)
+ tst_brk(TBROK, "error in create_oper");
- oper =
- create_oper(rwfd, first_stage, j * context_offset,
- file_size - j * context_offset, rec_len,
- depth, io_iter, av[i]);
- if (!oper) {
- fprintf(stderr, "error in create_oper\n");
- exit(-1);
- }
oper_list_add(oper, &t[thread_index].active_opers);
t[thread_index].num_files++;
}
}
- if (setup_shared_mem(num_threads, num_files * num_contexts,
- depth, rec_len, max_io_submit)) {
- exit(1);
- }
- for (i = 0; i < num_threads; i++) {
- if (setup_ious
- (&t[i], t[i].num_files, depth, rec_len, max_io_submit))
- exit(1);
- }
+
+ if (setup_shared_mem(num_threads, num_files * num_contexts, depth, rec_len))
+ tst_brk(TBROK, "error in setup_shared_mem");
+
+ for (i = 0; i < num_threads; i++)
+ setup_ious(&t[i], t[i].num_files, depth, rec_len, max_io_submit);
+
if (num_threads > 1) {
- printf("Running multi thread version num_threads:%d\n",
- num_threads);
- run_workers(t, num_threads);
+ tst_res(TINFO, "Running multi thread version num_threads: %d", num_threads);
+ status = run_workers(t, num_threads);
} else {
- printf("Running single thread version \n");
- status = worker(t);
- }
- if (unlink_files) {
- for (i = optind; i < ac; i++) {
- printf("Cleaning up file %s \n", av[i]);
- unlink(av[i]);
- }
+ tst_res(TINFO, "Running single thread version");
+ status = (intptr_t)worker(t);
}
- if (status) {
- exit(1);
- }
- return status;
+ for (i = 0; i < num_files; i++)
+ SAFE_UNLINK(files[i]);
+
+ if (status)
+ tst_res(TFAIL, "Test did not pass");
+ else
+ tst_res(TPASS, "Test passed");
}
+
+static struct tst_test test = {
+ .test_all = run,
+ .setup = setup,
+ .needs_tmpdir = 1,
+ .needs_root = 1,
+ .options = (struct tst_option[]){
+ { "f:", &str_num_files, "Number of files to generate" },
+ { "b:", &str_max_io_submit, "Max number of iocbs to give io_submit at once" },
+ { "c:", &str_num_contexts, "Number of io contexts per file" },
+ { "g:", &str_context_offset, "Offset between contexts (default 2M)" },
+ { "s:", &str_file_size, "Size in MB of the test file(s) (default 1024M)" },
+ { "r:", &str_rec_len, "Record size in KB used for each io (default 64K)" },
+ { "d:", &str_depth, "Number of pending aio requests for each file (default 64)" },
+ { "e:", &str_io_iter, "Number of I/O per file sent before switching to the next file (default 8)" },
+ { "a:", &str_iterations, "Total number of ayncs I/O the program will run, default is run until Cntl-C" },
+ { "O", &str_o_flag, "Use O_DIRECT" },
+ { "o:", &str_stages, "Add an operation to the list: write=0, read=1, random write=2, random read=3" },
+ { "m", &str_use_shm, "SHM use ipc shared memory for io buffers instead of malloc" },
+ { "n", &no_fsync_stages, "No fsyncs between write stage and read stage" },
+ { "l", &latency_stats, "Print io_submit latencies after each stage" },
+ { "L", &completion_latency_stats, "Print io completion latencies after each stage" },
+ { "t:", &str_num_threads, "Number of threads to run" },
+ { "u", &unlink_files, "Unlink files after completion" },
+ { "v", &verify, "Verification of bytes written" },
+ { "x", &no_stonewall, "Turn off thread stonewalling" },
+ {},
+ },
+};
#else
-int main(void)
-{
- fprintf(stderr, "test requires libaio and it's development packages\n");
- return TCONF;
-}
+TST_TEST_TCONF("test requires libaio and its development packages");
#endif
Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.de> --- testcases/kernel/io/ltp-aiodio/aio-stress.c | 892 ++++++++------------ 1 file changed, 356 insertions(+), 536 deletions(-)