From: Jan Kara <jack@suse.cz>
To: linux-fsdevel@vger.kernel.org
Cc: linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org,
Christoph Hellwig <hch@infradead.org>,
Dan Williams <dan.j.williams@intel.com>,
Ross Zwisler <ross.zwisler@linux.intel.com>,
Ted Tso <tytso@mit.edu>,
"Darrick J. Wong" <darrick.wong@oracle.com>,
Jan Kara <jack@suse.cz>
Subject: [PATCH 19/19] xfs: Add support for MAP_SYNC flag
Date: Wed, 11 Oct 2017 22:06:03 +0200 [thread overview]
Message-ID: <20171011200603.27442-20-jack@suse.cz> (raw)
In-Reply-To: <20171011200603.27442-1-jack@suse.cz>
Now when everything is prepared, add support in xfs to accept MAP_SYNC
as an mmap(2) flag.
Signed-off-by: Jan Kara <jack@suse.cz>
---
fs/ext4/file.c | 1 +
fs/xfs/xfs_file.c | 23 +++++++++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index f013cda84b3d..6b597cc6b29d 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -26,6 +26,7 @@
#include <linux/quotaops.h>
#include <linux/pagevec.h>
#include <linux/uio.h>
+#include <linux/mman.h>
#include "ext4.h"
#include "ext4_jbd2.h"
#include "xattr.h"
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index c45f24ffab22..fb135224476d 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -44,6 +44,7 @@
#include <linux/falloc.h>
#include <linux/pagevec.h>
#include <linux/backing-dev.h>
+#include <linux/mman.h>
static const struct vm_operations_struct xfs_file_vm_ops;
@@ -1142,6 +1143,27 @@ xfs_file_mmap(
return 0;
}
+#define XFS_MAP_SUPPORTED (LEGACY_MAP_MASK | MAP_SYNC)
+
+static int
+xfs_file_mmap_validate(
+ struct file *filp,
+ struct vm_area_struct *vma,
+ unsigned long map_flags)
+{
+ if (map_flags & ~XFS_MAP_SUPPORTED)
+ return -EOPNOTSUPP;
+
+ /*
+ * We don't support synchronous mappings for non-DAX files. At least
+ * until someone comes with a sensible use case.
+ */
+ if (!IS_DAX(file_inode(filp)) && (map_flags & MAP_SYNC))
+ return -EOPNOTSUPP;
+
+ return xfs_file_mmap(filp, vma);
+}
+
const struct file_operations xfs_file_operations = {
.llseek = xfs_file_llseek,
.read_iter = xfs_file_read_iter,
@@ -1153,6 +1175,7 @@ const struct file_operations xfs_file_operations = {
.compat_ioctl = xfs_file_compat_ioctl,
#endif
.mmap = xfs_file_mmap,
+ .mmap_validate = xfs_file_mmap_validate,
.open = xfs_file_open,
.release = xfs_file_release,
.fsync = xfs_file_fsync,
--
2.12.3
next prev parent reply other threads:[~2017-10-11 20:06 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-11 20:05 [PATCH 0/19 v3] dax, ext4, xfs: Synchronous page faults Jan Kara
2017-10-11 20:05 ` [PATCH 01/19] mm: introduce MAP_SHARED_VALIDATE, a mechanism to safely define new mmap flags Jan Kara
2017-10-13 7:12 ` Christoph Hellwig
2017-10-13 15:44 ` Dan Williams
2017-10-13 18:28 ` Dan Williams
2017-10-14 15:57 ` Williams, Dan J
2017-10-16 7:45 ` hch
2017-10-17 11:50 ` Jan Kara
2017-10-17 19:38 ` Dan Williams
2017-10-18 6:59 ` hch
2017-10-11 20:05 ` [PATCH 02/19] mm: Remove VM_FAULT_HWPOISON_LARGE_MASK Jan Kara
2017-10-11 20:05 ` [PATCH 03/19] dax: Simplify arguments of dax_insert_mapping() Jan Kara
2017-10-11 20:05 ` [PATCH 04/19] dax: Factor out getting of pfn out of iomap Jan Kara
2017-10-11 20:05 ` [PATCH 05/19] dax: Create local variable for VMA in dax_iomap_pte_fault() Jan Kara
2017-10-11 20:05 ` [PATCH 06/19] dax: Create local variable for vmf->flags & FAULT_FLAG_WRITE test Jan Kara
2017-10-11 20:05 ` [PATCH 07/19] dax: Inline dax_insert_mapping() into the callsite Jan Kara
2017-10-11 20:05 ` [PATCH 08/19] dax: Inline dax_pmd_insert_mapping() " Jan Kara
2017-10-11 20:05 ` [PATCH 09/19] dax: Fix comment describing dax_iomap_fault() Jan Kara
2017-10-11 20:05 ` [PATCH 10/19] dax: Allow dax_iomap_fault() to return pfn Jan Kara
2017-10-11 20:05 ` [PATCH 11/19] dax: Allow tuning whether dax_insert_mapping_entry() dirties entry Jan Kara
2017-10-13 7:12 ` Christoph Hellwig
2017-10-13 19:26 ` Ross Zwisler
2017-10-11 20:05 ` [PATCH 12/19] mm: Define MAP_SYNC and VM_SYNC flags Jan Kara
2017-10-13 7:12 ` Christoph Hellwig
2017-10-13 19:44 ` Ross Zwisler
2017-10-16 15:37 ` Jan Kara
2017-10-11 20:05 ` [PATCH 13/19] dax, iomap: Add support for synchronous faults Jan Kara
2017-10-13 7:14 ` Christoph Hellwig
2017-10-11 20:05 ` [PATCH 14/19] dax: Implement dax_finish_sync_fault() Jan Kara
2017-10-13 7:21 ` Christoph Hellwig
2017-10-16 15:43 ` Jan Kara
2017-10-13 20:06 ` Ross Zwisler
2017-10-11 20:05 ` [PATCH 15/19] ext4: Simplify error handling in ext4_dax_huge_fault() Jan Kara
2017-10-13 20:09 ` Ross Zwisler
2017-10-11 20:06 ` [PATCH 16/19] ext4: Support for synchronous DAX faults Jan Kara
2017-10-11 22:23 ` Dan Williams
2017-10-12 13:42 ` Jan Kara
2017-10-13 20:58 ` Ross Zwisler
2017-10-16 15:50 ` Jan Kara
2017-10-11 20:06 ` [PATCH 17/19] ext4: Add support for MAP_SYNC flag Jan Kara
2017-10-11 22:11 ` Dan Williams
2017-10-12 13:42 ` Jan Kara
2017-10-13 0:23 ` Dan Williams
2017-10-13 7:22 ` Christoph Hellwig
2017-10-13 15:52 ` Dan Williams
2017-10-17 11:30 ` Jan Kara
2017-10-13 7:21 ` Christoph Hellwig
2017-10-16 15:14 ` Jan Kara
2017-10-11 20:06 ` [PATCH 18/19] xfs: support for synchronous DAX faults Jan Kara
2017-10-11 20:06 ` Jan Kara [this message]
2017-10-11 22:54 ` [PATCH 19/19] xfs: Add support for MAP_SYNC flag Dan Williams
2017-10-11 23:02 ` Dan Williams
2017-10-13 7:28 ` Christoph Hellwig
2017-10-11 21:18 ` [PATCH 0/19 v3] dax, ext4, xfs: Synchronous page faults Dan Williams
2017-10-11 22:43 ` Dave Chinner
2017-10-12 1:18 ` Dan Williams
2017-10-13 22:53 ` Ross Zwisler
2017-10-16 15:12 ` Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171011200603.27442-20-jack@suse.cz \
--to=jack@suse.cz \
--cc=dan.j.williams@intel.com \
--cc=darrick.wong@oracle.com \
--cc=hch@infradead.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=ross.zwisler@linux.intel.com \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).