Replace task io account helpers with wrappers that may also collect
per-mount stats.
Currently, just for example, stats are collected for mounts of
filesystems with flag FS_USERNS_MOUNT.
Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxx>
---
I used the arbirtaty flag FS_USERNS_MOUNT as an example for a way for
filesystem to opt-in to mount io stats, but it could be either an FS_
SB_ or MNT_ flag. I do not anticipate shortage of opinions on this
matter.
As for performance, the io accounting hooks are the existing hooks for
task io accounting. mount io stats add a dereference to mnt_pcp for
the filesystems that opt-in and one per-cpu var update. The dereference
to mnt_sb->s_type->fs_flags is temporary as we will probably want to
use an MNT_ flag, whether kernel internal or user controlled.
Thanks,
Amir.
fs/mount.h | 21 ++++++++++++
fs/read_write.c | 87 +++++++++++++++++++++++++++++++++++--------------
2 files changed, 84 insertions(+), 24 deletions(-)
diff --git a/fs/mount.h b/fs/mount.h
index 2bf0df64ded5..81db83c36140 100644
--- a/fs/mount.h
+++ b/fs/mount.h
@@ -175,6 +175,27 @@ static inline bool is_anon_ns(struct mnt_namespace *ns)
extern void mnt_cursor_del(struct mnt_namespace *ns, struct mount *cursor);
+static inline bool mnt_has_stats(struct vfsmount *mnt)
+{
+#ifdef CONFIG_FS_MOUNT_STATS
+ /* Just for example. Should this be an FS_ SB_ or MNT_ flag? */
+ return (mnt->mnt_sb->s_type->fs_flags & FS_USERNS_MOUNT);
+#else
+ return false;
+#endif
+}
+
+static inline struct mount *file_mnt_has_stats(struct file *file)
+{
+#ifdef CONFIG_FS_MOUNT_STATS
+ struct vfsmount *mnt = file->f_path.mnt;
+
+ if (mnt_has_stats(mnt))
+ return real_mount(mnt);
+#endif
+ return NULL;
+}
+
static inline void mnt_iostats_counter_inc(struct mount *mnt, int id)
{
#ifdef CONFIG_FS_MOUNT_STATS
diff --git a/fs/read_write.c b/fs/read_write.c
index 75f764b43418..7e3e1ebfefb4 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -21,6 +21,7 @@
#include <linux/mount.h>
#include <linux/fs.h>
#include "internal.h"
+#include "mount.h"
#include <linux/uaccess.h>
#include <asm/unistd.h>
@@ -34,6 +35,44 @@ const struct file_operations generic_ro_fops = {
EXPORT_SYMBOL(generic_ro_fops);
+static void file_add_rchar(struct file *file, struct task_struct *tsk,
+ ssize_t amt)
+{
+ struct mount *m = file_mnt_has_stats(file);
+
+ if (m)
+ mnt_iostats_counter_add(m, MNTIOS_CHARS_RD, amt);
+ add_rchar(tsk, amt);
+}
+
+static void file_add_wchar(struct file *file, struct task_struct *tsk,
+ ssize_t amt)
+{
+ struct mount *m = file_mnt_has_stats(file);
+
+ if (m)
+ mnt_iostats_counter_add(m, MNTIOS_CHARS_WR, amt);
+ add_wchar(tsk, amt);
+}
+
+static void file_inc_syscr(struct file *file, struct task_struct *tsk)
+{
+ struct mount *m = file_mnt_has_stats(file);
+
+ if (m)
+ mnt_iostats_counter_inc(m, MNTIOS_SYSCALLS_RD);
+ inc_syscr(current);
+}
+
+static void file_inc_syscw(struct file *file, struct task_struct *tsk)
+{
+ struct mount *m = file_mnt_has_stats(file);
+
+ if (m)
+ mnt_iostats_counter_inc(m, MNTIOS_SYSCALLS_WR);
+ inc_syscw(current);
+}
+
static inline bool unsigned_offsets(struct file *file)
{
return file->f_mode & FMODE_UNSIGNED_OFFSET;
@@ -456,9 +495,9 @@ ssize_t __kernel_read(struct file *file, void *buf, size_t count, loff_t *pos)
if (pos)
*pos = kiocb.ki_pos;
fsnotify_access(file);
- add_rchar(current, ret);
+ file_add_rchar(file, current, ret);
}
- inc_syscr(current);
+ file_inc_syscr(file, current);
return ret;
}
@@ -498,9 +537,9 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
ret = -EINVAL;
if (ret > 0) {
fsnotify_access(file);
- add_rchar(current, ret);
+ file_add_rchar(file, current, ret);
}
- inc_syscr(current);
+ file_inc_syscr(file, current);
return ret;
}
@@ -552,9 +591,9 @@ ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t
if (pos)
*pos = kiocb.ki_pos;
fsnotify_modify(file);
- add_wchar(current, ret);
+ file_add_wchar(file, current, ret);
}
- inc_syscw(current);
+ file_inc_syscw(file, current);
return ret;
}
/*
@@ -607,9 +646,9 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
ret = -EINVAL;
if (ret > 0) {
fsnotify_modify(file);
- add_wchar(current, ret);
+ file_add_wchar(file, current, ret);
}
- inc_syscw(current);
+ file_inc_syscw(file, current);
file_end_write(file);
return ret;
}
@@ -962,8 +1001,8 @@ static ssize_t do_readv(unsigned long fd, const struct iovec __user *vec,
}
if (ret > 0)
- add_rchar(current, ret);
- inc_syscr(current);
+ file_add_rchar(f.file, current, ret);
+ file_inc_syscr(f.file, current);
return ret;
}
@@ -986,8 +1025,8 @@ static ssize_t do_writev(unsigned long fd, const struct iovec __user *vec,
}
if (ret > 0)
- add_wchar(current, ret);
- inc_syscw(current);
+ file_add_wchar(f.file, current, ret);
+ file_inc_syscw(f.file, current);
return ret;
}
@@ -1015,8 +1054,8 @@ static ssize_t do_preadv(unsigned long fd, const struct iovec __user *vec,
}
if (ret > 0)
- add_rchar(current, ret);
- inc_syscr(current);
+ file_add_rchar(f.file, current, ret);
+ file_inc_syscr(f.file, current);
return ret;
}
@@ -1038,8 +1077,8 @@ static ssize_t do_pwritev(unsigned long fd, const struct iovec __user *vec,
}
if (ret > 0)
- add_wchar(current, ret);
- inc_syscw(current);
+ file_add_wchar(f.file, current, ret);
+ file_inc_syscw(f.file, current);
return ret;
}
@@ -1258,8 +1297,8 @@ static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos,
file_end_write(out.file);
if (retval > 0) {
- add_rchar(current, retval);
- add_wchar(current, retval);
+ file_add_rchar(in.file, current, retval);
+ file_add_wchar(out.file, current, retval);
fsnotify_access(in.file);
fsnotify_modify(out.file);
out.file->f_pos = out_pos;
@@ -1269,8 +1308,8 @@ static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos,
in.file->f_pos = pos;
}
- inc_syscr(current);
- inc_syscw(current);
+ file_inc_syscr(in.file, current);
+ file_inc_syscw(out.file, current);
if (pos > max)
retval = -EOVERFLOW;
@@ -1519,13 +1558,13 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in,
done:
if (ret > 0) {
fsnotify_access(file_in);
- add_rchar(current, ret);
+ file_add_rchar(file_in, current, ret);
fsnotify_modify(file_out);
- add_wchar(current, ret);
+ file_add_wchar(file_out, current, ret);
}
- inc_syscr(current);
- inc_syscw(current);
+ file_inc_syscr(file_in, current);
+ file_inc_syscw(file_out, current);
file_end_write(file_out);
--
2.25.1
