splice: don't merge into linked buffers
Subsystems (5)
PATCH v2 1/2 splice: don't merge into linked buffers
Before this patch, it was possible for two pipes to affect each other after data had been transferred between them with tee():
============
$ cat tee_test.c
int main(void) {
int pipe_a[2];
if (pipe(pipe_a)) err(1, "pipe");
int pipe_b[2];
if (pipe(pipe_b)) err(1, "pipe");
if (write(pipe_a[1], "abcd", 4) != 4) err(1, "write"); if (tee(pipe_a[0], pipe_b[1], 2, 0) != 2) err(1, "tee"); if (write(pipe_b[1], "xx", 2) != 2) err(1, "write");
char buf[5];
if (read(pipe_a[0], buf, 4) != 4) err(1, "read"); buf[4] = 0;
printf("got back: '%s'\n", buf);
}
$ gcc -o tee_test tee_test.c $ ./tee_test got back: 'abxx' $ ============
As suggested by Al Viro, fix it by creating a separate type for non-mergeable pipe buffers, then changing the types of buffers in splice_pipe_to_pipe() and link_pipe().
---
Al wasn't entirely happy with the approach I took for v1, so sending a different fix here.
fs/pipe.c | 14 ++++++++++++++ fs/splice.c | 4 ++++ include/linux/pipe_fs_i.h | 1 + 3 files changed, 19 insertions(+)
fs/pipe.c +14 -0
@@ -234,6 +234,14 @@ static const struct pipe_buf_operations anon_pipe_buf_ops = { .get = generic_pipe_buf_get, }; +static const struct pipe_buf_operations anon_pipe_buf_nomerge_ops = { + .can_merge =0 , + .confirm = generic_pipe_buf_confirm, + .release = anon_pipe_buf_release, + .steal = anon_pipe_buf_steal, + .get = generic_pipe_buf_get, +}; +static const struct pipe_buf_operations packet_pipe_buf_ops = { .can_merge =0 , .confirm = generic_pipe_buf_confirm,
@@ -242,6 +250,12 @@ static const struct pipe_buf_operations packet_pipe_buf_ops = { .get = generic_pipe_buf_get, }; +void pipe_buf_mark_unmergeable (struct pipe_buffer *buf) +{ +if (buf->ops == &anon_pipe_buf_ops) + buf->ops = &anon_pipe_buf_nomerge_ops; +} +static ssize_t pipe_read (struct kiocb *iocb,struct iov_iter *to) {
fs/splice.c +4 -0
@@ -1597,6 +1597,8 @@ static int splice_pipe_to_pipe(struct pipe_inode_info *ipipe,*/ obuf->flags &= ~PIPE_BUF_FLAG_GIFT ; +pipe_buf_mark_unmergeable (obuf); + obuf->len = len; opipe->nrbufs++; ibuf->offset += obuf->len;
@@ -1671,6 +1673,8 @@ static int link_pipe(struct pipe_inode_info *ipipe,*/ obuf->flags &= ~PIPE_BUF_FLAG_GIFT ; +pipe_buf_mark_unmergeable (obuf); +if (obuf->len > len) obuf->len = len;
include/linux/pipe_fs_i.h +1 -0
@@ -182,6 +182,7 @@ void generic_pipe_buf_get(struct pipe_inode_info *, struct pipe_buffer *);int generic_pipe_buf_confirm (struct pipe_inode_info *,struct pipe_buffer *);int generic_pipe_buf_steal (struct pipe_inode_info *,struct pipe_buffer *);void generic_pipe_buf_release (struct pipe_inode_info *,struct pipe_buffer *); +void pipe_buf_mark_unmergeable (struct pipe_buffer *buf);extern const struct pipe_buf_operations nosteal_pipe_buf_ops;
Signature · 1 line
2.20.1.321.g9e740568ce-goog
PATCH v2 2/2 pipe: stop using ->can_merge
Al Viro pointed out that since there is only one pipe buffer type to which new data can be appended, it isn't necessary to have a ->can_merge field in struct pipe_buf_operations, we can just check for a magic type.
--- fs/pipe.c | 20 ++++++++++++++++---- fs/splice.c | 4 ---- include/linux/pipe_fs_i.h | 7 ------- kernel/relay.c | 1 - kernel/trace/trace.c | 2 -- net/smc/smc_rx.c | 1 - 6 files changed, 16 insertions(+), 19 deletions(-)
fs/pipe.c +16 -4
@@ -226,8 +226,8 @@ void generic_pipe_buf_release(struct pipe_inode_info *pipe, }EXPORT_SYMBOL (generic_pipe_buf_release); +/* New data written to a pipe may be appended to a buffer with this type. */ static const struct pipe_buf_operations anon_pipe_buf_ops = { - .can_merge =1 , .confirm = generic_pipe_buf_confirm, .release = anon_pipe_buf_release, .steal = anon_pipe_buf_steal,
@@ -235,7 +235,6 @@ static const struct pipe_buf_operations anon_pipe_buf_ops = { };static const struct pipe_buf_operations anon_pipe_buf_nomerge_ops = { - .can_merge =0 , .confirm = generic_pipe_buf_confirm, .release = anon_pipe_buf_release, .steal = anon_pipe_buf_steal,
@@ -243,19 +242,32 @@ static const struct pipe_buf_operations anon_pipe_buf_nomerge_ops = { };static const struct pipe_buf_operations packet_pipe_buf_ops = { - .can_merge =0 , .confirm = generic_pipe_buf_confirm, .release = anon_pipe_buf_release, .steal = anon_pipe_buf_steal, .get = generic_pipe_buf_get, }; +/** +* pipe_buf_mark_unmergeable - mark a &struct pipe_buffer as unmergeable +* @buf: the buffer to mark +* +* Description: +* This function ensures that no future writes will be merged into the +* given &struct pipe_buffer. This is necessary when multiple pipe buffers +* share the same backing page. +*/ void pipe_buf_mark_unmergeable (struct pipe_buffer *buf) {if (buf->ops == &anon_pipe_buf_ops) buf->ops = &anon_pipe_buf_nomerge_ops; } +static bool pipe_buf_can_merge (struct pipe_buffer *buf) +{ +return buf->ops == &anon_pipe_buf_ops; +} +static ssize_t pipe_read (struct kiocb *iocb,struct iov_iter *to) {
@@ -393,7 +405,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)struct pipe_buffer *buf = pipe->bufs + lastbuf;int offset = buf->offset + buf->len; -if (buf->ops->can_merge && offset + chars <=PAGE_SIZE ) { +if (pipe_buf_can_merge (buf) && offset + chars <=PAGE_SIZE ) { ret =pipe_buf_confirm (pipe, buf);if (ret) goto out;
fs/splice.c +0 -4
@@ -138,7 +138,6 @@ static int page_cache_pipe_buf_confirm(struct pipe_inode_info *pipe, }const struct pipe_buf_operations page_cache_pipe_buf_ops = { - .can_merge =0 , .confirm = page_cache_pipe_buf_confirm, .release = page_cache_pipe_buf_release, .steal = page_cache_pipe_buf_steal,
@@ -156,7 +155,6 @@ static int user_page_pipe_buf_steal(struct pipe_inode_info *pipe, }static const struct pipe_buf_operations user_page_pipe_buf_ops = { - .can_merge =0 , .confirm = generic_pipe_buf_confirm, .release = page_cache_pipe_buf_release, .steal = user_page_pipe_buf_steal,
@@ -326,7 +324,6 @@ ssize_t generic_file_splice_read(struct file *in, loff_t *ppos,EXPORT_SYMBOL (generic_file_splice_read);const struct pipe_buf_operations default_pipe_buf_ops = { - .can_merge =0 , .confirm = generic_pipe_buf_confirm, .release = generic_pipe_buf_release, .steal = generic_pipe_buf_steal,
@@ -341,7 +338,6 @@ static int generic_pipe_buf_nosteal(struct pipe_inode_info *pipe,/* Pipe buffer operations for a socket and similar. */ const struct pipe_buf_operations nosteal_pipe_buf_ops = { - .can_merge =0 , .confirm = generic_pipe_buf_confirm, .release = generic_pipe_buf_release, .steal = generic_pipe_buf_nosteal,
include/linux/pipe_fs_i.h +0 -7
@@ -73,13 +73,6 @@ struct pipe_inode_info {* in fs/pipe.c for the pipe and generic variants of these hooks. */ struct pipe_buf_operations { -/* -* This is set to 1, if the generic pipe read/write may coalesce -* data into an existing buffer. If this is set to 0, a new pipe -* page segment is always used for new data. -*/ -int can_merge; -/* * ->confirm() verifies that the data in the pipe buffer is there * and that the contents are good. If the pages in the pipe belong
kernel/relay.c +0 -1
@@ -1175,7 +1175,6 @@ static void relay_pipe_buf_release(struct pipe_inode_info *pipe, }static const struct pipe_buf_operations relay_pipe_buf_ops = { - .can_merge =0 , .confirm = generic_pipe_buf_confirm, .release = relay_pipe_buf_release, .steal = generic_pipe_buf_steal,
kernel/trace/trace.c +0 -2
@@ -5823,7 +5823,6 @@ static void tracing_spd_release_pipe(struct splice_pipe_desc *spd, }static const struct pipe_buf_operations tracing_pipe_buf_ops = { - .can_merge =0 , .confirm = generic_pipe_buf_confirm, .release = generic_pipe_buf_release, .steal = generic_pipe_buf_steal,
@@ -6843,7 +6842,6 @@ static void buffer_pipe_buf_get(struct pipe_inode_info *pipe,/* Pipe buffer operations for a buffer. */ static const struct pipe_buf_operations buffer_pipe_buf_ops = { - .can_merge =0 , .confirm = generic_pipe_buf_confirm, .release = buffer_pipe_buf_release, .steal = generic_pipe_buf_steal,
net/smc/smc_rx.c +0 -1
@@ -136,7 +136,6 @@ static int smc_rx_pipe_buf_nosteal(struct pipe_inode_info *pipe, }static const struct pipe_buf_operations smc_pipe_ops = { - .can_merge =0 , .confirm = generic_pipe_buf_confirm, .release = smc_rx_pipe_buf_release, .steal = smc_rx_pipe_buf_nosteal,
Signature · 1 line
2.20.1.321.g9e740568ce-goog