From: Amir Goldstein <amir73il@gmail.com>
To: Miklos Szeredi <miklos@szeredi.hu>
Cc: Al Viro <viro@zeniv.linux.org.uk>,
linux-unionfs@vger.kernel.org, containers@lists.linux.dev,
linux-fsdevel@vger.kernel.org
Subject: [PATCH v2 4/6] fs: report per-mount io stats
Date: Mon, 28 Feb 2022 13:39:08 +0200 [thread overview]
Message-ID: <20220228113910.1727819-5-amir73il@gmail.com> (raw)
In-Reply-To: <20220228113910.1727819-1-amir73il@gmail.com>
Show optional collected per-mount io stats in /proc/<pid>/mountstats
for filesystems that do not implement their own show_stats() method
and opted-in to generic per-mount stats with FS_MOUNT_STATS flag.
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
fs/mount.h | 1 +
fs/namespace.c | 2 ++
fs/proc_namespace.c | 13 +++++++++++++
3 files changed, 16 insertions(+)
diff --git a/fs/mount.h b/fs/mount.h
index f98bf4cd5b1a..2ab6308af78b 100644
--- a/fs/mount.h
+++ b/fs/mount.h
@@ -91,6 +91,7 @@ struct mount {
int mnt_id; /* mount identifier */
int mnt_group_id; /* peer group identifier */
int mnt_expiry_mark; /* true if marked for expiry */
+ time64_t mnt_time; /* time of mount */
struct hlist_head mnt_pins;
struct hlist_head mnt_stuck_children;
} __randomize_layout;
diff --git a/fs/namespace.c b/fs/namespace.c
index 3fb8f11a42a1..546f07ed44c5 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -220,6 +220,8 @@ static struct mount *alloc_vfsmnt(const char *name)
mnt->mnt_count = 1;
mnt->mnt_writers = 0;
#endif
+ /* For proc/<pid>/mountstats */
+ mnt->mnt_time = ktime_get_seconds();
INIT_HLIST_NODE(&mnt->mnt_hash);
INIT_LIST_HEAD(&mnt->mnt_child);
diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c
index 49650e54d2f8..d744fb8543f5 100644
--- a/fs/proc_namespace.c
+++ b/fs/proc_namespace.c
@@ -232,6 +232,19 @@ static int show_vfsstat(struct seq_file *m, struct vfsmount *mnt)
if (sb->s_op->show_stats) {
seq_putc(m, ' ');
err = sb->s_op->show_stats(m, mnt_path.dentry);
+ } else if (mnt_has_stats(mnt)) {
+ /* Similar to /proc/<pid>/io */
+ seq_printf(m, "\n"
+ "\ttimes: %lld %lld\n"
+ "\trchar: %lld\n"
+ "\twchar: %lld\n"
+ "\tsyscr: %lld\n"
+ "\tsyscw: %lld\n",
+ r->mnt_time, ktime_get_seconds(),
+ mnt_iostats_counter_read(r, MNTIOS_CHARS_RD),
+ mnt_iostats_counter_read(r, MNTIOS_CHARS_WR),
+ mnt_iostats_counter_read(r, MNTIOS_SYSCALLS_RD),
+ mnt_iostats_counter_read(r, MNTIOS_SYSCALLS_WR));
}
seq_putc(m, '\n');
--
2.25.1
next prev parent reply other threads:[~2022-02-28 11:39 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-28 11:39 [PATCH v2 0/6] Generic per-mount io stats Amir Goldstein
2022-02-28 11:39 ` [PATCH v2 1/6] fs: add iostats counters to struct mount Amir Goldstein
2022-02-28 11:39 ` [PATCH v2 2/6] fs: tidy up fs_flags definitions Amir Goldstein
2022-02-28 11:39 ` [PATCH v2 3/6] fs: collect per-mount io stats Amir Goldstein
2022-02-28 11:39 ` Amir Goldstein [this message]
2022-02-28 15:06 ` [PATCH v2 4/6] fs: report " Miklos Szeredi
2022-02-28 16:18 ` Amir Goldstein
2022-02-28 16:31 ` Miklos Szeredi
2022-02-28 17:06 ` Amir Goldstein
2022-02-28 21:11 ` Dave Chinner
2022-02-28 21:57 ` Amir Goldstein
2022-03-01 9:46 ` Dave Chinner
2022-03-01 10:56 ` Amir Goldstein
2022-02-28 11:39 ` [PATCH v2 5/6] ovl: opt-in for " Amir Goldstein
2022-02-28 11:39 ` [PATCH v2 6/6] fuse: " Amir Goldstein
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=20220228113910.1727819-5-amir73il@gmail.com \
--to=amir73il@gmail.com \
--cc=containers@lists.linux.dev \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=viro@zeniv.linux.org.uk \
/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).