Skip to content

Commit aa39564

Browse files
dhowellsbrauner
authored andcommitted
netfs: Fix missing barriers by using clear_and_wake_up_bit()
Use clear_and_wake_up_bit() rather than something like: clear_bit_unlock(NETFS_RREQ_IN_PROGRESS, &rreq->flags); wake_up_bit(&rreq->flags, NETFS_RREQ_IN_PROGRESS); as there needs to be a barrier inserted between which is present in clear_and_wake_up_bit(). Fixes: 288ace2 ("netfs: New writeback implementation") Fixes: ee4cdf7 ("netfs: Speed up buffered reading") Signed-off-by: David Howells <dhowells@redhat.com> Link: https://lore.kernel.org/r/20241213135013.2964079-8-dhowells@redhat.com Reviewed-by: Akira Yokosawa <akiyks@gmail.com> cc: Zilin Guan <zilin@seu.edu.cn> cc: Akira Yokosawa <akiyks@gmail.com> cc: Jeff Layton <jlayton@kernel.org> cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent f4d3cde commit aa39564

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

fs/netfs/read_collect.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,8 +379,7 @@ static void netfs_rreq_assess(struct netfs_io_request *rreq)
379379
task_io_account_read(rreq->transferred);
380380

381381
trace_netfs_rreq(rreq, netfs_rreq_trace_wake_ip);
382-
clear_bit_unlock(NETFS_RREQ_IN_PROGRESS, &rreq->flags);
383-
wake_up_bit(&rreq->flags, NETFS_RREQ_IN_PROGRESS);
382+
clear_and_wake_up_bit(NETFS_RREQ_IN_PROGRESS, &rreq->flags);
384383

385384
trace_netfs_rreq(rreq, netfs_rreq_trace_done);
386385
netfs_clear_subrequests(rreq, false);

fs/netfs/write_collect.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -501,8 +501,7 @@ static void netfs_collect_write_results(struct netfs_io_request *wreq)
501501
goto need_retry;
502502
if ((notes & MADE_PROGRESS) && test_bit(NETFS_RREQ_PAUSE, &wreq->flags)) {
503503
trace_netfs_rreq(wreq, netfs_rreq_trace_unpause);
504-
clear_bit_unlock(NETFS_RREQ_PAUSE, &wreq->flags);
505-
wake_up_bit(&wreq->flags, NETFS_RREQ_PAUSE);
504+
clear_and_wake_up_bit(NETFS_RREQ_PAUSE, &wreq->flags);
506505
}
507506

508507
if (notes & NEED_REASSESS) {
@@ -605,8 +604,7 @@ void netfs_write_collection_worker(struct work_struct *work)
605604

606605
_debug("finished");
607606
trace_netfs_rreq(wreq, netfs_rreq_trace_wake_ip);
608-
clear_bit_unlock(NETFS_RREQ_IN_PROGRESS, &wreq->flags);
609-
wake_up_bit(&wreq->flags, NETFS_RREQ_IN_PROGRESS);
607+
clear_and_wake_up_bit(NETFS_RREQ_IN_PROGRESS, &wreq->flags);
610608

611609
if (wreq->iocb) {
612610
size_t written = min(wreq->transferred, wreq->len);
@@ -714,8 +712,7 @@ void netfs_write_subrequest_terminated(void *_op, ssize_t transferred_or_error,
714712

715713
trace_netfs_sreq(subreq, netfs_sreq_trace_terminated);
716714

717-
clear_bit_unlock(NETFS_SREQ_IN_PROGRESS, &subreq->flags);
718-
wake_up_bit(&subreq->flags, NETFS_SREQ_IN_PROGRESS);
715+
clear_and_wake_up_bit(NETFS_SREQ_IN_PROGRESS, &subreq->flags);
719716

720717
/* If we are at the head of the queue, wake up the collector,
721718
* transferring a ref to it if we were the ones to do so.

0 commit comments

Comments
 (0)