Skip to content

Commit da8cf4b

Browse files
dhowellsbrauner
authored andcommitted
netfs: Fix hang due to missing case in final DIO read result collection
When doing a DIO read, if the subrequests we issue fail and cause the request PAUSE flag to be set to put a pause on subrequest generation, we may complete collection of the subrequests (possibly discarding them) prior to the ALL_QUEUED flags being set. In such a case, netfs_read_collection() doesn't see ALL_QUEUED being set after netfs_collect_read_results() returns and will just return to the app (the collector can be seen unpausing the generator in the trace log). The subrequest generator can then set ALL_QUEUED and the app thread reaches netfs_wait_for_request(). This causes netfs_collect_in_app() to be called to see if we're done yet, but there's missing case here. netfs_collect_in_app() will see that a thread is active and set inactive to false, but won't see any subrequests in the read stream, and so won't set need_collect to true. The function will then just return 0, indicating that the caller should just sleep until further activity (which won't be forthcoming) occurs. Fix this by making netfs_collect_in_app() check to see if an active thread is complete - i.e. that ALL_QUEUED is set and the subrequests list is empty - and to skip the sleep return path. The collector will then be called which will clear the request IN_PROGRESS flag, allowing the app to progress. Fixes: 2b1424c ("netfs: Fix wait/wake to be consistent about the waitqueue used") Reported-by: Steve French <sfrench@samba.org> Signed-off-by: David Howells <dhowells@redhat.com> Link: https://lore.kernel.org/20250701163852.2171681-2-dhowells@redhat.com Tested-by: Steve French <sfrench@samba.org> Reviewed-by: Paulo Alcantara <pc@manguebit.org> cc: linux-cifs@vger.kernel.org cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent 8c44dac commit da8cf4b

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

fs/netfs/misc.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ void netfs_wait_for_in_progress_stream(struct netfs_io_request *rreq,
381381
static int netfs_collect_in_app(struct netfs_io_request *rreq,
382382
bool (*collector)(struct netfs_io_request *rreq))
383383
{
384-
bool need_collect = false, inactive = true;
384+
bool need_collect = false, inactive = true, done = true;
385385

386386
for (int i = 0; i < NR_IO_STREAMS; i++) {
387387
struct netfs_io_subrequest *subreq;
@@ -400,9 +400,11 @@ static int netfs_collect_in_app(struct netfs_io_request *rreq,
400400
need_collect = true;
401401
break;
402402
}
403+
if (subreq || !test_bit(NETFS_RREQ_ALL_QUEUED, &rreq->flags))
404+
done = false;
403405
}
404406

405-
if (!need_collect && !inactive)
407+
if (!need_collect && !inactive && !done)
406408
return 0; /* Sleep */
407409

408410
__set_current_state(TASK_RUNNING);

0 commit comments

Comments
 (0)