From: David Howells Date: Fri, 12 Jul 2024 10:54:11 +0000 (+0100) Subject: netfs: Use bh-disabling spinlocks for rreq->lock X-Git-Tag: v6.12-rc1~209^2~1^2~14 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=22de489d1e9d6c30bf9554a9c58bf1dc8d951f7d;p=linux-block.git 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 cc: Jeff Layton cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org Link: https://lore.kernel.org/r/20240814203850.2240469-12-dhowells@redhat.com/ # v2 Signed-off-by: Christian Brauner --- diff --git a/fs/netfs/write_collect.c b/fs/netfs/write_collect.c index 90abc21cc019..9a1b408d614c 100644 --- 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 41db709ca1d3..7880a586343f 100644 --- 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; }