| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20250322203558.206411-2-jdamato@fastly.com>
Date: Sat, 22 Mar 2025 20:35:44 +0000
From: Joe Damato <jdamato@...tly.com>
To: linux-fsdevel@...r.kernel.org
Cc: netdev@...r.kernel.org,
brauner@...nel.org,
asml.silence@...il.com,
hch@...radead.org,
axboe@...nel.dk,
edumazet@...gle.com,
kuba@...nel.org,
pabeni@...hat.com,
horms@...nel.org,
Joe Damato <jdamato@...tly.com>,
Alexander Viro <viro@...iv.linux.org.uk>,
Jan Kara <jack@...e.cz>,
linux-kernel@...r.kernel.org (open list)
Subject: [PATCH vfs/for-next 1/3] pipe: Move pipe wakeup helpers out of splice
Splice code has helpers to wakeup pipe readers and writers. Move these
helpers out of splice, rename them from "wakeup_pipe_*" to
"pipe_wakeup_*" and update call sites in splice.
Signed-off-by: Joe Damato <jdamato@...tly.com>
---
fs/pipe.c | 16 ++++++++++++++++
fs/splice.c | 34 +++++++++-------------------------
include/linux/pipe_fs_i.h | 4 ++++
3 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/fs/pipe.c b/fs/pipe.c
index 12b22c2723b7..1f496896184b 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -1070,6 +1070,22 @@ void pipe_wait_writable(struct pipe_inode_info *pipe)
pipe_lock(pipe);
}
+void pipe_wakeup_readers(struct pipe_inode_info *pipe)
+{
+ smp_mb();
+ if (waitqueue_active(&pipe->rd_wait))
+ wake_up_interruptible(&pipe->rd_wait);
+ kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
+}
+
+void pipe_wakeup_writers(struct pipe_inode_info *pipe)
+{
+ smp_mb();
+ if (waitqueue_active(&pipe->wr_wait))
+ wake_up_interruptible(&pipe->wr_wait);
+ kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
+}
+
/*
* This depends on both the wait (here) and the wakeup (wake_up_partner)
* holding the pipe lock, so "*cnt" is stable and we know a wakeup cannot
diff --git a/fs/splice.c b/fs/splice.c
index 2898fa1e9e63..dcd594a8fc06 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -175,14 +175,6 @@ static const struct pipe_buf_operations user_page_pipe_buf_ops = {
.get = generic_pipe_buf_get,
};
-static void wakeup_pipe_readers(struct pipe_inode_info *pipe)
-{
- smp_mb();
- if (waitqueue_active(&pipe->rd_wait))
- wake_up_interruptible(&pipe->rd_wait);
- kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
-}
-
/**
* splice_to_pipe - fill passed data into a pipe
* @pipe: pipe to fill
@@ -414,14 +406,6 @@ const struct pipe_buf_operations nosteal_pipe_buf_ops = {
};
EXPORT_SYMBOL(nosteal_pipe_buf_ops);
-static void wakeup_pipe_writers(struct pipe_inode_info *pipe)
-{
- smp_mb();
- if (waitqueue_active(&pipe->wr_wait))
- wake_up_interruptible(&pipe->wr_wait);
- kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
-}
-
/**
* splice_from_pipe_feed - feed available data from a pipe to a file
* @pipe: pipe to splice from
@@ -541,7 +525,7 @@ static int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_des
return -ERESTARTSYS;
if (sd->need_wakeup) {
- wakeup_pipe_writers(pipe);
+ pipe_wakeup_writers(pipe);
sd->need_wakeup = false;
}
@@ -582,7 +566,7 @@ static void splice_from_pipe_begin(struct splice_desc *sd)
static void splice_from_pipe_end(struct pipe_inode_info *pipe, struct splice_desc *sd)
{
if (sd->need_wakeup)
- wakeup_pipe_writers(pipe);
+ pipe_wakeup_writers(pipe);
}
/**
@@ -837,7 +821,7 @@ ssize_t splice_to_socket(struct pipe_inode_info *pipe, struct file *out,
goto out;
if (need_wakeup) {
- wakeup_pipe_writers(pipe);
+ pipe_wakeup_writers(pipe);
need_wakeup = false;
}
@@ -917,7 +901,7 @@ ssize_t splice_to_socket(struct pipe_inode_info *pipe, struct file *out,
out:
pipe_unlock(pipe);
if (need_wakeup)
- wakeup_pipe_writers(pipe);
+ pipe_wakeup_writers(pipe);
return spliced ?: ret;
}
#endif
@@ -1295,7 +1279,7 @@ ssize_t splice_file_to_pipe(struct file *in,
ret = do_splice_read(in, offset, opipe, len, flags);
pipe_unlock(opipe);
if (ret > 0)
- wakeup_pipe_readers(opipe);
+ pipe_wakeup_readers(opipe);
return ret;
}
@@ -1558,7 +1542,7 @@ static ssize_t vmsplice_to_pipe(struct file *file, struct iov_iter *iter,
ret = iter_to_pipe(iter, pipe, buf_flag);
pipe_unlock(pipe);
if (ret > 0) {
- wakeup_pipe_readers(pipe);
+ pipe_wakeup_readers(pipe);
fsnotify_modify(file);
}
return ret;
@@ -1844,10 +1828,10 @@ static int splice_pipe_to_pipe(struct pipe_inode_info *ipipe,
* If we put data in the output pipe, wakeup any potential readers.
*/
if (ret > 0)
- wakeup_pipe_readers(opipe);
+ pipe_wakeup_readers(opipe);
if (input_wakeup)
- wakeup_pipe_writers(ipipe);
+ pipe_wakeup_writers(ipipe);
return ret;
}
@@ -1935,7 +1919,7 @@ static ssize_t link_pipe(struct pipe_inode_info *ipipe,
* If we put data in the output pipe, wakeup any potential readers.
*/
if (ret > 0)
- wakeup_pipe_readers(opipe);
+ pipe_wakeup_readers(opipe);
return ret;
}
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
index 8ff23bf5a819..de850ef085cb 100644
--- a/include/linux/pipe_fs_i.h
+++ b/include/linux/pipe_fs_i.h
@@ -267,6 +267,10 @@ void pipe_double_lock(struct pipe_inode_info *, struct pipe_inode_info *);
void pipe_wait_readable(struct pipe_inode_info *);
void pipe_wait_writable(struct pipe_inode_info *);
+/* Wake up pipe readers/writers */
+void pipe_wakeup_readers(struct pipe_inode_info *pipe);
+void pipe_wakeup_writers(struct pipe_inode_info *pipe);
+
struct pipe_inode_info *alloc_pipe_info(void);
void free_pipe_info(struct pipe_inode_info *);
--
2.43.0
Powered by blists - more mailing lists