From patchwork Fri Mar 17 12:46:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zorro Lang X-Patchwork-Id: 9630699 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 B1A2D602D6 for ; Fri, 17 Mar 2017 12:54:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A1BD82857D for ; Fri, 17 Mar 2017 12:54:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 95451285E3; Fri, 17 Mar 2017 12:54:38 +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 3304B2857D for ; Fri, 17 Mar 2017 12:54:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751226AbdCQMyi (ORCPT ); Fri, 17 Mar 2017 08:54:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34376 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751209AbdCQMyh (ORCPT ); Fri, 17 Mar 2017 08:54:37 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4F60AC05B1E3 for ; Fri, 17 Mar 2017 12:46:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 4F60AC05B1E3 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=zlang@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 4F60AC05B1E3 Received: from localhost.localdomain.com (ovpn-8-67.pek2.redhat.com [10.72.8.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A34A627DD for ; Fri, 17 Mar 2017 12:46:08 +0000 (UTC) From: Zorro Lang To: fstests@vger.kernel.org Subject: [PATCH v2] fsstress: add mmap/munmap into test operation list Date: Fri, 17 Mar 2017 20:46:01 +0800 Message-Id: <1489754761-19414-1-git-send-email-zlang@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 17 Mar 2017 12:46:09 +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 mmap as a popular and basic operation, most of softwares use it to access files. More and more customers report bugs related with mmap/munmap and other stress conditions. So add mmap test into fsstress to reproduce or find more bugs easily. Signed-off-by: Zorro Lang --- Hi, Sorry, I made a mistake. The V1 is part of the whole patch. So send V2 now. Please review this patch, V1 can't be patched. Thanks, Zorro ltp/fsstress.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/global.h | 4 +++ 2 files changed, 90 insertions(+) diff --git a/ltp/fsstress.c b/ltp/fsstress.c index 7e7cf60..5914551 100644 --- a/ltp/fsstress.c +++ b/ltp/fsstress.c @@ -67,6 +67,7 @@ typedef enum { OP_GETATTR, OP_GETDENTS, OP_LINK, + OP_MMAP, OP_MKDIR, OP_MKNOD, OP_PUNCH, @@ -166,6 +167,7 @@ void fsync_f(int, long); void getattr_f(int, long); void getdents_f(int, long); void link_f(int, long); +void mmap_f(int, long); void mkdir_f(int, long); void mknod_f(int, long); void punch_f(int, long); @@ -206,6 +208,7 @@ opdesc_t ops[] = { { OP_GETATTR, "getattr", getattr_f, 1, 0 }, { OP_GETDENTS, "getdents", getdents_f, 1, 0 }, { OP_LINK, "link", link_f, 1, 1 }, + { OP_MMAP, "mmap", mmap_f, 2, 1 }, { OP_MKDIR, "mkdir", mkdir_f, 2, 1 }, { OP_MKNOD, "mknod", mknod_f, 2, 1 }, { OP_PUNCH, "punch", punch_f, 1, 1 }, @@ -2580,6 +2583,89 @@ link_f(int opno, long r) } void +mmap_f(int opno, long r) +{ + char *addr; + int e; + pathname_t f; + int fd; + size_t len; + __int64_t lr; + off64_t off; + int flags; + struct stat64 stb; + int v; + char st[1024]; + + init_pathname(&f); + if (!get_fname(FT_REGFILE, r, &f, NULL, NULL, &v)) { + if (v) + printf("%d/%d: mmap - no filename\n", procid, opno); + free_pathname(&f); + return; + } + fd = open_path(&f, O_RDWR); + e = fd < 0 ? errno : 0; + check_cwd(); + if (fd < 0) { + if (v) + printf("%d/%d: mmap - open %s failed %d\n", + procid, opno, f.path, e); + free_pathname(&f); + return; + } + if (fstat64(fd, &stb) < 0) { + if (v) + printf("%d/%d: write - fstat64 %s failed %d\n", + procid, opno, f.path, errno); + free_pathname(&f); + close(fd); + return; + } + inode_info(st, sizeof(st), &stb, v); + lr = ((__int64_t)random() << 32) + random(); + off = (off64_t)(lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE)); + off %= maxfsize; + off &= (off64_t)(~(sysconf(_SC_PAGE_SIZE) - 1)); + len = (size_t)(random() % MIN(maxfsize - off, FILELEN_MAX)) + 1; + + /* + * truncate file to the size we need to map and access, + * keep away SIGBUS / SIGSEGV killing this process + */ + e = truncate64_path(&f, off + len) < 0 ? errno : 0; + /* try private file mappings with 20% rate */ + flags = (random() % 20) ? MAP_SHARED : MAP_PRIVATE; + do { + addr = mmap(NULL, len, PROT_READ | PROT_WRITE, flags, fd, off); + e = (addr == MAP_FAILED) ? errno : 0; + if (errno == ENOMEM && flags & MAP_PRIVATE) { + /* turn to shared mapping if memeory is not enough for private mapping */ + flags = MAP_SHARED; + } else if (errno == ENOMEM && len > sysconf(_SC_PAGE_SIZE)) { + /* reduce mapping length, if memeory is not enough for shared mapping */ + len /= 2; + } + } while (errno == ENOMEM && len > sysconf(_SC_PAGE_SIZE)); + if (v) + printf("%d/%d: mmap %s%s [%lld,%d,%s] %d\n", + procid, opno, f.path, st, (long long)off, (int)len, + (flags & MAP_PRIVATE) ? "MAP_PRIVATE" : "MAP_SHARED", e); + + if (addr != MAP_FAILED) { + memset(addr, nameseq & 0xff, len); + e = munmap(addr, len) < 0 ? errno : 0; + if (v) + printf("%d/%d: munmap %s%s [%lld,%d] %d\n", + procid, opno, f.path, st, (long long)off, + (int)len, e); + } + + free_pathname(&f); + close(fd); +} + +void mkdir_f(int opno, long r) { int e; diff --git a/src/global.h b/src/global.h index f63246b..51d1e94 100644 --- a/src/global.h +++ b/src/global.h @@ -178,4 +178,8 @@ #endif /* HAVE_LINUX_FALLOC_H */ +#ifndef HAVE_SYS_MMAN_H +#include +#endif + #endif /* GLOBAL_H */