From: David Howells <dhowells@redhat.com>
To: netdev@vger.kernel.org
Cc: David Howells <dhowells@redhat.com>,
Matthew Wilcox <willy@infradead.org>,
Dave Chinner <david@fromorbit.com>,
Matt Whitlock <kernel@mattwhitlock.name>,
Linus Torvalds <torvalds@linux-foundation.org>,
Jens Axboe <axboe@kernel.dk>,
linux-fsdevel@kvack.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>,
linux-fsdevel@vger.kernel.org
Subject: [RFC PATCH 4/4] splice: Record some statistics
Date: Thu, 29 Jun 2023 16:54:33 +0100 [thread overview]
Message-ID: <20230629155433.4170837-5-dhowells@redhat.com> (raw)
In-Reply-To: <20230629155433.4170837-1-dhowells@redhat.com>
Add a proc file to export some statistics for debugging purposes.
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Matthew Wilcox <willy@infradead.org>
cc: Dave Chinner <david@fromorbit.com>
cc: Christoph Hellwig <hch@lst.de>
cc: Jens Axboe <axboe@kernel.dk>
cc: linux-fsdevel@vger.kernel.org
---
fs/splice.c | 28 ++++++++++++++++++++++++++++
include/linux/splice.h | 3 +++
mm/filemap.c | 6 +++++-
3 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/fs/splice.c b/fs/splice.c
index 2b1f109a7d4f..831973ea6b3f 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -36,10 +36,15 @@
#include <linux/net.h>
#include <linux/socket.h>
#include <linux/sched/signal.h>
+#include <linux/proc_fs.h>
#include "../mm/internal.h"
#include "internal.h"
+atomic_t splice_stat_filemap_copied, splice_stat_filemap_moved;
+static atomic_t splice_stat_directly_copied;
+static atomic_t vmsplice_stat_copied, vmsplice_stat_stole;
+
/*
* Splice doesn't support FMODE_NOWAIT. Since pipes may set this flag to
* indicate they support non-blocking reads or writes, we must clear it
@@ -276,6 +281,7 @@ ssize_t copy_splice_read(struct file *in, loff_t *ppos,
remain -= chunk;
}
+ atomic_add(keep, &splice_stat_directly_copied);
kfree(bv);
return ret;
}
@@ -1299,6 +1305,7 @@ static int splice_try_to_steal_page(struct pipe_inode_info *pipe,
unmap_mapping_folio(folio);
if (remove_mapping(folio->mapping, folio)) {
folio_clear_mappedtodisk(folio);
+ atomic_inc(&vmsplice_stat_stole);
flags |= PIPE_BUF_FLAG_LRU;
goto add_to_pipe;
}
@@ -1316,6 +1323,7 @@ static int splice_try_to_steal_page(struct pipe_inode_info *pipe,
folio_put(folio);
folio = copy;
offset = 0;
+ atomic_inc(&vmsplice_stat_copied);
add_to_pipe:
page = folio_page(folio, offset / PAGE_SIZE);
@@ -1905,3 +1913,23 @@ SYSCALL_DEFINE4(tee, int, fdin, int, fdout, size_t, len, unsigned int, flags)
return error;
}
+
+static int splice_stats_show(struct seq_file *m, void *data)
+{
+ seq_printf(m, "filemap: copied=%u moved=%u\n",
+ atomic_read(&splice_stat_filemap_copied),
+ atomic_read(&splice_stat_filemap_moved));
+ seq_printf(m, "direct : copied=%u\n",
+ atomic_read(&splice_stat_directly_copied));
+ seq_printf(m, "vmsplice: copied=%u stole=%u\n",
+ atomic_read(&vmsplice_stat_copied),
+ atomic_read(&vmsplice_stat_stole));
+ return 0;
+}
+
+static int splice_stats_init(void)
+{
+ proc_create_single("fs/splice", S_IFREG | 0444, NULL, splice_stats_show);
+ return 0;
+}
+late_initcall(splice_stats_init);
diff --git a/include/linux/splice.h b/include/linux/splice.h
index 3c5abbd49ff2..4f04dc338010 100644
--- a/include/linux/splice.h
+++ b/include/linux/splice.h
@@ -98,4 +98,7 @@ extern int splice_grow_spd(const struct pipe_inode_info *, struct splice_pipe_de
extern void splice_shrink_spd(struct splice_pipe_desc *);
extern const struct pipe_buf_operations default_pipe_buf_ops;
+
+extern atomic_t splice_stat_filemap_copied, splice_stat_filemap_moved;
+
#endif
diff --git a/mm/filemap.c b/mm/filemap.c
index dd144b0dab69..38d38cc826fa 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2872,7 +2872,8 @@ ssize_t splice_folio_into_pipe(struct pipe_inode_info *pipe,
struct address_space *mapping;
struct folio *copy = NULL;
struct page *page;
- unsigned int flags = 0;
+ unsigned int flags = 0, count = 0;
+ atomic_t *stat = &splice_stat_filemap_copied;
ssize_t ret;
size_t spliced = 0, offset = offset_in_folio(folio, fpos);
@@ -2902,6 +2903,7 @@ ssize_t splice_folio_into_pipe(struct pipe_inode_info *pipe,
/* If we succeed in removing the mapping, set LRU flag and add it. */
if (remove_mapping(mapping, folio)) {
folio_unlock(folio);
+ stat = &splice_stat_filemap_moved;
flags = PIPE_BUF_FLAG_LRU;
goto add_to_pipe;
}
@@ -2940,8 +2942,10 @@ ssize_t splice_folio_into_pipe(struct pipe_inode_info *pipe,
page++;
spliced += part;
offset = 0;
+ count++;
}
+ atomic_add(count, stat);
if (copy)
folio_put(copy);
return spliced;
next prev parent reply other threads:[~2023-06-29 15:55 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-29 15:54 [RFC PATCH 0/4] splice: Fix corruption in data spliced to pipe David Howells
2023-06-29 15:54 ` [RFC PATCH 1/4] splice: Fix corruption of spliced data after splice() returns David Howells
2023-07-19 10:17 ` Miklos Szeredi
2023-07-19 17:59 ` Matt Whitlock
2023-07-19 19:35 ` Miklos Szeredi
2023-07-19 19:44 ` Matthew Wilcox
2023-07-19 19:56 ` Miklos Szeredi
2023-07-19 20:04 ` Matthew Wilcox
2023-07-19 20:16 ` Linus Torvalds
2023-07-19 21:02 ` Matt Whitlock
2023-07-19 23:20 ` Linus Torvalds
2023-07-19 23:41 ` Matt Whitlock
2023-07-20 0:00 ` Linus Torvalds
2023-07-19 23:48 ` Linus Torvalds
2023-07-24 9:44 ` David Howells
2023-07-24 13:55 ` Miklos Szeredi
2023-07-24 16:15 ` David Howells
2023-06-29 15:54 ` [RFC PATCH 2/4] splice: Make vmsplice() steal or copy David Howells
2023-06-30 13:44 ` Simon Horman
2023-06-30 15:29 ` David Howells
2023-06-30 17:32 ` Simon Horman
2023-06-29 15:54 ` [RFC PATCH 3/4] splice: Remove some now-unused bits David Howells
2023-06-29 15:54 ` David Howells [this message]
2023-06-29 17:56 ` [RFC PATCH 0/4] splice: Fix corruption in data spliced to pipe Linus Torvalds
2023-06-29 18:05 ` Matt Whitlock
2023-06-29 18:19 ` Linus Torvalds
2023-06-29 18:34 ` Matthew Wilcox
2023-06-29 18:53 ` Linus Torvalds
2023-06-30 16:50 ` David Howells
2023-06-29 18:42 ` Linus Torvalds
2023-06-29 18:16 ` Matt Whitlock
2023-06-30 0:01 ` Jakub Kicinski
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=20230629155433.4170837-5-dhowells@redhat.com \
--to=dhowells@redhat.com \
--cc=axboe@kernel.dk \
--cc=david@fromorbit.com \
--cc=hch@lst.de \
--cc=kernel@mattwhitlock.name \
--cc=linux-fsdevel@kvack.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=netdev@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=willy@infradead.org \
/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