]> www.infradead.org Git - users/willy/pagecache.git/commitdiff
fsnotify: add pre-content hooks on mmap()
authorAmir Goldstein <amir73il@gmail.com>
Wed, 12 Mar 2025 07:38:47 +0000 (08:38 +0100)
committerJan Kara <jack@suse.cz>
Wed, 12 Mar 2025 16:57:32 +0000 (17:57 +0100)
Pre-content hooks in page faults introduces potential deadlock of HSM
handler in userspace with filesystem freezing.

The requirement with pre-content event is that for every accessed file
range an event covering at least this range will be generated at least
once before the file data is accesses.

In preparation to disabling pre-content event hooks on page faults,
add pre-content hooks at mmap() variants for the entire mmaped range,
so HSM can fill content when user requests to map a portion of the file.

Note that exec() variant also calls vm_mmap_pgoff() internally to map
code sections, so pre-content hooks are also generated in this case.

Link: https://lore.kernel.org/linux-fsdevel/7ehxrhbvehlrjwvrduoxsao5k3x4aw275patsb3krkwuq573yv@o2hskrfawbnc/
Suggested-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Link: https://patch.msgid.link/20250312073852.2123409-2-amir73il@gmail.com
include/linux/fsnotify.h
mm/util.c

index 6a33288bd6a1f394cfb9e7f477ea41da4b45565d..83d3ac97f8262c720e6d7c92233a527b22834fea 100644 (file)
@@ -170,6 +170,21 @@ static inline int fsnotify_file_area_perm(struct file *file, int perm_mask,
        return fsnotify_path(&file->f_path, FS_ACCESS_PERM);
 }
 
+/*
+ * fsnotify_mmap_perm - permission hook before mmap of file range
+ */
+static inline int fsnotify_mmap_perm(struct file *file, int prot,
+                                    const loff_t off, size_t len)
+{
+       /*
+        * mmap() generates only pre-content events.
+        */
+       if (!file || likely(!FMODE_FSNOTIFY_HSM(file->f_mode)))
+               return 0;
+
+       return fsnotify_pre_content(&file->f_path, &off, len);
+}
+
 /*
  * fsnotify_truncate_perm - permission hook before file truncate
  */
@@ -223,6 +238,12 @@ static inline int fsnotify_file_area_perm(struct file *file, int perm_mask,
        return 0;
 }
 
+static inline int fsnotify_mmap_perm(struct file *file, int prot,
+                                    const loff_t off, size_t len)
+{
+       return 0;
+}
+
 static inline int fsnotify_truncate_perm(const struct path *path, loff_t length)
 {
        return 0;
index b6b9684a1438875d06287d713383c8a0da7b2e60..8c965474d329f5bb72433ae33dcfa84267f88d9b 100644 (file)
--- a/mm/util.c
+++ b/mm/util.c
@@ -23,6 +23,7 @@
 #include <linux/processor.h>
 #include <linux/sizes.h>
 #include <linux/compat.h>
+#include <linux/fsnotify.h>
 
 #include <linux/uaccess.h>
 
@@ -569,6 +570,8 @@ unsigned long vm_mmap_pgoff(struct file *file, unsigned long addr,
        LIST_HEAD(uf);
 
        ret = security_mmap_file(file, prot, flag);
+       if (!ret)
+               ret = fsnotify_mmap_perm(file, prot, pgoff >> PAGE_SHIFT, len);
        if (!ret) {
                if (mmap_write_lock_killable(mm))
                        return -EINTR;