Patch "cifs: Fix server re-repick on subrequest retry" has been added to the 6.10-stable tree
Subsystems (2)
[email protected]
AppliedThis is a note to let you know that I've just added the patch titled
cifs: Fix server re-repick on subrequest retry
to the 6.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
cifs-fix-server-re-repick-on-subrequest-retry.patch
and it can be found in the queue-6.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From de40579b903883274fe203865f29d66b168b7236 Mon Sep 17 00:00:00 2001
From: David Howells <[email protected]>
Date: Thu, 18 Jul 2024 20:19:32 +0100
Subject: cifs: Fix server re-repick on subrequest retry
From: David Howells <[email protected]>
commit de40579b903883274fe203865f29d66b168b7236 upstream.
When a subrequest is marked for needing retry, netfs will call cifs_prepare_write() which will make cifs repick the server for the op before renegotiating credits; it then calls cifs_issue_write() which invokes smb2_async_writev() - which re-repicks the server.
If a different server is then selected, this causes the increment of server->in_flight to happen against one record and the decrement to happen against another, leading to misaccounting.
Fix this by just removing the repick code in smb2_async_writev(). As this is only called from netfslib-driven code, cifs_prepare_write() should always have been called first, and so server should never be NULL and the preparatory step is repeated in the event that we do a retry.
The problem manifests as a warning looking something like:
WARNING: CPU: 4 PID: 72896 at fs/smb/client/smb2ops.c:97 smb2_add_credits+0x3f0/0x9e0 [cifs] ... RIP: 0010:smb2_add_credits+0x3f0/0x9e0 [cifs] ... smb2_writev_callback+0x334/0x560 [cifs] cifs_demultiplex_thread+0x77a/0x11b0 [cifs] kthread+0x187/0x1d0 ret_from_fork+0x34/0x60 ret_from_fork_asm+0x1a/0x30
Which may be triggered by a number of different xfstests running against an Azure server in multichannel mode. generic/249 seems the most repeatable, but generic/215, generic/249 and generic/308 may also show it.
--- fs/smb/client/smb2pdu.c | 3 --- 1 file changed, 3 deletions(-)
fs/smb/client/smb2pdu.c +0 -3
@@ -4859,9 +4859,6 @@ smb2_async_writev(struct cifs_io_subrequest *wdata)struct cifs_io_parms *io_parms =NULL ;int credit_request; -if (!wdata->server ||test_bit (NETFS_SREQ_RETRYING , &wdata->subreq.flags)) - server = wdata->server =cifs_pick_channel (tcon->ses); -/* * in future we may get cifs_io_parms passed in from the caller, * but for now we construct it here...
Signature · 10 lines
2.45.2 Patches currently in stable-queue which might be from [email protected] are queue-6.10/cifs-fix-server-re-repick-on-subrequest-retry.patch queue-6.10/cifs-fix-setting-of-zero_point-after-dio-write.patch queue-6.10/cifs-fix-missing-error-code-set.patch queue-6.10/cifs-fix-missing-fscache-invalidation.patch