[v2,RESEND] coredump: Use vmsplice_to_pipe() for pipes in dump_emit_page()
Commit Message
From: Peilin Ye <peilin.ye@bytedance.com>
Currently, there is a copy for each page when dumping VMAs to pipe
handlers using dump_emit_page(). For example:
fs/binfmt_elf.c:elf_core_dump()
fs/coredump.c:dump_user_range()
:dump_emit_page()
fs/read_write.c:__kernel_write_iter()
fs/pipe.c:pipe_write()
lib/iov_iter.c:copy_page_from_iter()
Use vmsplice_to_pipe() instead of __kernel_write_iter() to avoid this
copy for pipe handlers.
Tested by dumping a 40-GByte core into a simple handler that splice()s
from stdin to disk in a loop, PIPE_DEF_BUFFERS (16) pages at a time.
Before After Improved by
Time to Completion 52.04 seconds 46.30 seconds 11.03%
CPU Usage 89.43% 84.90% 5.07%
Suggested-by: Cong Wang <cong.wang@bytedance.com>
Signed-off-by: Peilin Ye <peilin.ye@bytedance.com>
---
Hi all,
Resending this after 2+ weeks. Any suggestions, testing would be much
appreciated, thanks!
change in v2:
- fix warning in net/tls/tls_sw.c (kernel test robot)
Peilin Ye
fs/coredump.c | 7 ++++++-
fs/splice.c | 4 ++--
include/linux/splice.h | 3 +++
3 files changed, 11 insertions(+), 3 deletions(-)
@@ -42,6 +42,7 @@
#include <linux/timekeeping.h>
#include <linux/sysctl.h>
#include <linux/elf.h>
+#include <linux/splice.h>
#include <linux/uaccess.h>
#include <asm/mmu_context.h>
@@ -862,7 +863,11 @@ static int dump_emit_page(struct coredump_params *cprm, struct page *page)
return 0;
pos = file->f_pos;
iov_iter_bvec(&iter, WRITE, &bvec, 1, PAGE_SIZE);
- n = __kernel_write_iter(cprm->file, &iter, &pos);
+
+ n = vmsplice_to_pipe(file, &iter, 0);
+ if (n == -EBADF)
+ n = __kernel_write_iter(cprm->file, &iter, &pos);
+
if (n != PAGE_SIZE)
return 0;
file->f_pos = pos;
@@ -1234,8 +1234,8 @@ static long vmsplice_to_user(struct file *file, struct iov_iter *iter,
* as splice-from-memory, where the regular splice is splice-from-file (or
* to file). In both cases the output is a pipe, naturally.
*/
-static long vmsplice_to_pipe(struct file *file, struct iov_iter *iter,
- unsigned int flags)
+long vmsplice_to_pipe(struct file *file, struct iov_iter *iter,
+ unsigned int flags)
{
struct pipe_inode_info *pipe;
long ret = 0;
@@ -10,6 +10,7 @@
#define SPLICE_H
#include <linux/pipe_fs_i.h>
+#include <linux/uio.h>
/*
* Flags passed in from splice/tee/vmsplice
@@ -81,6 +82,8 @@ extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *,
extern long do_splice(struct file *in, loff_t *off_in,
struct file *out, loff_t *off_out,
size_t len, unsigned int flags);
+extern long vmsplice_to_pipe(struct file *file, struct iov_iter *iter,
+ unsigned int flags);
extern long do_tee(struct file *in, struct file *out, size_t len,
unsigned int flags);