From: Max Kellermann <max.kellermann@ionos.com>
To: viro@zeniv.linux.org.uk, brauner@kernel.org, howells@redhat.com
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
Max Kellermann <max.kellermann@ionos.com>
Subject: [PATCH 3/4] fs/pipe: remove unnecessary spinlock from pipe_write()
Date: Thu, 21 Sep 2023 09:57:54 +0200 [thread overview]
Message-ID: <20230921075755.1378787-3-max.kellermann@ionos.com> (raw)
In-Reply-To: <20230921075755.1378787-1-max.kellermann@ionos.com>
This reverts commit 8df441294dd3 ("pipe: Check for ring full inside of
the spinlock in pipe_write()") which was obsoleted by commit
c73be61cede ("pipe: Add general notification queue support") because
now pipe_write() fails early with -EXDEV if there is a watch_queue.
Without a watch_queue, no notifications can be posted to the pipe and
mutex protection is enough, as can be seen in splice_pipe_to_pipe()
which does not use the spinlock either.
Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
---
fs/pipe.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/fs/pipe.c b/fs/pipe.c
index 6ecaccb48738..939def02c18c 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -505,16 +505,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
* it, either the reader will consume it or it'll still
* be there for the next write.
*/
- spin_lock_irq(&pipe->rd_wait.lock);
-
- head = pipe->head;
- if (pipe_full(head, pipe->tail, pipe->max_usage)) {
- spin_unlock_irq(&pipe->rd_wait.lock);
- continue;
- }
-
pipe->head = head + 1;
- spin_unlock_irq(&pipe->rd_wait.lock);
/* Insert it into the buffer array */
buf = &pipe->bufs[head & mask];
--
2.39.2
next prev parent reply other threads:[~2023-09-21 21:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-21 7:57 [PATCH 1/4] pipe: reduce padding in struct pipe_inode_info Max Kellermann
2023-09-21 7:57 ` [PATCH 2/4] fs/pipe: move check to pipe_has_watch_queue() Max Kellermann
2023-09-21 7:57 ` Max Kellermann [this message]
2023-09-21 7:57 ` [PATCH 4/4] fs/pipe: use spinlock in pipe_read() only if there is a watch_queue Max Kellermann
2023-09-21 15:39 ` [PATCH 1/4] pipe: reduce padding in struct pipe_inode_info Christian Brauner
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=20230921075755.1378787-3-max.kellermann@ionos.com \
--to=max.kellermann@ionos.com \
--cc=brauner@kernel.org \
--cc=howells@redhat.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome