All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
To: linux-kernel@vger.kernel.org, viro@zeniv.linux.org.uk,
	Jens Axboe <axboe@kernel.dk>,
	linux-fsdevel@vger.kernel.org
Cc: "Jason A. Donenfeld" <Jason@zx2c4.com>
Subject: [PATCH v2 4/8] fs: check FMODE_LSEEK to control internal pipe splicing
Date: Sat, 25 Jun 2022 13:01:11 +0200	[thread overview]
Message-ID: <20220625110115.39956-5-Jason@zx2c4.com> (raw)
In-Reply-To: <20220625110115.39956-1-Jason@zx2c4.com>

The original direct splicing mechanism from Jens required the input to
be a regular file because it was avoiding the special socket case. It
also recognized blkdevs as being close enough to a regular file. But it
forgot about chardevs, which behave the same way and work fine here.

This is an okayish heuristic, but it doesn't totally work. For example,
a few chardevs should be spliceable here. And a few regular files
shouldn't. This patch fixes this by instead checking whether FMODE_LSEEK
is set, which represents decently enough what we need rewinding for when
splicing to internal pipes.

Fixes: b92ce5589374 ("[PATCH] splice: add direct fd <-> fd splicing support")
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 fs/splice.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/fs/splice.c b/fs/splice.c
index 047b79db8eb5..93a2c9bf6249 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -814,17 +814,15 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
 {
 	struct pipe_inode_info *pipe;
 	long ret, bytes;
-	umode_t i_mode;
 	size_t len;
 	int i, flags, more;
 
 	/*
-	 * We require the input being a regular file, as we don't want to
-	 * randomly drop data for eg socket -> socket splicing. Use the
-	 * piped splicing for that!
+	 * We require the input to be seekable, as we don't want to randomly
+	 * drop data for eg socket -> socket splicing. Use the piped splicing
+	 * for that!
 	 */
-	i_mode = file_inode(in)->i_mode;
-	if (unlikely(!S_ISREG(i_mode) && !S_ISBLK(i_mode)))
+	if (unlikely(!(in->f_mode & FMODE_LSEEK)))
 		return -EINVAL;
 
 	/*
-- 
2.35.1


  parent reply	other threads:[~2022-06-25 11:01 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-25 11:01 [PATCH v2 0/8] cleanup llseek and splice Jason A. Donenfeld
2022-06-25 11:01 ` [PATCH v2 1/8] ksmbd: use vfs_llseek instead of dereferencing NULL Jason A. Donenfeld
2022-06-25 22:15   ` Jason A. Donenfeld
2022-06-26  0:54     ` Steve French
2022-06-25 11:01 ` [PATCH v2 2/8] fs: do not set no_llseek in fops Jason A. Donenfeld
2022-06-25 11:01 ` [PATCH v2 3/8] fs: clear or set FMODE_LSEEK based on llseek function Jason A. Donenfeld
2022-06-25 13:07   ` Christoph Hellwig
2022-06-25 13:29     ` Al Viro
2022-06-25 13:39       ` Christoph Hellwig
2022-06-25 14:11         ` Al Viro
2022-06-25 11:01 ` Jason A. Donenfeld [this message]
2022-06-25 11:01 ` [PATCH v2 5/8] fs: do not compare against ->llseek Jason A. Donenfeld
2022-06-25 11:01 ` [PATCH v2 6/8] fs: remove no_llseek Jason A. Donenfeld
2022-06-25 13:10   ` Christoph Hellwig
2022-06-25 21:53     ` Jason A. Donenfeld
2022-06-25 11:01 ` [PATCH v2 7/8] dma-buf: remove useless FMODE_LSEEK flag Jason A. Donenfeld
2022-06-25 11:01   ` Jason A. Donenfeld
2022-06-27  9:08   ` Daniel Vetter
2022-06-27  9:08     ` Daniel Vetter
2022-06-27  9:38     ` Jason A. Donenfeld
2022-06-29 10:30     ` Sumit Semwal
2022-06-25 11:01 ` [PATCH v2 8/8] vfio: do not set " Jason A. Donenfeld
2022-06-27 20:07   ` Alex Williamson

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=20220625110115.39956-5-Jason@zx2c4.com \
    --to=jason@zx2c4.com \
    --cc=axboe@kernel.dk \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.