]> www.infradead.org Git - users/dwmw2/linux.git/commit
fs/pipe: do not open-code pipe head/tail logic in FIONREAD
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Mar 2025 17:33:58 +0000 (07:33 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Mar 2025 17:33:58 +0000 (07:33 -1000)
commitd810d4c27bf34c719243bab9feb0d843edc09fd7
tree3e9336008e89eecda4b375cd2aff5c5a475638f8
parent74d42bdb3a4673b1c10d1f457184e4d3c9cb0196
fs/pipe: do not open-code pipe head/tail logic in FIONREAD

Rasmus points out that we do indeed have other cases of breakage from
the type changes that were introduced on 32-bit targets in order to read
the pipe head and tail values atomically (commit 3d252160b818: "fs/pipe:
Read pipe->{head,tail} atomically outside pipe->mutex").

Fix it up by using the proper helper functions that now deal with the
pipe buffer index types properly.  This makes the code simpler and more
obvious.

The compiler does the CSE and loop hoisting of the pipe ring size
masking that we used to do manually, so open-coding this was never a
good idea.

Reported-by: Rasmus Villemoes <ravi@prevas.dk>
Link: https://lore.kernel.org/all/87cyeu5zgk.fsf@prevas.dk/
Fixes: 3d252160b818 ("fs/pipe: Read pipe->{head,tail} atomically outside pipe->mutex")Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Mateusz Guzik <mjguzik@gmail.com>
Cc: K Prateek Nayak <kprateek.nayak@amd.com>
Cc: Swapnil Sapkal <swapnil.sapkal@amd.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/pipe.c