[15/39] convert vmsplice() to CLASS(fd, ...)

Message ID	20240730051625.14349-15-viro@kernel.org (mailing list archive)
State	New
Headers	show Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4CF1C194131; Tue, 30 Jul 2024 05:15:00 +0000 (UTC) From: viro@kernel.org To: linux-fsdevel@vger.kernel.org Cc: amir73il@gmail.com, bpf@vger.kernel.org, brauner@kernel.org, cgroups@vger.kernel.org, kvm@vger.kernel.org, netdev@vger.kernel.org, torvalds@linux-foundation.org Subject: [PATCH 15/39] convert vmsplice() to CLASS(fd, ...) Date: Tue, 30 Jul 2024 01:16:01 -0400 Message-Id: <20240730051625.14349-15-viro@kernel.org> In-Reply-To: <20240730051625.14349-1-viro@kernel.org> References: <20240730050927.GC5334@ZenIV> <20240730051625.14349-1-viro@kernel.org> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[01/39] memcg_write_event_control(): fix a user-triggerable oops \| expand [01/39] memcg_write_event_control(): fix a user-triggerable oops [02/39] introduce fd_file(), convert all accessors to it. [03/39] struct fd: representation change [04/39] add struct fd constructors, get rid of __to_fd() [05/39] regularize emptiness checks in fini_module(2) and vfs_dedupe_file_range() [06/39] net/socket.c: switch to CLASS(fd) [07/39] introduce struct fderr, convert overlayfs uses to that [08/39] experimental: convert fs/overlayfs/file.c to CLASS(...) [09/39] timerfd: switch to CLASS(fd, ...) [10/39] get rid of perf_fget_light(), convert kernel/events/core.c to CLASS(fd) [11/39] switch netlink_getsockbyfilp() to taking descriptor [12/39] do_mq_notify(): saner skb freeing on failures [13/39] do_mq_notify(): switch to CLASS(fd, ...) [14/39] simplify xfs_find_handle() a bit [15/39] convert vmsplice() to CLASS(fd, ...) [16/39] convert __bpf_prog_get() to CLASS(fd, ...) [17/39] bpf: resolve_pseudo_ldimm64(): take handling of a single ldimm64 insn into helper [18/39] bpf maps: switch to CLASS(fd, ...) [19/39] fdget_raw() users: switch to CLASS(fd_raw, ...) [20/39] introduce "fd_pos" class, convert fdget_pos() users to it. [21/39] o2hb_region_dev_store(): avoid goto around fdget()/fdput() [22/39] privcmd_ioeventfd_assign(): don't open-code eventfd_ctx_fdget() [23/39] fdget(), trivial conversions [24/39] fdget(), more trivial conversions [25/39] convert do_preadv()/do_pwritev() [26/39] convert cachestat(2) [27/39] switch spufs_calls_{get,put}() to CLASS() use [28/39] convert spu_run(2) [29/39] convert media_request_get_by_fd() [30/39] convert coda_parse_fd() [31/39] convert cifs_ioctl_copychunk() [32/39] convert vfs_dedupe_file_range(). [33/39] convert do_select() [34/39] do_pollfd(): convert to CLASS(fd) [35/39] convert bpf_token_create() [36/39] assorted variants of irqfd setup: convert to CLASS(fd) [37/39] memcg_write_event_control(): switch to CLASS(fd) [38/39] css_set_fork(): switch to CLASS(fd_raw, ...) [39/39] deal with the last remaing boolean uses of fd_file()

Message ID

20240730051625.14349-15-viro@kernel.org (mailing list archive)

State

New

Headers

From: viro@kernel.org
To: linux-fsdevel@vger.kernel.org
Cc: amir73il@gmail.com,
	bpf@vger.kernel.org,
	brauner@kernel.org,
	cgroups@vger.kernel.org,
	kvm@vger.kernel.org,
	netdev@vger.kernel.org,
	torvalds@linux-foundation.org
