From patchwork Fri Nov 17 20:25:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Zwisler X-Patchwork-Id: 10063703 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 5E18F601D3 for ; Fri, 17 Nov 2017 20:28:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E8112A188 for ; Fri, 17 Nov 2017 20:28:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 434B62A1B6; Fri, 17 Nov 2017 20:28:28 +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=unavailable 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 777DE2A188 for ; Fri, 17 Nov 2017 20:28:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161851AbdKQU0p (ORCPT ); Fri, 17 Nov 2017 15:26:45 -0500 Received: from mga03.intel.com ([134.134.136.65]:55943 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760996AbdKQUZi (ORCPT ); Fri, 17 Nov 2017 15:25:38 -0500 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Nov 2017 12:25:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,411,1505804400"; d="scan'208";a="3902664" Received: from theros.lm.intel.com ([10.232.112.77]) by fmsmga001.fm.intel.com with ESMTP; 17 Nov 2017 12:25:36 -0800 From: Ross Zwisler To: linux-xfs Cc: Ross Zwisler , linux-nvdimm , fstests , Jan Kara , Dave Chinner , Dan Williams Subject: [xfsprogs PATCH 1/2] xfs_io: add MAP_SYNC support to mmap() Date: Fri, 17 Nov 2017 13:25:23 -0700 Message-Id: <20171117202524.24696-2-ross.zwisler@linux.intel.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171117202524.24696-1-ross.zwisler@linux.intel.com> References: <20171117202524.24696-1-ross.zwisler@linux.intel.com> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add support for a new -S flag to xfs_io's mmap command. This opens the mapping with the (MAP_SYNC | MAP_SHARED_VALIDATE) flags instead of the standard MAP_SHARED flag. Signed-off-by: Ross Zwisler Suggested-by: Dave Chinner --- configure.ac | 1 + include/builddefs.in | 1 + include/linux.h | 5 +++++ io/io.h | 1 + io/mmap.c | 19 ++++++++++++++----- m4/package_libcdev.m4 | 16 ++++++++++++++++ man/man8/xfs_io.8 | 6 +++++- 7 files changed, 43 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index cb23fb8..7153c9f 100644 --- a/configure.ac +++ b/configure.ac @@ -162,6 +162,7 @@ AC_HAVE_FSETXATTR AC_HAVE_MREMAP AC_NEED_INTERNAL_FSXATTR AC_HAVE_GETFSMAP +AC_HAVE_MAP_SYNC if test "$enable_blkid" = yes; then AC_HAVE_BLKID_TOPO diff --git a/include/builddefs.in b/include/builddefs.in index 1d454b6..78b71fe 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -114,6 +114,7 @@ HAVE_FSETXATTR = @have_fsetxattr@ HAVE_MREMAP = @have_mremap@ NEED_INTERNAL_FSXATTR = @need_internal_fsxattr@ HAVE_GETFSMAP = @have_getfsmap@ +HAVE_MAP_SYNC = @have_map_sync@ GCCFLAGS = -funsigned-char -fno-strict-aliasing -Wall # -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-decl diff --git a/include/linux.h b/include/linux.h index 6ce344c..4ee03ed 100644 --- a/include/linux.h +++ b/include/linux.h @@ -327,4 +327,9 @@ fsmap_advance( #define HAVE_GETFSMAP #endif /* HAVE_GETFSMAP */ +#ifndef HAVE_MAP_SYNC +#define MAP_SYNC 0x80000 +#define MAP_SHARED_VALIDATE 0x3 +#endif /* HAVE_MAP_SYNC */ + #endif /* __XFS_LINUX_H__ */ diff --git a/io/io.h b/io/io.h index 3862985..8b2753b 100644 --- a/io/io.h +++ b/io/io.h @@ -65,6 +65,7 @@ typedef struct mmap_region { size_t length; /* length of mapping */ off64_t offset; /* start offset into backing file */ int prot; /* protection mode of the mapping */ + bool map_sync; /* is this a MAP_SYNC mapping? */ char *name; /* name of backing file */ } mmap_region_t; diff --git a/io/mmap.c b/io/mmap.c index 7a8150e..520b037 100644 --- a/io/mmap.c +++ b/io/mmap.c @@ -42,7 +42,7 @@ print_mapping( int index, int braces) { - unsigned char buffer[8] = { 0 }; + char buffer[8] = { 0 }; int i; static struct { @@ -57,6 +57,10 @@ print_mapping( for (i = 0, p = pflags; p->prot != PROT_NONE; i++, p++) buffer[i] = (map->prot & p->prot) ? p->mode : '-'; + + if (map->map_sync) + sprintf(&buffer[i], " S"); + printf("%c%03d%c 0x%lx - 0x%lx %s %14s (%lld : %ld)\n", braces? '[' : ' ', index, braces? ']' : ' ', (unsigned long)map->addr, @@ -146,6 +150,7 @@ mmap_help(void) " -r -- map with PROT_READ protection\n" " -w -- map with PROT_WRITE protection\n" " -x -- map with PROT_EXEC protection\n" +" -S -- map with MAP_SHARED_VALIDATE and MAP_SYNC flags\n" " -s -- first do mmap(size)/munmap(size), try to reserve some free space\n" " If no protection mode is specified, all are used by default.\n" "\n")); @@ -161,7 +166,7 @@ mmap_f( void *address = NULL; char *filename; size_t blocksize, sectsize; - int c, prot = 0; + int c, prot = 0, flags = MAP_SHARED; if (argc == 1) { if (mapping) @@ -184,7 +189,7 @@ mmap_f( init_cvtnum(&blocksize, §size); - while ((c = getopt(argc, argv, "rwxs:")) != EOF) { + while ((c = getopt(argc, argv, "rwxSs:")) != EOF) { switch (c) { case 'r': prot |= PROT_READ; @@ -195,6 +200,9 @@ mmap_f( case 'x': prot |= PROT_EXEC; break; + case 'S': + flags = MAP_SHARED_VALIDATE | MAP_SYNC; + break; case 's': length2 = cvtnum(blocksize, sectsize, optarg); break; @@ -238,7 +246,7 @@ mmap_f( MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); munmap(address, length2); } - address = mmap(address, length, prot, MAP_SHARED, file->fd, offset); + address = mmap(address, length, prot, flags, file->fd, offset); if (address == MAP_FAILED) { perror("mmap"); free(filename); @@ -263,6 +271,7 @@ mmap_f( mapping->offset = offset; mapping->name = filename; mapping->prot = prot; + mapping->map_sync = (flags == (MAP_SHARED_VALIDATE | MAP_SYNC)); return 0; } @@ -676,7 +685,7 @@ mmap_init(void) mmap_cmd.argmax = -1; mmap_cmd.flags = CMD_NOMAP_OK | CMD_NOFILE_OK | CMD_FOREIGN_OK | CMD_FLAG_ONESHOT; - mmap_cmd.args = _("[N] | [-rwx] [-s size] [off len]"); + mmap_cmd.args = _("[N] | [-rwxS] [-s size] [off len]"); mmap_cmd.oneline = _("mmap a range in the current file, show mappings"); mmap_cmd.help = mmap_help; diff --git a/m4/package_libcdev.m4 b/m4/package_libcdev.m4 index fdf9d69..598f5df 100644 --- a/m4/package_libcdev.m4 +++ b/m4/package_libcdev.m4 @@ -314,3 +314,19 @@ AC_DEFUN([AC_HAVE_GETFSMAP], AC_MSG_RESULT(no)) AC_SUBST(have_getfsmap) ]) + +# +# Check if we have MAP_SYNC defines (Linux) +# +AC_DEFUN([AC_HAVE_MAP_SYNC], + [ AC_MSG_CHECKING([for MAP_SYNC]) + AC_TRY_COMPILE([ +#include +#include + ], [ + int flags = MAP_SHARED_VALIDATE | MAP_SYNC; + ], have_map_sync=yes + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no)) + AC_SUBST(have_map_sync) + ]) diff --git a/man/man8/xfs_io.8 b/man/man8/xfs_io.8 index 9bf1a47..1693f7f 100644 --- a/man/man8/xfs_io.8 +++ b/man/man8/xfs_io.8 @@ -764,7 +764,7 @@ Each (sec, nsec) pair constitutes a single timestamp value. .SH MEMORY MAPPED I/O COMMANDS .TP -.BI "mmap [ " N " | [[ \-rwx ] [\-s " size " ] " "offset length " ]] +.BI "mmap [ " N " | [[ \-rwxS ] [\-s " size " ] " "offset length " ]] With no arguments, .B mmap shows the current mappings. Specifying a single numeric argument @@ -780,6 +780,10 @@ PROT_WRITE .RB ( \-w ), and PROT_EXEC .RB ( \-x ). +The mapping will be created with the MAP_SHARED flag by default, or with the +Linux specific (MAP_SYNC | MAP_SHARED_VALIDATE) flags if +.B -S +is given. .BI \-s " size" is used to do a mmap(size) && munmap(size) operation at first, try to reserve some extendible free memory space, if