From patchwork Tue Jul 18 14:37:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zorro Lang X-Patchwork-Id: 9848601 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7C3ED602A7 for ; Tue, 18 Jul 2017 14:37:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 71DF826247 for ; Tue, 18 Jul 2017 14:37:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 66CBC284B5; Tue, 18 Jul 2017 14:37:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F6F026247 for ; Tue, 18 Jul 2017 14:37:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751927AbdGROhb (ORCPT ); Tue, 18 Jul 2017 10:37:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48588 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751926AbdGROh2 (ORCPT ); Tue, 18 Jul 2017 10:37:28 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0E412C04D294 for ; Tue, 18 Jul 2017 14:37:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0E412C04D294 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=zlang@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 0E412C04D294 Received: from localhost.localdomain.com (ovpn-12-32.pek2.redhat.com [10.72.12.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 15E177FCF9 for ; Tue, 18 Jul 2017 14:37:26 +0000 (UTC) From: Zorro Lang To: fstests@vger.kernel.org Subject: [PATCH v2 2/3] fsstress: add AIO read/write and fsync test Date: Tue, 18 Jul 2017 22:37:13 +0800 Message-Id: <20170718143714.11359-2-zlang@redhat.com> In-Reply-To: <20170718143714.11359-1-zlang@redhat.com> References: <20170718143714.11359-1-zlang@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 18 Jul 2017 14:37:28 +0000 (UTC) Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We found some bugs by aio read/write test, but there's not related operations in fsstress. So add AIO test into fsstress to increase AIO stress test. Due to most kernels don't support aio fsync, so set its test frequency to zero as default. Signed-off-by: Zorro Lang --- ltp/fsstress.c | 214 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 214 insertions(+) diff --git a/ltp/fsstress.c b/ltp/fsstress.c index 0ecc214c..7ae7fdf2 100644 --- a/ltp/fsstress.c +++ b/ltp/fsstress.c @@ -36,6 +36,10 @@ #ifdef HAVE_SYS_PRCTL_H #include #endif +#ifdef AIO +#include +io_context_t io_ctx; +#endif #ifndef FS_IOC_GETFLAGS #define FS_IOC_GETFLAGS _IOR('f', 1, long) @@ -55,9 +59,12 @@ #define FILELEN_MAX (32*4096) typedef enum { + OP_AFSYNC, OP_ALLOCSP, + OP_AREAD, OP_ATTR_REMOVE, OP_ATTR_SET, + OP_AWRITE, OP_BULKSTAT, OP_BULKSTAT1, OP_CHOWN, @@ -158,9 +165,12 @@ struct print_string { #define MAXFSIZE ((1ULL << 63) - 1ULL) #define MAXFSIZE32 ((1ULL << 40) - 1ULL) +void afsync_f(int, long); void allocsp_f(int, long); +void aread_f(int, long); void attr_remove_f(int, long); void attr_set_f(int, long); +void awrite_f(int, long); void bulkstat_f(int, long); void bulkstat1_f(int, long); void chown_f(int, long); @@ -202,9 +212,12 @@ void writev_f(int, long); opdesc_t ops[] = { /* { OP_ENUM, "name", function, freq, iswrite }, */ + { OP_AFSYNC, "afsync", afsync_f, 0, 1 }, { OP_ALLOCSP, "allocsp", allocsp_f, 1, 1 }, + { OP_AREAD, "aread", aread_f, 1, 0 }, { OP_ATTR_REMOVE, "attr_remove", attr_remove_f, /* 1 */ 0, 1 }, { OP_ATTR_SET, "attr_set", attr_set_f, /* 2 */ 0, 1 }, + { OP_AWRITE, "awrite", awrite_f, 1, 1 }, { OP_BULKSTAT, "bulkstat", bulkstat_f, 1, 0 }, { OP_BULKSTAT1, "bulkstat1", bulkstat1_f, 1, 0 }, { OP_CHOWN, "chown", chown_f, 3, 1 }, @@ -587,8 +600,20 @@ int main(int argc, char **argv) } } procid = i; +#ifdef AIO + if (io_setup(128, &io_ctx) != 0) { + fprintf(stderr, "io_setup failed"); + exit(1); + } +#endif for (i = 0; !loops || (i < loops); i++) doproc(); +#ifdef AIO + if(io_destroy(io_ctx) != 0) { + fprintf(stderr, "io_destroy failed"); + return 1; + } +#endif return 0; } } @@ -1708,6 +1733,62 @@ void inode_info(char *str, size_t sz, struct stat64 *s, int verbose) } void +afsync_f(int opno, long r) +{ +#ifdef AIO + int e; + pathname_t f; + int fd; + int v; + struct iocb iocb; + struct iocb *iocbs[] = { &iocb }; + struct io_event event; + + init_pathname(&f); + if (!get_fname(FT_REGFILE, r, &f, NULL, NULL, &v)) { + if (v) + printf("%d/%d: afsync - no filename\n", procid, opno); + free_pathname(&f); + return; + } + fd = open_path(&f, O_WRONLY | O_DIRECT); + e = fd < 0 ? errno : 0; + check_cwd(); + if (fd < 0) { + if (v) + printf("%d/%d: afsync - open %s failed %d\n", + procid, opno, f.path, e); + free_pathname(&f); + return; + } + + io_prep_fsync(&iocb, fd); + if ((e = io_submit(io_ctx, 1, iocbs)) != 1) { + if (v) + printf("%d/%d: afsync - io_submit %s %d\n", + procid, opno, f.path, e); + free_pathname(&f); + close(fd); + return; + } + if ((e = io_getevents(io_ctx, 1, 1, &event, NULL)) != 1) { + if (v) + printf("%d/%d: afsync - io_getevents failed %d\n", + procid, opno, e); + free_pathname(&f); + close(fd); + return; + } + + e = event.res2; + if (v) + printf("%d/%d: afsync %s %d\n", procid, opno, f.path, e); + free_pathname(&f); + close(fd); +#endif +} + +void allocsp_f(int opno, long r) { int e; @@ -1761,6 +1842,131 @@ allocsp_f(int opno, long r) close(fd); } +#ifdef AIO +void +do_aio_rw(int opno, long r, int flags) +{ + __int64_t align; + char *buf; + struct dioattr diob; + int e; + pathname_t f; + int fd; + size_t len; + __int64_t lr; + off64_t off; + struct stat64 stb; + int v; + char st[1024]; + char *dio_env; + struct iocb iocb; + struct io_event event; + struct iocb *iocbs[] = { &iocb }; + int iswrite = (flags & (O_WRONLY | O_RDWR)) ? 1 : 0; + + init_pathname(&f); + if (!get_fname(FT_REGFILE, r, &f, NULL, NULL, &v)) { + if (v) + printf("%d/%d: do_aio_rw - no filename\n", procid, opno); + free_pathname(&f); + return; + } + fd = open_path(&f, flags|O_DIRECT); + e = fd < 0 ? errno : 0; + check_cwd(); + if (fd < 0) { + if (v) + printf("%d/%d: do_aio_rw - open %s failed %d\n", + procid, opno, f.path, e); + free_pathname(&f); + return; + } + if (fstat64(fd, &stb) < 0) { + if (v) + printf("%d/%d: do_aio_rw - fstat64 %s failed %d\n", + procid, opno, f.path, errno); + free_pathname(&f); + close(fd); + return; + } + inode_info(st, sizeof(st), &stb, v); + if (!iswrite && stb.st_size == 0) { + if (v) + printf("%d/%d: do_aio_rw - %s%s zero size\n", procid, opno, + f.path, st); + free_pathname(&f); + close(fd); + return; + } + if (xfsctl(f.path, fd, XFS_IOC_DIOINFO, &diob) < 0) { + if (v) + printf( + "%d/%d: do_aio_rw - xfsctl(XFS_IOC_DIOINFO) %s%s failed %d\n", + procid, opno, f.path, st, errno); + free_pathname(&f); + close(fd); + return; + } + dio_env = getenv("XFS_DIO_MIN"); + if (dio_env) + diob.d_mem = diob.d_miniosz = atoi(dio_env); + align = (__int64_t)diob.d_miniosz; + lr = ((__int64_t)random() << 32) + random(); + len = (random() % FILELEN_MAX) + 1; + len -= (len % align); + if (len <= 0) + len = align; + else if (len > diob.d_maxiosz) + len = diob.d_maxiosz; + buf = memalign(diob.d_mem, len); + + if (iswrite) { + off = (off64_t)(lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE)); + off -= (off % align); + off %= maxfsize; + memset(buf, nameseq & 0xff, len); + io_prep_pwrite(&iocb, fd, buf, len, off); + } else { + off = (off64_t)(lr % stb.st_size); + off -= (off % align); + io_prep_pread(&iocb, fd, buf, len, off); + } + if ((e = io_submit(io_ctx, 1, iocbs)) != 1) { + if (v) + printf("%d/%d: %s - io_submit failed %d\n", + procid, opno, iswrite ? "awrite" : "aread", e); + free_pathname(&f); + close(fd); + return; + } + if ((e = io_getevents(io_ctx, 1, 1, &event, NULL)) != 1) { + if (v) + printf("%d/%d: %s - io_getevents failed %d\n", + procid, opno, iswrite ? "awrite" : "aread", e); + free_pathname(&f); + close(fd); + return; + } + + e = event.res != len ? event.res2 : 0; + free(buf); + if (v) + printf("%d/%d: %s %s%s [%lld,%d] %d\n", + procid, opno, iswrite ? "awrite" : "aread", + f.path, st, (long long)off, (int)len, e); + free_pathname(&f); + close(fd); +} +#endif + +void +aread_f(int opno, long r) +{ +#ifdef AIO + do_aio_rw(opno, r, O_RDONLY); +#endif +} + void attr_remove_f(int opno, long r) { @@ -1865,6 +2071,14 @@ attr_set_f(int opno, long r) } void +awrite_f(int opno, long r) +{ +#ifdef AIO + do_aio_rw(opno, r, O_WRONLY); +#endif +} + +void bulkstat_f(int opno, long r) { int count;