Subject: [PATCH 15/39] convert vmsplice() to CLASS(fd, ...)
Date: Tue, 30 Jul 2024 01:16:01 -0400
Message-Id: <20240730051625.14349-15-viro@kernel.org>
In-Reply-To: <20240730051625.14349-1-viro@kernel.org>
References: <20240730050927.GC5334@ZenIV>
 <20240730051625.14349-1-viro@kernel.org>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

[01/39] memcg_write_event_control(): fix a user-triggerable oops | expand

Commit Message

Al Viro July 30, 2024, 5:16 a.m. UTC

From: Al Viro <viro@zeniv.linux.org.uk>

Irregularity here is fdput() not in the same scope as fdget(); we could
just lift it out vmsplice_type() in vmsplice(2), but there's no much
point keeping vmsplice_type() separate after that...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
 fs/splice.c | 33 ++++++++++-----------------------
 1 file changed, 10 insertions(+), 23 deletions(-)

Comments

Christian Brauner Aug. 7, 2024, 10:27 a.m. UTC | #1

On Tue, Jul 30, 2024 at 01:16:01AM GMT, viro@kernel.org wrote:
> From: Al Viro <viro@zeniv.linux.org.uk>
> 
> Irregularity here is fdput() not in the same scope as fdget(); we could
> just lift it out vmsplice_type() in vmsplice(2), but there's no much
> point keeping vmsplice_type() separate after that...
> 
> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
> ---

Reviewed-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/splice.c b/fs/splice.c
index 06232d7e505f..29cd39d7f4a0 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -1564,21 +1564,6 @@  static ssize_t vmsplice_to_pipe(struct file *file, struct iov_iter *iter,
 	return ret;
 }
 
-static int vmsplice_type(struct fd f, int *type)
-{
-	if (!fd_file(f))
-		return -EBADF;
-	if (fd_file(f)->f_mode & FMODE_WRITE) {
-		*type = ITER_SOURCE;
-	} else if (fd_file(f)->f_mode & FMODE_READ) {
-		*type = ITER_DEST;
-	} else {
-		fdput(f);
-		return -EBADF;
-	}
-	return 0;
-}
-
 /*
  * Note that vmsplice only really supports true splicing _from_ user memory
  * to a pipe, not the other way around. Splicing from user memory is a simple
@@ -1602,21 +1587,25 @@  SYSCALL_DEFINE4(vmsplice, int, fd, const struct iovec __user *, uiov,
 	struct iovec *iov = iovstack;
 	struct iov_iter iter;
 	ssize_t error;
-	struct fd f;
 	int type;
 
 	if (unlikely(flags & ~SPLICE_F_ALL))
 		return -EINVAL;
 
-	f = fdget(fd);
-	error = vmsplice_type(f, &type);
-	if (error)
-		return error;
+	CLASS(fd, f)(fd);
+	if (fd_empty(f))
+		return -EBADF;
+	if (fd_file(f)->f_mode & FMODE_WRITE)
+		type = ITER_SOURCE;
+	else if (fd_file(f)->f_mode & FMODE_READ)
+		type = ITER_DEST;
+	else
+		return -EBADF;
 
 	error = import_iovec(type, uiov, nr_segs,
 			     ARRAY_SIZE(iovstack), &iov, &iter);
 	if (error < 0)
-		goto out_fdput;
+		return error;
 
 	if (!iov_iter_count(&iter))
 		error = 0;
@@ -1626,8 +1615,6 @@  SYSCALL_DEFINE4(vmsplice, int, fd, const struct iovec __user *, uiov,
 		error = vmsplice_to_user(fd_file(f), &iter, flags);
 
 	kfree(iov);
-out_fdput:
-	fdput(f);
 	return error;
 }

[15/39] convert vmsplice() to CLASS(fd, ...)

Commit Message

Comments

Patch