From nobody Mon Sep 15 18:08:56 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 066F7C54EBC for ; Wed, 11 Jan 2023 14:32:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232544AbjAKOcK (ORCPT ); Wed, 11 Jan 2023 09:32:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238568AbjAKObm (ORCPT ); Wed, 11 Jan 2023 09:31:42 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CD7463AC for ; Wed, 11 Jan 2023 06:27:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673447277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Yds06ULQmuHhcEcqXR7Mw+R1dRGODj6RvMYPw7Kl45k=; b=Rv+8dzrVxuSXMgNnwwV65W7ZEuMcUcp2FcWWRgH2wRm5hwDySK42z7VrOvqMdbfCotZGra pcjrw/qppBfrSI5gaMx80B7RLpDB0yaBvw8qR18RaCXVZKaOmijh8fOAcH909TGHs9JX8I vWgx7/LEG5nDfgbnlIctgpY0nx/lVgg= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-136-oU2WHs16N8u6L4sF7xcBmw-1; Wed, 11 Jan 2023 09:27:53 -0500 X-MC-Unique: oU2WHs16N8u6L4sF7xcBmw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EB7613C1485D; Wed, 11 Jan 2023 14:27:52 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9E32640C2064; Wed, 11 Jan 2023 14:27:51 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [PATCH v5 2/9] iov_iter: Use the direction in the iterator functions From: David Howells To: Al Viro Cc: dhowells@redhat.com, Christoph Hellwig , Matthew Wilcox , Jens Axboe , Jan Kara , Jeff Layton , Logan Gunthorpe , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Date: Wed, 11 Jan 2023 14:27:51 +0000 Message-ID: <167344727112.2425628.995771894170560721.stgit@warthog.procyon.org.uk> In-Reply-To: <167344725490.2425628.13771289553670112965.stgit@warthog.procyon.org.uk> References: <167344725490.2425628.13771289553670112965.stgit@warthog.procyon.org.uk> User-Agent: StGit/1.5 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the direction in the iterator functions rather than READ/WRITE. Signed-off-by: David Howells cc: Al Viro Link: https://lore.kernel.org/r/167305162465.1521586.18077838937455153675.s= tgit@warthog.procyon.org.uk/ # v4 --- include/linux/uio.h | 22 +++++++++++----------- lib/iov_iter.c | 46 +++++++++++++++++++++++----------------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/include/linux/uio.h b/include/linux/uio.h index 4b0f4a773d90..acb1ae3324ed 100644 --- a/include/linux/uio.h +++ b/include/linux/uio.h @@ -261,16 +261,16 @@ bool iov_iter_is_aligned(const struct iov_iter *i, un= signed addr_mask, unsigned len_mask); unsigned long iov_iter_alignment(const struct iov_iter *i); unsigned long iov_iter_gap_alignment(const struct iov_iter *i); -void iov_iter_init(struct iov_iter *i, unsigned int direction, const struc= t iovec *iov, +void iov_iter_init(struct iov_iter *i, enum iter_dir direction, const stru= ct iovec *iov, unsigned long nr_segs, size_t count); -void iov_iter_kvec(struct iov_iter *i, unsigned int direction, const struc= t kvec *kvec, +void iov_iter_kvec(struct iov_iter *i, enum iter_dir direction, const stru= ct kvec *kvec, unsigned long nr_segs, size_t count); -void iov_iter_bvec(struct iov_iter *i, unsigned int direction, const struc= t bio_vec *bvec, +void iov_iter_bvec(struct iov_iter *i, enum iter_dir direction, const stru= ct bio_vec *bvec, unsigned long nr_segs, size_t count); -void iov_iter_pipe(struct iov_iter *i, unsigned int direction, struct pipe= _inode_info *pipe, +void iov_iter_pipe(struct iov_iter *i, enum iter_dir direction, struct pip= e_inode_info *pipe, size_t count); -void iov_iter_discard(struct iov_iter *i, unsigned int direction, size_t c= ount); -void iov_iter_xarray(struct iov_iter *i, unsigned int direction, struct xa= rray *xarray, +void iov_iter_discard(struct iov_iter *i, enum iter_dir direction, size_t = count); +void iov_iter_xarray(struct iov_iter *i, enum iter_dir direction, struct x= array *xarray, loff_t start, size_t count); ssize_t iov_iter_get_pages(struct iov_iter *i, struct page **pages, size_t maxsize, unsigned maxpages, size_t *start, @@ -360,19 +360,19 @@ size_t hash_and_copy_to_iter(const void *addr, size_t= bytes, void *hashp, struct iovec *iovec_from_user(const struct iovec __user *uvector, unsigned long nr_segs, unsigned long fast_segs, struct iovec *fast_iov, bool compat); -ssize_t import_iovec(int type, const struct iovec __user *uvec, +ssize_t import_iovec(enum iter_dir direction, const struct iovec __user *u= vec, unsigned nr_segs, unsigned fast_segs, struct iovec **iovp, struct iov_iter *i); -ssize_t __import_iovec(int type, const struct iovec __user *uvec, +ssize_t __import_iovec(enum iter_dir direction, const struct iovec __user = *uvec, unsigned nr_segs, unsigned fast_segs, struct iovec **iovp, struct iov_iter *i, bool compat); -int import_single_range(int type, void __user *buf, size_t len, +int import_single_range(enum iter_dir direction, void __user *buf, size_t = len, struct iovec *iov, struct iov_iter *i); =20 -static inline void iov_iter_ubuf(struct iov_iter *i, unsigned int directio= n, +static inline void iov_iter_ubuf(struct iov_iter *i, enum iter_dir directi= on, void __user *buf, size_t count) { - WARN_ON(direction & ~(READ | WRITE)); + WARN_ON(!iov_iter_dir_valid(direction)); *i =3D (struct iov_iter) { .iter_type =3D ITER_UBUF, .user_backed =3D true, diff --git a/lib/iov_iter.c b/lib/iov_iter.c index f9a3ff37ecd1..fec1c5513197 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -421,11 +421,11 @@ size_t fault_in_iov_iter_writeable(const struct iov_i= ter *i, size_t size) } EXPORT_SYMBOL(fault_in_iov_iter_writeable); =20 -void iov_iter_init(struct iov_iter *i, unsigned int direction, +void iov_iter_init(struct iov_iter *i, enum iter_dir direction, const struct iovec *iov, unsigned long nr_segs, size_t count) { - WARN_ON(direction & ~(READ | WRITE)); + WARN_ON(!iov_iter_dir_valid(direction)); *i =3D (struct iov_iter) { .iter_type =3D ITER_IOVEC, .nofault =3D false, @@ -994,11 +994,11 @@ size_t iov_iter_single_seg_count(const struct iov_ite= r *i) } EXPORT_SYMBOL(iov_iter_single_seg_count); =20 -void iov_iter_kvec(struct iov_iter *i, unsigned int direction, +void iov_iter_kvec(struct iov_iter *i, enum iter_dir direction, const struct kvec *kvec, unsigned long nr_segs, size_t count) { - WARN_ON(direction & ~(READ | WRITE)); + WARN_ON(!iov_iter_dir_valid(direction)); *i =3D (struct iov_iter){ .iter_type =3D ITER_KVEC, .data_source =3D direction, @@ -1010,11 +1010,11 @@ void iov_iter_kvec(struct iov_iter *i, unsigned int= direction, } EXPORT_SYMBOL(iov_iter_kvec); =20 -void iov_iter_bvec(struct iov_iter *i, unsigned int direction, +void iov_iter_bvec(struct iov_iter *i, enum iter_dir direction, const struct bio_vec *bvec, unsigned long nr_segs, size_t count) { - WARN_ON(direction & ~(READ | WRITE)); + WARN_ON(!iov_iter_dir_valid(direction)); *i =3D (struct iov_iter){ .iter_type =3D ITER_BVEC, .data_source =3D direction, @@ -1026,15 +1026,15 @@ void iov_iter_bvec(struct iov_iter *i, unsigned int= direction, } EXPORT_SYMBOL(iov_iter_bvec); =20 -void iov_iter_pipe(struct iov_iter *i, unsigned int direction, +void iov_iter_pipe(struct iov_iter *i, enum iter_dir direction, struct pipe_inode_info *pipe, size_t count) { - BUG_ON(direction !=3D READ); + BUG_ON(direction !=3D ITER_DEST); WARN_ON(pipe_full(pipe->head, pipe->tail, pipe->ring_size)); *i =3D (struct iov_iter){ .iter_type =3D ITER_PIPE, - .data_source =3D false, + .data_source =3D ITER_DEST, .pipe =3D pipe, .head =3D pipe->head, .start_head =3D pipe->head, @@ -1057,10 +1057,10 @@ EXPORT_SYMBOL(iov_iter_pipe); * from evaporation, either by taking a ref on them or locking them by the * caller. */ -void iov_iter_xarray(struct iov_iter *i, unsigned int direction, +void iov_iter_xarray(struct iov_iter *i, enum iter_dir direction, struct xarray *xarray, loff_t start, size_t count) { - BUG_ON(direction & ~1); + WARN_ON(!iov_iter_dir_valid(direction)); *i =3D (struct iov_iter) { .iter_type =3D ITER_XARRAY, .data_source =3D direction, @@ -1079,14 +1079,14 @@ EXPORT_SYMBOL(iov_iter_xarray); * @count: The size of the I/O buffer in bytes. * * Set up an I/O iterator that just discards everything that's written to = it. - * It's only available as a READ iterator. + * It's only available as a destination iterator. */ -void iov_iter_discard(struct iov_iter *i, unsigned int direction, size_t c= ount) +void iov_iter_discard(struct iov_iter *i, enum iter_dir direction, size_t = count) { - BUG_ON(direction !=3D READ); + BUG_ON(direction !=3D ITER_DEST); *i =3D (struct iov_iter){ .iter_type =3D ITER_DISCARD, - .data_source =3D false, + .data_source =3D ITER_DEST, .count =3D count, .iov_offset =3D 0 }; @@ -1447,7 +1447,7 @@ static ssize_t __iov_iter_get_pages_alloc(struct iov_= iter *i, unsigned long addr; int res; =20 - if (iov_iter_rw(i) !=3D WRITE) + if (iov_iter_is_dest(i)) gup_flags |=3D FOLL_WRITE; if (i->nofault) gup_flags |=3D FOLL_NOFAULT; @@ -1784,7 +1784,7 @@ struct iovec *iovec_from_user(const struct iovec __us= er *uvec, return iov; } =20 -ssize_t __import_iovec(int type, const struct iovec __user *uvec, +ssize_t __import_iovec(enum iter_dir direction, const struct iovec __user = *uvec, unsigned nr_segs, unsigned fast_segs, struct iovec **iovp, struct iov_iter *i, bool compat) { @@ -1823,7 +1823,7 @@ ssize_t __import_iovec(int type, const struct iovec _= _user *uvec, total_len +=3D len; } =20 - iov_iter_init(i, type, iov, nr_segs, total_len); + iov_iter_init(i, direction, iov, nr_segs, total_len); if (iov =3D=3D *iovp) *iovp =3D NULL; else @@ -1836,7 +1836,7 @@ ssize_t __import_iovec(int type, const struct iovec _= _user *uvec, * into the kernel, check that it is valid, and initialize a new * &struct iov_iter iterator to access it. * - * @type: One of %READ or %WRITE. + * @direction: One of %ITER_SOURCE or %ITER_DEST. * @uvec: Pointer to the userspace array. * @nr_segs: Number of elements in userspace array. * @fast_segs: Number of elements in @iov. @@ -1853,16 +1853,16 @@ ssize_t __import_iovec(int type, const struct iovec= __user *uvec, * * Return: Negative error code on error, bytes imported on success */ -ssize_t import_iovec(int type, const struct iovec __user *uvec, +ssize_t import_iovec(enum iter_dir direction, const struct iovec __user *u= vec, unsigned nr_segs, unsigned fast_segs, struct iovec **iovp, struct iov_iter *i) { - return __import_iovec(type, uvec, nr_segs, fast_segs, iovp, i, + return __import_iovec(direction, uvec, nr_segs, fast_segs, iovp, i, in_compat_syscall()); } EXPORT_SYMBOL(import_iovec); =20 -int import_single_range(int rw, void __user *buf, size_t len, +int import_single_range(enum iter_dir direction, void __user *buf, size_t = len, struct iovec *iov, struct iov_iter *i) { if (len > MAX_RW_COUNT) @@ -1872,7 +1872,7 @@ int import_single_range(int rw, void __user *buf, siz= e_t len, =20 iov->iov_base =3D buf; iov->iov_len =3D len; - iov_iter_init(i, rw, iov, 1, len); + iov_iter_init(i, direction, iov, 1, len); return 0; } EXPORT_SYMBOL(import_single_range);