From patchwork Tue Jul 28 18:23:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zorro Lang X-Patchwork-Id: 11689641 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D8ACB138C for ; Tue, 28 Jul 2020 18:23:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BC42B20829 for ; Tue, 28 Jul 2020 18:23:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="fLm4rCDD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732331AbgG1SXz (ORCPT ); Tue, 28 Jul 2020 14:23:55 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:56241 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1732330AbgG1SXy (ORCPT ); Tue, 28 Jul 2020 14:23:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595960633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o7CFWEUmUP2jjwdE/iP09O0q9WUnBZjdBgJ78vUEHRQ=; b=fLm4rCDD1Lo7fPLwEpyEjzdvKrNtkKNXgPzbaeqRcPAuGVCdY+fnEyJWYbV2KTWWfq0gyC f+Hnml43SGmZUe5Xk4LyM7fnNkmJwojXUtIEicrgLDn4luneNHD1jVkST0yHgrU9fCO2l9 1Iv+GKxo38pm+QQaS4AWfn1tG829Ctk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-188-hfiysWaKNQ6kQ-jRzOCBpw-1; Tue, 28 Jul 2020 14:23:41 -0400 X-MC-Unique: hfiysWaKNQ6kQ-jRzOCBpw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E16C880046C; Tue, 28 Jul 2020 18:23:40 +0000 (UTC) Received: from bogon.redhat.com (ovpn-12-108.pek2.redhat.com [10.72.12.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id 218A75DA72; Tue, 28 Jul 2020 18:23:38 +0000 (UTC) From: Zorro Lang To: fstests@vger.kernel.org Cc: io-uring@vger.kernel.org, jmoyer@redhat.com Subject: [PATCH 1/4] fsstress: add IO_URING read and write operations Date: Wed, 29 Jul 2020 02:23:17 +0800 Message-Id: <20200728182320.8762-2-zlang@redhat.com> In-Reply-To: <20200728182320.8762-1-zlang@redhat.com> References: <20200728182320.8762-1-zlang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org IO_URING is a new feature of curent linux kernel, add basic IO_URING read/write into fsstess to cover this kind of IO testing. Signed-off-by: Zorro Lang --- README | 4 +- configure.ac | 1 + include/builddefs.in | 1 + ltp/Makefile | 5 ++ ltp/fsstress.c | 139 ++++++++++++++++++++++++++++++++++++++++- m4/Makefile | 1 + m4/package_liburing.m4 | 4 ++ 7 files changed, 152 insertions(+), 3 deletions(-) create mode 100644 m4/package_liburing.m4 diff --git a/README b/README index d0e23fcd..ae0f804d 100644 --- a/README +++ b/README @@ -8,13 +8,13 @@ _______________________ sudo apt-get install xfslibs-dev uuid-dev libtool-bin \ e2fsprogs automake gcc libuuid1 quota attr libattr1-dev make \ libacl1-dev libaio-dev xfsprogs libgdbm-dev gawk fio dbench \ - uuid-runtime python sqlite3 + uuid-runtime python sqlite3 liburing-dev For Fedora, RHEL, or CentOS: yum install acl attr automake bc dbench dump e2fsprogs fio \ gawk gcc indent libtool lvm2 make psmisc quota sed \ xfsdump xfsprogs \ libacl-devel libattr-devel libaio-devel libuuid-devel \ - xfsprogs-devel btrfs-progs-devel python sqlite + xfsprogs-devel btrfs-progs-devel python sqlite liburing-devel (Older distributions may require xfsprogs-qa-devel as well.) (Note that for RHEL and CentOS, you may need the EPEL repo.) - run make diff --git a/configure.ac b/configure.ac index 4bb50b32..8922c47e 100644 --- a/configure.ac +++ b/configure.ac @@ -61,6 +61,7 @@ AC_PACKAGE_NEED_ACLINIT_LIBACL AC_PACKAGE_WANT_GDBM AC_PACKAGE_WANT_AIO +AC_PACKAGE_WANT_URING AC_PACKAGE_WANT_DMAPI AC_PACKAGE_WANT_LINUX_FIEMAP_H AC_PACKAGE_WANT_FALLOCATE diff --git a/include/builddefs.in b/include/builddefs.in index e7894b1a..fded3230 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -61,6 +61,7 @@ RPM_VERSION = @rpm_version@ ENABLE_SHARED = @enable_shared@ HAVE_DB = @have_db@ HAVE_AIO = @have_aio@ +HAVE_URING = @have_uring@ HAVE_FALLOCATE = @have_fallocate@ HAVE_OPEN_BY_HANDLE_AT = @have_open_by_handle_at@ HAVE_DMAPI = @have_dmapi@ diff --git a/ltp/Makefile b/ltp/Makefile index ebf40336..198d930f 100644 --- a/ltp/Makefile +++ b/ltp/Makefile @@ -24,6 +24,11 @@ LCFLAGS += -DAIO LLDLIBS += -laio -lpthread endif +ifeq ($(HAVE_URING), true) +LCFLAGS += -DURING +LLDLIBS += -luring +endif + ifeq ($(HAVE_LIBBTRFSUTIL), true) LLDLIBS += -lbtrfsutil endif diff --git a/ltp/fsstress.c b/ltp/fsstress.c index 709fdeec..388ace50 100644 --- a/ltp/fsstress.c +++ b/ltp/fsstress.c @@ -30,6 +30,11 @@ #include io_context_t io_ctx; #endif +#ifdef URING +#include +#define URING_ENTRIES 64 +struct io_uring ring; +#endif #include #include @@ -139,6 +144,8 @@ typedef enum { OP_TRUNCATE, OP_UNLINK, OP_UNRESVSP, + OP_URING_READ, + OP_URING_WRITE, OP_WRITE, OP_WRITEV, OP_LAST @@ -267,6 +274,8 @@ void sync_f(int, long); void truncate_f(int, long); void unlink_f(int, long); void unresvsp_f(int, long); +void uring_read_f(int, long); +void uring_write_f(int, long); void write_f(int, long); void writev_f(int, long); char *xattr_flag_to_string(int); @@ -335,6 +344,8 @@ opdesc_t ops[] = { { OP_TRUNCATE, "truncate", truncate_f, 2, 1 }, { OP_UNLINK, "unlink", unlink_f, 1, 1 }, { OP_UNRESVSP, "unresvsp", unresvsp_f, 1, 1 }, + { OP_URING_READ, "uring_read", uring_read_f, 1, 0 }, + { OP_URING_WRITE, "uring_write", uring_write_f, 1, 1 }, { OP_WRITE, "write", write_f, 4, 1 }, { OP_WRITEV, "writev", writev_f, 4, 1 }, }, *ops_end; @@ -692,6 +703,12 @@ int main(int argc, char **argv) fprintf(stderr, "io_setup failed"); exit(1); } +#endif +#ifdef URING + if (io_uring_queue_init(URING_ENTRIES, &ring, 0)) { + fprintf(stderr, "io_uring_queue_init failed\n"); + exit(1); + } #endif for (i = 0; !loops || (i < loops); i++) doproc(); @@ -701,7 +718,9 @@ int main(int argc, char **argv) return 1; } #endif - +#ifdef URING + io_uring_queue_exit(&ring); +#endif cleanup_flist(); free(freq_table); return 0; @@ -2170,6 +2189,108 @@ do_aio_rw(int opno, long r, int flags) } #endif +#ifdef URING +void +do_uring_rw(int opno, long r, int flags) +{ + char *buf; + int e; + pathname_t f; + int fd; + size_t len; + int64_t lr; + off64_t off; + struct stat64 stb; + int v; + char st[1024]; + struct io_uring_sqe *sqe; + struct io_uring_cqe *cqe; + struct iovec iovec; + 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_uring_rw - no filename\n", procid, opno); + goto uring_out3; + } + fd = open_path(&f, flags); + e = fd < 0 ? errno : 0; + check_cwd(); + if (fd < 0) { + if (v) + printf("%d/%d: do_uring_rw - open %s failed %d\n", + procid, opno, f.path, e); + goto uring_out3; + } + if (fstat64(fd, &stb) < 0) { + if (v) + printf("%d/%d: do_uring_rw - fstat64 %s failed %d\n", + procid, opno, f.path, errno); + goto uring_out2; + } + inode_info(st, sizeof(st), &stb, v); + if (!iswrite && stb.st_size == 0) { + if (v) + printf("%d/%d: do_uring_rw - %s%s zero size\n", procid, opno, + f.path, st); + goto uring_out2; + } + sqe = io_uring_get_sqe(&ring); + if (!sqe) { + if (v) + printf("%d/%d: do_uring_rw - io_uring_get_sqe failed\n", + procid, opno); + goto uring_out2; + } + lr = ((int64_t)random() << 32) + random(); + len = (random() % FILELEN_MAX) + 1; + buf = malloc(len); + if (!buf) { + if (v) + printf("%d/%d: do_uring_rw - malloc failed\n", + procid, opno); + goto uring_out2; + } + iovec.iov_base = buf; + iovec.iov_len = len; + if (iswrite) { + off = (off64_t)(lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE)); + off %= maxfsize; + memset(buf, nameseq & 0xff, len); + io_uring_prep_writev(sqe, fd, &iovec, 1, off); + } else { + off = (off64_t)(lr % stb.st_size); + io_uring_prep_readv(sqe, fd, &iovec, 1, off); + } + + if ((e = io_uring_submit(&ring)) != 1) { + if (v) + printf("%d/%d: %s - io_uring_submit failed %d\n", procid, opno, + iswrite ? "uring_write" : "uring_read", e); + goto uring_out1; + } + if ((e = io_uring_wait_cqe(&ring, &cqe)) < 0) { + if (v) + printf("%d/%d: %s - io_uring_wait_cqe failed %d\n", procid, opno, + iswrite ? "uring_write" : "uring_read", e); + goto uring_out1; + } + if (v) + printf("%d/%d: %s %s%s [%lld, %d(res=%d)] %d\n", + procid, opno, iswrite ? "uring_write" : "uring_read", + f.path, st, (long long)off, (int)len, cqe->res, e); + io_uring_cqe_seen(&ring, cqe); + + uring_out1: + free(buf); + uring_out2: + close(fd); + uring_out3: + free_pathname(&f); +} +#endif + void aread_f(int opno, long r) { @@ -5044,6 +5165,22 @@ unresvsp_f(int opno, long r) close(fd); } +void +uring_read_f(int opno, long r) +{ +#ifdef URING + do_uring_rw(opno, r, O_RDONLY); +#endif +} + +void +uring_write_f(int opno, long r) +{ +#ifdef URING + do_uring_rw(opno, r, O_WRONLY); +#endif +} + void write_f(int opno, long r) { diff --git a/m4/Makefile b/m4/Makefile index 7fbff822..0352534d 100644 --- a/m4/Makefile +++ b/m4/Makefile @@ -14,6 +14,7 @@ LSRCFILES = \ package_dmapidev.m4 \ package_globals.m4 \ package_libcdev.m4 \ + package_liburing.m4 \ package_ncurses.m4 \ package_pthread.m4 \ package_ssldev.m4 \ diff --git a/m4/package_liburing.m4 b/m4/package_liburing.m4 new file mode 100644 index 00000000..c92cc02a --- /dev/null +++ b/m4/package_liburing.m4 @@ -0,0 +1,4 @@ +AC_DEFUN([AC_PACKAGE_WANT_URING], + [ AC_CHECK_HEADERS(liburing.h, [ have_uring=true ], [ have_uring=false ]) + AC_SUBST(have_uring) + ]) From patchwork Tue Jul 28 18:23:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zorro Lang X-Patchwork-Id: 11689639 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 27825722 for ; Tue, 28 Jul 2020 18:23:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 101FF20829 for ; Tue, 28 Jul 2020 18:23:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="M54DyqKF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728829AbgG1SXy (ORCPT ); Tue, 28 Jul 2020 14:23:54 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:33097 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1732331AbgG1SXy (ORCPT ); Tue, 28 Jul 2020 14:23:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595960633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Hm3D3FsNVTEKu1cGCyBdM4Nc3R4HmkSQ9iUobZnA6n8=; b=M54DyqKFGP2jdA0jEj2BLnzbMePDP8ZUEsfZJcdqYmLqiYVIXWWnLuJU1Ka2eF5bPVvV+g 2EfB9s2DRsxVwPy8mtosX4KUWsE1+HMytcFhuufK0NHdOCg1ZkPYoiYUt14G3TVQYw3Ohw 5Sti2ft/DcR8pnEQibfTPJZq0JcDg6E= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-384-q0sPd0y0NKqp9Ax5d7tOHQ-1; Tue, 28 Jul 2020 14:23:50 -0400 X-MC-Unique: q0sPd0y0NKqp9Ax5d7tOHQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3A0B48017FB; Tue, 28 Jul 2020 18:23:49 +0000 (UTC) Received: from bogon.redhat.com (ovpn-12-108.pek2.redhat.com [10.72.12.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id A31945D993; Tue, 28 Jul 2020 18:23:47 +0000 (UTC) From: Zorro Lang To: fstests@vger.kernel.org Cc: io-uring@vger.kernel.org, jmoyer@redhat.com Subject: [PATCH 2/4] fsstress: reduce the number of events when io_setup Date: Wed, 29 Jul 2020 02:23:18 +0800 Message-Id: <20200728182320.8762-3-zlang@redhat.com> In-Reply-To: <20200728182320.8762-1-zlang@redhat.com> References: <20200728182320.8762-1-zlang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org The original number(128) of aio events for io_setup is a little big. When try to run lots of fsstress processes(e.g. -p 1000) always hit io_setup EAGAIN error, due to the nr_events exceeds the limit of available events. So reduce it from 128 to 64, to make more fsstress processes can do AIO test. Signed-off-by: Zorro Lang --- ltp/fsstress.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ltp/fsstress.c b/ltp/fsstress.c index 388ace50..a11206d4 100644 --- a/ltp/fsstress.c +++ b/ltp/fsstress.c @@ -28,6 +28,7 @@ #endif #ifdef AIO #include +#define AIO_ENTRIES 64 io_context_t io_ctx; #endif #ifdef URING @@ -699,8 +700,8 @@ int main(int argc, char **argv) } procid = i; #ifdef AIO - if (io_setup(128, &io_ctx) != 0) { - fprintf(stderr, "io_setup failed"); + if (io_setup(AIO_ENTRIES, &io_ctx) != 0) { + fprintf(stderr, "io_setup failed\n"); exit(1); } #endif @@ -714,7 +715,7 @@ int main(int argc, char **argv) doproc(); #ifdef AIO if(io_destroy(io_ctx) != 0) { - fprintf(stderr, "io_destroy failed"); + fprintf(stderr, "io_destroy failed\n"); return 1; } #endif From patchwork Tue Jul 28 18:23:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zorro Lang X-Patchwork-Id: 11689643 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 59B8F138C for ; Tue, 28 Jul 2020 18:24:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 41E1020829 for ; Tue, 28 Jul 2020 18:24:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="E1BaYpe7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732302AbgG1SYB (ORCPT ); Tue, 28 Jul 2020 14:24:01 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:53763 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732330AbgG1SYA (ORCPT ); Tue, 28 Jul 2020 14:24:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595960639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BvLLniNma7qFXHVXKr+V0FVyWHhRwlayjCU6NK0NUYE=; b=E1BaYpe7mh1ugv+opRAgV7OGyqZDp5hQ2DHppcNSKX1nW/k6Oe+mWFhhx7mqJdUgdbug9/ fgnWNQg5FpupIPB05jYjpoOmH0DyYI01fkpu+HGVySDqQd6PaCYgirLPD96qdCMpjRSKDf 67oqGqkfH6OtsP0w9vzwaOe7cFFyhUY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-14-lOKCOXTaOaqf6U_dPFiXHg-1; Tue, 28 Jul 2020 14:23:55 -0400 X-MC-Unique: lOKCOXTaOaqf6U_dPFiXHg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B75028017FB; Tue, 28 Jul 2020 18:23:54 +0000 (UTC) Received: from bogon.redhat.com (ovpn-12-108.pek2.redhat.com [10.72.12.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id 33BAA5DA33; Tue, 28 Jul 2020 18:23:52 +0000 (UTC) From: Zorro Lang To: fstests@vger.kernel.org Cc: io-uring@vger.kernel.org, jmoyer@redhat.com Subject: [PATCH 3/4] fsstress: fix memory leak in do_aio_rw Date: Wed, 29 Jul 2020 02:23:19 +0800 Message-Id: <20200728182320.8762-4-zlang@redhat.com> In-Reply-To: <20200728182320.8762-1-zlang@redhat.com> References: <20200728182320.8762-1-zlang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org If io_submit or io_getevents fails, the do_aio_rw() won't free the "buf" and cause memory leak. Signed-off-by: Zorro Lang --- ltp/fsstress.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/ltp/fsstress.c b/ltp/fsstress.c index a11206d4..410a2437 100644 --- a/ltp/fsstress.c +++ b/ltp/fsstress.c @@ -2099,8 +2099,7 @@ do_aio_rw(int opno, long r, int flags) 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; + goto aio_out3; } fd = open_path(&f, flags|O_DIRECT); e = fd < 0 ? errno : 0; @@ -2109,16 +2108,13 @@ do_aio_rw(int opno, long r, int flags) if (v) printf("%d/%d: do_aio_rw - open %s failed %d\n", procid, opno, f.path, e); - free_pathname(&f); - return; + goto aio_out3; } 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; + goto aio_out2; } inode_info(st, sizeof(st), &stb, v); if (!iswrite && stb.st_size == 0) { @@ -2150,6 +2146,12 @@ do_aio_rw(int opno, long r, int flags) else if (len > diob.d_maxiosz) len = diob.d_maxiosz; buf = memalign(diob.d_mem, len); + if (!buf) { + if (v) + printf("%d/%d: do_aio_rw - memalign failed\n", + procid, opno); + goto aio_out2; + } if (iswrite) { off = (off64_t)(lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE)); @@ -2166,27 +2168,26 @@ do_aio_rw(int opno, long r, int flags) if (v) printf("%d/%d: %s - io_submit failed %d\n", procid, opno, iswrite ? "awrite" : "aread", e); - free_pathname(&f); - close(fd); - return; + goto aio_out1; } 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; + goto aio_out1; } 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); + aio_out1: + free(buf); + aio_out2: close(fd); + aio_out3: + free_pathname(&f); } #endif From patchwork Tue Jul 28 18:23:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zorro Lang X-Patchwork-Id: 11689645 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A8417722 for ; Tue, 28 Jul 2020 18:24:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 894F020829 for ; Tue, 28 Jul 2020 18:24:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="U18+WEj5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732335AbgG1SYG (ORCPT ); Tue, 28 Jul 2020 14:24:06 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:46559 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1732334AbgG1SYG (ORCPT ); Tue, 28 Jul 2020 14:24:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595960644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aVoD3y4kOCshIo8lcBU/KTt1LmlEMfo8MFxOod4Zloc=; b=U18+WEj5ijkce1F7SJEweFOI4781euP2bvelFnI3ovfd56P2CA8RKTYIEMH0gI++Uhj00w q+p+bss5NtiL1CywUtAhD0qphhIFP4nyRCp7oInEvLuGoNtl6JcT98y2+OpLyYxDRLQhU8 Tik7DUrxWihS2i5ui9dk+hBnp8io1Pc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-428-M01RfwhPMgK455d95Y6nyQ-1; Tue, 28 Jul 2020 14:24:02 -0400 X-MC-Unique: M01RfwhPMgK455d95Y6nyQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D9A78E91A; Tue, 28 Jul 2020 18:24:00 +0000 (UTC) Received: from bogon.redhat.com (ovpn-12-108.pek2.redhat.com [10.72.12.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id 54DCA5D993; Tue, 28 Jul 2020 18:23:59 +0000 (UTC) From: Zorro Lang To: fstests@vger.kernel.org Cc: io-uring@vger.kernel.org, jmoyer@redhat.com Subject: [PATCH 4/4] fsx: add IO_URING test Date: Wed, 29 Jul 2020 02:23:20 +0800 Message-Id: <20200728182320.8762-5-zlang@redhat.com> In-Reply-To: <20200728182320.8762-1-zlang@redhat.com> References: <20200728182320.8762-1-zlang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org New IO_URING test for fsx, use -U option to enable IO_URING test. Signed-off-by: Zorro Lang --- ltp/fsx.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 140 insertions(+), 14 deletions(-) diff --git a/ltp/fsx.c b/ltp/fsx.c index 7c76655a..1b7401a2 100644 --- a/ltp/fsx.c +++ b/ltp/fsx.c @@ -34,6 +34,9 @@ #ifdef AIO #include #endif +#ifdef URING +#include +#endif #include #ifndef MAP_FILE @@ -176,21 +179,17 @@ int integrity = 0; /* -i flag */ int fsxgoodfd = 0; int o_direct; /* -Z */ int aio = 0; +int uring = 0; int mark_nr = 0; int page_size; int page_mask; int mmap_mask; -#ifdef AIO -int aio_rw(int rw, int fd, char *buf, unsigned len, unsigned offset); +int fsx_rw(int rw, int fd, char *buf, unsigned len, unsigned offset); #define READ 0 #define WRITE 1 -#define fsxread(a,b,c,d) aio_rw(READ, a,b,c,d) -#define fsxwrite(a,b,c,d) aio_rw(WRITE, a,b,c,d) -#else -#define fsxread(a,b,c,d) read(a,b,c) -#define fsxwrite(a,b,c,d) write(a,b,c) -#endif +#define fsxread(a,b,c,d) fsx_rw(READ, a,b,c,d) +#define fsxwrite(a,b,c,d) fsx_rw(WRITE, a,b,c,d) const char *replayops = NULL; const char *recordops = NULL; @@ -2242,7 +2241,7 @@ void usage(void) { fprintf(stdout, "usage: %s", - "fsx [-dknqxABEFJLOWZ] [-b opnum] [-c Prob] [-g filldata] [-i logdev] [-j logid] [-l flen] [-m start:end] [-o oplen] [-p progressinterval] [-r readbdy] [-s style] [-t truncbdy] [-w writebdy] [-D startingop] [-N numops] [-P dirpath] [-S seed] fname\n\ + "fsx [-dknqxBEFJLOWZ][-A|-U] [-b opnum] [-c Prob] [-g filldata] [-i logdev] [-j logid] [-l flen] [-m start:end] [-o oplen] [-p progressinterval] [-r readbdy] [-s style] [-t truncbdy] [-w writebdy] [-D startingop] [-N numops] [-P dirpath] [-S seed] fname\n\ -b opnum: beginning operation number (default 1)\n\ -c P: 1 in P chance of file close+open at each op (default infinity)\n\ -d: debug output for all operations\n\ @@ -2265,7 +2264,10 @@ usage(void) -y synchronize changes to a file\n" #ifdef AIO -" -A: Use the AIO system calls\n" +" -A: Use the AIO system calls, -A excludes -U\n" +#endif +#ifdef URING +" -U: Use the IO_URING system calls, -U excludes -A\n" #endif " -D startingop: debug output starting at specified operation\n" #ifdef HAVE_LINUX_FALLOC_H @@ -2425,13 +2427,127 @@ out_error: errno = -ret; return -1; } +#endif + +#ifdef URING +struct io_uring ring; +#define URING_ENTRIES 1024 +int +uring_setup() +{ + int ret; + + ret = io_uring_queue_init(URING_ENTRIES, &ring, 0); + if (ret != 0) { + fprintf(stderr, "uring_setup: io_uring_queue_init failed: %s\n", + strerror(ret)); + return -1; + } + return 0; +} -int aio_rw(int rw, int fd, char *buf, unsigned len, unsigned offset) +int +__uring_rw(int rw, int fd, char *buf, unsigned len, unsigned offset) { + struct io_uring_sqe *sqe; + struct io_uring_cqe *cqe; int ret; + int res, res2 = 0; + char *p = buf; + unsigned l = len; + unsigned o = offset; + + /* + * Due to io_uring tries non-blocking IOs (especially read), that + * always cause 'normal' short reading. To avoid this short read + * fail, try to loop read/write (escpecilly read) data. + */ + uring_loop: + sqe = io_uring_get_sqe(&ring); + if (!sqe) { + fprintf(stderr, "uring_rw: io_uring_get_sqe failed: %s\n", + strerror(errno)); + return -1; + } + + if (rw == READ) { + io_uring_prep_read(sqe, fd, p, l, o); + } else { + io_uring_prep_write(sqe, fd, p, l, o); + } + + ret = io_uring_submit(&ring); + if (ret != 1) { + fprintf(stderr, "errcode=%d\n", -ret); + fprintf(stderr, "uring %s: io_uring_submit failed: %s\n", + rw == READ ? "read":"write", strerror(-ret)); + goto uring_error; + } + + ret = io_uring_wait_cqe(&ring, &cqe); + if (ret < 0) { + if (ret == 0) + fprintf(stderr, "uring %s: no events available\n", + rw == READ ? "read":"write"); + else { + fprintf(stderr, "errcode=%d\n", -ret); + fprintf(stderr, "uring %s: io_uring_wait_cqe failed: %s\n", + rw == READ ? "read":"write", strerror(-ret)); + } + goto uring_error; + } + res = cqe->res; + io_uring_cqe_seen(&ring, cqe); + + res2 += res; + if (len != res2) { + if (res > 0) { + o += res; + l -= res; + p += res; + if (l > 0) + goto uring_loop; + } else if (res < 0) { + ret = res; + fprintf(stderr, "errcode=%d\n", -ret); + fprintf(stderr, "uring %s: io_uring failed: %s\n", + rw == READ ? "read":"write", strerror(-ret)); + goto uring_error; + } else { + fprintf(stderr, "uring %s bad io length: %d instead of %u\n", + rw == READ ? "read":"write", res2, len); + } + } + return res2; + + uring_error: + /* + * The caller expects error return in traditional libc + * convention, i.e. -1 and the errno set to error. + */ + errno = -ret; + return -1; +} +#endif + +int fsx_rw(int rw, int fd, char *buf, unsigned len, unsigned offset) +{ + int ret = -1; if (aio) { +#ifdef AIO ret = __aio_rw(rw, fd, buf, len, offset); +#elif + fprintf(stderr, "io_rw: need AIO support!\n"); + exit(111); +#endif + } else if (uring) { +#ifdef URING + ret = __uring_rw(rw, fd, buf, len, offset); +#elif + fprintf(stderr, "io_rw: need IO_URING support!\n"); + exit(111); +#endif } else { if (rw == READ) ret = read(fd, buf, len); @@ -2441,8 +2557,6 @@ int aio_rw(int rw, int fd, char *buf, unsigned len, unsigned offset) return ret; } -#endif - #define test_fallocate(mode) __test_fallocate(mode, #mode) int @@ -2496,7 +2610,7 @@ main(int argc, char **argv) setvbuf(stdout, (char *)0, _IOLBF, 0); /* line buffered stdout */ while ((ch = getopt_long(argc, argv, - "b:c:dfg:i:j:kl:m:no:p:qr:s:t:w:xyABD:EFJKHzCILN:OP:RS:WXZ", + "b:c:dfg:i:j:kl:m:no:p:qr:s:t:w:xyABD:EFJKHzCILN:OP:RS:UWXZ", longopts, NULL)) != EOF) switch (ch) { case 'b': @@ -2604,6 +2718,9 @@ main(int argc, char **argv) case 'A': aio = 1; break; + case 'U': + uring = 1; + break; case 'D': debugstart = getnum(optarg, &endp); if (debugstart < 1) @@ -2694,6 +2811,11 @@ main(int argc, char **argv) if (argc != 1) usage(); + if (aio && uring) { + fprintf(stderr, "-A and -U shouldn't be used together\n"); + usage(); + } + if (integrity && !dirpath) { fprintf(stderr, "option -i requires -P \n"); usage(); @@ -2784,6 +2906,10 @@ main(int argc, char **argv) if (aio) aio_setup(); #endif +#ifdef URING + if (uring) + uring_setup(); +#endif if (!(o_flags & O_TRUNC)) { off_t ret;