netfs: Use bh-disabling spinlocks for rreq->lock

Use bh-disabling spinlocks when accessing rreq->lock because, in the
future, it may be twiddled from softirq context when cleanup is driven from
cache backend DIO completion.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: Jeff Layton <jlayton@kernel.org>
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
Link: https://lore.kernel.org/r/20240814203850.2240469-12-dhowells@redhat.com/
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/netfs/write_collect.c b/fs/netfs/write_collect.c
index 90abc21cc019f77d4d05813c2cfc6e4c8824635c..9a1b408d614ccf96c6e87e66afa76f6e102e9831 100644 (file)
--- a/fs/netfs/write_collect.c
+++ b/fs/netfs/write_collect.c
@@ -473,7 +473,7 @@ reassess_streams:
 
                cancel:
                        /* Remove if completely consumed. */
-                       spin_lock(&wreq->lock);
+                       spin_lock_bh(&wreq->lock);
 
                        remove = front;
                        list_del_init(&front->rreq_link);
@@ -489,7 +489,7 @@ reassess_streams:
                                }
                        }
 
-                       spin_unlock(&wreq->lock);
+                       spin_unlock_bh(&wreq->lock);
                        netfs_put_subrequest(remove, false,
                                             notes & SAW_FAILURE ?
                                             netfs_sreq_trace_put_cancel :

diff --git a/fs/netfs/write_issue.c b/fs/netfs/write_issue.c
index 41db709ca1d34430bc5aa13625f2cfaca2f34c0b..7880a586343f5ee0874f7a1418e765fbca12e010 100644 (file)
--- a/fs/netfs/write_issue.c
+++ b/fs/netfs/write_issue.c
@@ -191,7 +191,7 @@ static void netfs_prepare_write(struct netfs_io_request *wreq,
         * the list.  The collector only goes nextwards and uses the lock to
         * remove entries off of the front.
         */
-       spin_lock(&wreq->lock);
+       spin_lock_bh(&wreq->lock);
        list_add_tail(&subreq->rreq_link, &stream->subrequests);
        if (list_is_first(&subreq->rreq_link, &stream->subrequests)) {
                stream->front = subreq;
@@ -202,7 +202,7 @@ static void netfs_prepare_write(struct netfs_io_request *wreq,
                }
        }
 
-       spin_unlock(&wreq->lock);
+       spin_unlock_bh(&wreq->lock);
 
        stream->construct = subreq;
 }