mirror of
https://github.com/torvalds/linux.git
synced 2026-05-24 07:03:03 +02:00
netfs: Fix missing barriers when accessing stream->subrequests locklessly
The list of subrequests attached to stream->subrequests is accessed without
locks by netfs_collect_read_results() and netfs_collect_write_results(),
and then they access subreq->flags without taking a barrier after getting
the subreq pointer from the list. Relatedly, the functions that build the
list don't use any sort of write barrier when constructing the list to make
sure that the NETFS_SREQ_IN_PROGRESS flag is perceived to be set first if
no lock is taken.
Fix this by:
(1) Add a new list_add_tail_release() function that uses a release barrier
to set the pointer to the new member of the list.
(2) Add a new list_first_entry_or_null_acquire() function that uses an
acquire barrier to read the pointer to the first member in a list (or
return NULL).
(3) Use list_add_tail_release() when adding a subreq to ->subrequests.
(4) Use list_first_entry_or_null_acquire() when initially accessing the
front of the list (when an item is removed, the pointer to the new
front iterm is obtained under the same lock).
Fixes: e2d46f2ec3 ("netfs: Change the read result collector to only use one work item")
Fixes: 288ace2f57 ("netfs: New writeback implementation")
Link: https://sashiko.dev/#/patchset/20260326104544.509518-1-dhowells%40redhat.com
Signed-off-by: David Howells <dhowells@redhat.com>
Link: https://patch.msgid.link/20260512123404.719402-4-dhowells@redhat.com
cc: Paulo Alcantara <pc@manguebit.org>
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
parent
cce18c263e
commit
b5782e2d46
|
|
@ -168,7 +168,8 @@ void netfs_queue_read(struct netfs_io_request *rreq,
|
|||
* remove entries off of the front.
|
||||
*/
|
||||
spin_lock(&rreq->lock);
|
||||
list_add_tail(&subreq->rreq_link, &stream->subrequests);
|
||||
/* Write IN_PROGRESS before pointer to new subreq */
|
||||
list_add_tail_release(&subreq->rreq_link, &stream->subrequests);
|
||||
if (list_is_first(&subreq->rreq_link, &stream->subrequests)) {
|
||||
if (!stream->active) {
|
||||
stream->collected_to = subreq->start;
|
||||
|
|
|
|||
|
|
@ -356,6 +356,7 @@ void netfs_wait_for_in_progress_stream(struct netfs_io_request *rreq,
|
|||
DEFINE_WAIT(myself);
|
||||
|
||||
list_for_each_entry(subreq, &stream->subrequests, rreq_link) {
|
||||
smp_rmb(); /* Read ->next before IN_PROGRESS. */
|
||||
if (!netfs_check_subreq_in_progress(subreq))
|
||||
continue;
|
||||
|
||||
|
|
|
|||
|
|
@ -205,8 +205,10 @@ static void netfs_collect_read_results(struct netfs_io_request *rreq)
|
|||
* in progress. The issuer thread may be adding stuff to the tail
|
||||
* whilst we're doing this.
|
||||
*/
|
||||
front = list_first_entry_or_null(&stream->subrequests,
|
||||
struct netfs_io_subrequest, rreq_link);
|
||||
front = list_first_entry_or_null_acquire(&stream->subrequests,
|
||||
struct netfs_io_subrequest, rreq_link);
|
||||
/* Read first subreq pointer before IN_PROGRESS flag. */
|
||||
|
||||
while (front) {
|
||||
size_t transferred;
|
||||
|
||||
|
|
|
|||
|
|
@ -228,8 +228,10 @@ static void netfs_collect_write_results(struct netfs_io_request *wreq)
|
|||
if (!smp_load_acquire(&stream->active))
|
||||
continue;
|
||||
|
||||
front = list_first_entry_or_null(&stream->subrequests,
|
||||
struct netfs_io_subrequest, rreq_link);
|
||||
front = list_first_entry_or_null_acquire(&stream->subrequests,
|
||||
struct netfs_io_subrequest, rreq_link);
|
||||
/* Read first subreq pointer before IN_PROGRESS flag. */
|
||||
|
||||
while (front) {
|
||||
trace_netfs_collect_sreq(wreq, front);
|
||||
//_debug("sreq [%x] %llx %zx/%zx",
|
||||
|
|
|
|||
|
|
@ -204,7 +204,8 @@ void netfs_prepare_write(struct netfs_io_request *wreq,
|
|||
* remove entries off of the front.
|
||||
*/
|
||||
spin_lock(&wreq->lock);
|
||||
list_add_tail(&subreq->rreq_link, &stream->subrequests);
|
||||
/* Write IN_PROGRESS before pointer to new subreq */
|
||||
list_add_tail_release(&subreq->rreq_link, &stream->subrequests);
|
||||
if (list_is_first(&subreq->rreq_link, &stream->subrequests)) {
|
||||
if (!stream->active) {
|
||||
stream->collected_to = subreq->start;
|
||||
|
|
|
|||
|
|
@ -191,6 +191,29 @@ static inline void list_add_tail(struct list_head *new, struct list_head *head)
|
|||
__list_add(new, head->prev, head);
|
||||
}
|
||||
|
||||
/**
|
||||
* list_add_tail_release - add a new entry with release barrier
|
||||
* @new: new entry to be added
|
||||
* @head: list head to add it before
|
||||
*
|
||||
* Insert a new entry before the specified head, using a release barrier to set
|
||||
* the ->next pointer that points to it. This is useful for implementing
|
||||
* queues, in particular one that the elements will be walked through forwards
|
||||
* locklessly.
|
||||
*/
|
||||
static inline void list_add_tail_release(struct list_head *new,
|
||||
struct list_head *head)
|
||||
{
|
||||
struct list_head *prev = head->prev;
|
||||
|
||||
if (__list_add_valid(new, prev, head)) {
|
||||
new->next = head;
|
||||
new->prev = prev;
|
||||
head->prev = new;
|
||||
smp_store_release(&prev->next, new);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Delete a list entry by making the prev/next entries
|
||||
* point to each other.
|
||||
|
|
@ -644,6 +667,20 @@ static inline void list_splice_tail_init(struct list_head *list,
|
|||
pos__ != head__ ? list_entry(pos__, type, member) : NULL; \
|
||||
})
|
||||
|
||||
/**
|
||||
* list_first_entry_or_null_acquire - get the first element from a list with barrier
|
||||
* @ptr: the list head to take the element from.
|
||||
* @type: the type of the struct this is embedded in.
|
||||
* @member: the name of the list_head within the struct.
|
||||
*
|
||||
* Note that if the list is empty, it returns NULL.
|
||||
*/
|
||||
#define list_first_entry_or_null_acquire(ptr, type, member) ({ \
|
||||
struct list_head *head__ = (ptr); \
|
||||
struct list_head *pos__ = smp_load_acquire(&head__->next); \
|
||||
pos__ != head__ ? list_entry(pos__, type, member) : NULL; \
|
||||
})
|
||||
|
||||
/**
|
||||
* list_last_entry_or_null - get the last element from a list
|
||||
* @ptr: the list head to take the element from.
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user