diff mbox series

[v2,2/2] iov_iter: optimise iter type checking

Message ID 70d65e06b22cfb11f70b92c12c4d176f36b0e646.1605827965.git.asml.silence@gmail.com (mailing list archive)
State New, archived
Headers show
Series optimise iov_iter | expand

Commit Message

Pavel Begunkov Nov. 19, 2020, 11:24 p.m. UTC
The problem here is that iov_iter_is_*() helpers check types for
equality, but all iterate_* helpers do bitwise ands. This confuses
compilers, so even if some cases were handled separately with
iov_iter_is_*(), corresponding ifs in iterate*() right after are not

E.g. iov_iter_npages() first handles bvecs and discards, but
iterate_all_kinds() still checks those iter types and generates actually
unreachable code including iter init, for(), etc.

size lib/iov_iter.o
   text    data     bss     dec     hex filename
  24409     805       0   25214    627e lib/iov_iter.o

   text    data     bss     dec     hex filename
  23785     793       0   24578    6002 lib/iov_iter.o

Most of it is ifs that are executed but never true.

Reviewed-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
 include/linux/uio.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
diff mbox series


diff --git a/include/linux/uio.h b/include/linux/uio.h
index 72d88566694e..c5970b2d3307 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -57,27 +57,27 @@  static inline enum iter_type iov_iter_type(const struct iov_iter *i)
 static inline bool iter_is_iovec(const struct iov_iter *i)
-	return iov_iter_type(i) == ITER_IOVEC;
+	return iov_iter_type(i) & ITER_IOVEC;
 static inline bool iov_iter_is_kvec(const struct iov_iter *i)
-	return iov_iter_type(i) == ITER_KVEC;
+	return iov_iter_type(i) & ITER_KVEC;
 static inline bool iov_iter_is_bvec(const struct iov_iter *i)
-	return iov_iter_type(i) == ITER_BVEC;
+	return iov_iter_type(i) & ITER_BVEC;
 static inline bool iov_iter_is_pipe(const struct iov_iter *i)
-	return iov_iter_type(i) == ITER_PIPE;
+	return iov_iter_type(i) & ITER_PIPE;
 static inline bool iov_iter_is_discard(const struct iov_iter *i)
-	return iov_iter_type(i) == ITER_DISCARD;
+	return iov_iter_type(i) & ITER_DISCARD;
 static inline unsigned char iov_iter_rw(const struct iov_iter *i)