Skip to contentSkip to conversation

cifs: on replayable errors back-off before replay, not after

PATCH Superseded [email protected] 3 participants 10 messages Jan 29 – Jan 31

Subsystems (3)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/4 cifs: on replayable errors back-off before replay, not after

From: Shyam Prasad N <[email protected]>

On replayable errors, we call smb2_should_replays that does these things today:
1. decide if we need to replay the command again
2. sleep to back-off the failed request
3. update the next sleep value

We will not be able to use this for async requests, when this is processed in callbacks (as this will be called in cifsd threads that should not sleep in response processing).

Modify the behaviour by taking the sleep out of smb2_should_replay and performing the sleep for back-off just before actually performing the replay.

---
 fs/smb/client/cached_dir.c |   6 +-
 fs/smb/client/smb2inode.c  |  21 +++++--
 fs/smb/client/smb2ops.c    |  32 ++++++++---
 fs/smb/client/smb2pdu.c    | 112 +++++++++++++++++++++++++++----------
 4 files changed, 129 insertions(+), 42 deletions(-)
fs/smb/client/cached_dir.c +5 -1
index 1db7ab6c2529c..df9977030d199 100644
@@ -154,7 +154,7 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon,
 	struct cached_fid *cfid;
 	struct cached_fids *cfids;
 	const char *npath;
-	int retries = 0, cur_sleep = 1;
+	int retries = 0, cur_sleep = 0;
 	__le32 lease_flags = 0;
 
 	if (cifs_sb->root == NULL)
@@ -304,6 +304,10 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon,
 	smb2_set_related(&rqst[1]);
 
 	if (retries) {
+		/* Back-off before retry */
+		if (cur_sleep)
+			msleep(cur_sleep);
+
 		smb2_set_replay(server, &rqst[0]);
 		smb2_set_replay(server, &rqst[1]);
 	}
fs/smb/client/smb2inode.c +16 -5
index 2ded3246600c0..498a26a7bd415 100644
@@ -188,7 +188,7 @@ static int smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon,
 	struct reparse_data_buffer *rbuf;
 	struct TCP_Server_Info *server;
 	int resp_buftype[MAX_COMPOUND];
-	int retries = 0, cur_sleep = 1;
+	int retries = 0, cur_sleep = 0;
 	__u8 delete_pending[8] = {1,};
 	struct kvec *rsp_iov, *iov;
 	struct inode *inode = NULL;
@@ -638,18 +638,26 @@ static int smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon,
 	num_rqst++;
 
 	if (cfile) {
-		if (retries)
+		if (retries) {
+			/* Back-off before retry */
+			if (cur_sleep)
+				msleep(cur_sleep);
 			for (i = 1; i < num_rqst - 2; i++)
 				smb2_set_replay(server, &rqst[i]);
+		}
 
 		rc = compound_send_recv(xid, ses, server,
 					flags, num_rqst - 2,
 					&rqst[1], &resp_buftype[1],
 					&rsp_iov[1]);
 	} else {
-		if (retries)
+		if (retries) {
+			/* Back-off before retry */
+			if (cur_sleep)
+				msleep(cur_sleep);
 			for (i = 0; i < num_rqst; i++)
 				smb2_set_replay(server, &rqst[i]);
+		}
 
 		rc = compound_send_recv(xid, ses, server,
 					flags, num_rqst,
@@ -1180,7 +1188,7 @@ smb2_unlink(const unsigned int xid, struct cifs_tcon *tcon, const char *name,
 {
 	struct kvec open_iov[SMB2_CREATE_IOV_SIZE];
 	__le16 *utf16_path __free(kfree) = NULL;
-	int retries = 0, cur_sleep = 1;
+	int retries = 0, cur_sleep = 0;
 	struct TCP_Server_Info *server;
 	struct cifs_open_parms oparms;
 	struct smb2_create_req *creq;
@@ -1242,6 +1250,9 @@ smb2_unlink(const unsigned int xid, struct cifs_tcon *tcon, const char *name,
 		goto err_free;
 
 	if (retries) {
+		/* Back-off before retry */
+		if (cur_sleep)
+			msleep(cur_sleep);
 		for (int i = 0; i < ARRAY_SIZE(rqst);  i++)
 			smb2_set_replay(server, &rqst[i]);
 	}
@@ -1262,7 +1273,7 @@ smb2_unlink(const unsigned int xid, struct cifs_tcon *tcon, const char *name,
 	if (rc == -EINVAL && dentry) {
 		dentry = NULL;
 		retries = 0;
-		cur_sleep = 1;
+		cur_sleep = 0;
 		goto again;
 	}
 	/*
fs/smb/client/smb2ops.c +24 -8
index a16ded46b5a26..7980c6f80730f 100644
@@ -1184,7 +1184,7 @@ smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon,
 	struct smb2_file_full_ea_info *ea;
 	struct smb2_query_info_rsp *rsp;
 	int rc, used_len = 0;
-	int retries = 0, cur_sleep = 1;
+	int retries = 0, cur_sleep = 0;
 
 replay_again:
 	/* reinitialize for possible replay */
@@ -1314,6 +1314,9 @@ smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon,
 	smb2_set_related(&rqst[2]);
 
 	if (retries) {
+		/* Back-off before retry */
+		if (cur_sleep)
+			msleep(cur_sleep);
 		smb2_set_replay(server, &rqst[0]);
 		smb2_set_replay(server, &rqst[1]);
 		smb2_set_replay(server, &rqst[2]);
@@ -1582,7 +1585,7 @@ smb2_ioctl_query_info(const unsigned int xid,
 	void *data[2];
 	int create_options = is_dir ? CREATE_NOT_FILE : CREATE_NOT_DIR;
 	void (*free_req1_func)(struct smb_rqst *r);
-	int retries = 0, cur_sleep = 1;
+	int retries = 0, cur_sleep = 0;
 
 replay_again:
 	/* reinitialize for possible replay */
@@ -1731,6 +1734,9 @@ smb2_ioctl_query_info(const unsigned int xid,
 	smb2_set_related(&rqst[2]);
 
 	if (retries) {
+		/* Back-off before retry */
+		if (cur_sleep)
+			msleep(cur_sleep);
 		smb2_set_replay(server, &rqst[0]);
 		smb2_set_replay(server, &rqst[1]);
 		smb2_set_replay(server, &rqst[2]);
@@ -2440,7 +2446,7 @@ smb2_query_dir_first(const unsigned int xid, struct cifs_tcon *tcon,
 	struct smb2_query_directory_rsp *qd_rsp = NULL;
 	struct smb2_create_rsp *op_rsp = NULL;
 	struct TCP_Server_Info *server;
-	int retries = 0, cur_sleep = 1;
+	int retries = 0, cur_sleep = 0;
 
 replay_again:
 	/* reinitialize for possible replay */
@@ -2498,6 +2504,9 @@ smb2_query_dir_first(const unsigned int xid, struct cifs_tcon *tcon,
 	smb2_set_related(&rqst[1]);
 
 	if (retries) {
+		/* Back-off before retry */
+		if (cur_sleep)
+			msleep(cur_sleep);
 		smb2_set_replay(server, &rqst[0]);
 		smb2_set_replay(server, &rqst[1]);
 	}
@@ -2774,10 +2783,14 @@ bool smb2_should_replay(struct cifs_tcon *tcon,
 		return false;
 
 	if (tcon->retry || (*pretries)++ < tcon->ses->server->retrans) {
-		msleep(*pcur_sleep);
-		(*pcur_sleep) = ((*pcur_sleep) << 1);
-		if ((*pcur_sleep) > CIFS_MAX_SLEEP)
-			(*pcur_sleep) = CIFS_MAX_SLEEP;
+		/* Update sleep time for exponential backoff */
+		if (!(*pcur_sleep))
+			(*pcur_sleep) = 1;
+		else {
+			(*pcur_sleep) = ((*pcur_sleep) << 1);
+			if ((*pcur_sleep) > CIFS_MAX_SLEEP)
+				(*pcur_sleep) = CIFS_MAX_SLEEP;
+		}
 		return true;
 	}
 
@@ -2808,7 +2821,7 @@ smb2_query_info_compound(const unsigned int xid, struct cifs_tcon *tcon,
 	int rc;
 	__le16 *utf16_path;
 	struct cached_fid *cfid;
-	int retries = 0, cur_sleep = 1;
+	int retries = 0, cur_sleep = 0;
 
 replay_again:
 	/* reinitialize for possible replay */
@@ -2898,6 +2911,9 @@ smb2_query_info_compound(const unsigned int xid, struct cifs_tcon *tcon,
 	smb2_set_related(&rqst[2]);
 
 	if (retries) {
+		/* Back-off before retry */
+		if (cur_sleep)
+			msleep(cur_sleep);
 		if (!cfid) {
 			smb2_set_replay(server, &rqst[0]);
 			smb2_set_replay(server, &rqst[2]);
fs/smb/client/smb2pdu.c +84 -28

294 lines not on this page · raw message

Signature · 1 line
2.43.0
#1 lore raw

PATCH v3 2/4 netfs: when subreq is marked for retry, do not check if it faced an error

From: Shyam Prasad N <[email protected]>

The *_subreq_terminated functions today only process the NEED_RETRY flag when the subreq was successful or failed with EAGAIN error. However, there could be other retriable errors for network filesystems.

Avoid this by processing the NEED_RETRY irrespective of the error code faced by the subreq. If it was specifically marked for retry, the error code must not matter.

---
 fs/netfs/read_collect.c  | 10 +++++++++-
 fs/netfs/read_retry.c    |  4 ++--
 fs/netfs/write_collect.c |  8 ++++----
 fs/netfs/write_issue.c   |  1 +
 4 files changed, 16 insertions(+), 7 deletions(-)
fs/netfs/read_collect.c +9 -1
index a95e7aadafd07..7ac11125ca028 100644
@@ -546,19 +546,27 @@ void netfs_read_subreq_terminated(struct netfs_io_subrequest *subreq)
 		}
 	}
 
+	/* if need retry is set, error should not matter. pause the rreq */
+	if (test_bit(NETFS_SREQ_NEED_RETRY, &subreq->flags)) {
+		trace_netfs_rreq(rreq, netfs_rreq_trace_set_pause);
+		set_bit(NETFS_RREQ_PAUSE, &rreq->flags);
+		goto skip_error_checks;
+	}
+
 	if (unlikely(subreq->error < 0)) {
-		trace_netfs_failure(rreq, subreq, subreq->error, netfs_fail_read);
 		if (subreq->source == NETFS_READ_FROM_CACHE) {
 			netfs_stat(&netfs_n_rh_read_failed);
 			__set_bit(NETFS_SREQ_NEED_RETRY, &subreq->flags);
 		} else {
 			netfs_stat(&netfs_n_rh_download_failed);
 			__set_bit(NETFS_SREQ_FAILED, &subreq->flags);
+			trace_netfs_failure(rreq, subreq, subreq->error, netfs_fail_read);
 		}
 		trace_netfs_rreq(rreq, netfs_rreq_trace_set_pause);
 		set_bit(NETFS_RREQ_PAUSE, &rreq->flags);
 	}
 
+skip_error_checks:
 	trace_netfs_sreq(subreq, netfs_sreq_trace_terminated);
 	netfs_subreq_clear_in_progress(subreq);
 	netfs_put_subrequest(subreq, netfs_sreq_trace_put_terminated);
fs/netfs/read_retry.c +2 -2
index b99e84a8170af..7793ba5e3e8fc 100644
@@ -12,6 +12,7 @@
 static void netfs_reissue_read(struct netfs_io_request *rreq,
 			       struct netfs_io_subrequest *subreq)
 {
+	subreq->error = 0;
 	__clear_bit(NETFS_SREQ_MADE_PROGRESS, &subreq->flags);
 	__set_bit(NETFS_SREQ_IN_PROGRESS, &subreq->flags);
 	netfs_stat(&netfs_n_rh_retry_read_subreq);
@@ -242,8 +243,7 @@ static void netfs_retry_read_subrequests(struct netfs_io_request *rreq)
 	subreq = list_next_entry(subreq, rreq_link);
 abandon:
 	list_for_each_entry_from(subreq, &stream->subrequests, rreq_link) {
-		if (!subreq->error &&
-		    !test_bit(NETFS_SREQ_FAILED, &subreq->flags) &&
+		if (!test_bit(NETFS_SREQ_FAILED, &subreq->flags) &&
 		    !test_bit(NETFS_SREQ_NEED_RETRY, &subreq->flags))
 			continue;
 		subreq->error = -ENOMEM;
fs/netfs/write_collect.c +4 -4
index cbf3d9194c7bf..61eab34ea67ef 100644
@@ -492,11 +492,11 @@ void netfs_write_subrequest_terminated(void *_op, ssize_t transferred_or_error)
 
 	if (IS_ERR_VALUE(transferred_or_error)) {
 		subreq->error = transferred_or_error;
-		if (subreq->error == -EAGAIN)
-			set_bit(NETFS_SREQ_NEED_RETRY, &subreq->flags);
-		else
+		/* if need retry is set, error should not matter */
+		if (!test_bit(NETFS_SREQ_NEED_RETRY, &subreq->flags)) {
 			set_bit(NETFS_SREQ_FAILED, &subreq->flags);
-		trace_netfs_failure(wreq, subreq, transferred_or_error, netfs_fail_write);
+			trace_netfs_failure(wreq, subreq, transferred_or_error, netfs_fail_write);
+		}
 
 		switch (subreq->source) {
 		case NETFS_WRITE_TO_CACHE:
fs/netfs/write_issue.c +1 -0
index dd8743bc8d7fe..34894da5a23ec 100644
@@ -250,6 +250,7 @@ void netfs_reissue_write(struct netfs_io_stream *stream,
 	iov_iter_truncate(&subreq->io_iter, size);
 
 	subreq->retry_count++;
+	subreq->error = 0;
 	__clear_bit(NETFS_SREQ_MADE_PROGRESS, &subreq->flags);
 	__set_bit(NETFS_SREQ_IN_PROGRESS, &subreq->flags);
 	netfs_stat(&netfs_n_wh_retry_write_subreq);
Signature · 1 line
2.43.0
maintainer Acked-by on v3 2/4
#2 lore raw

Re: [PATCH v3 2/4] netfs: when subreq is marked for retry, do not check if it faced an error

fs/netfs/read_collect.c void netfs_read_subreq_terminated(struct netfs_io_subrequest *subreq) · line 549

Quoted 1 line · [email protected] wrote:
fs/netfs/read_collect.c +1 -0
+	/* if need retry is set, error should not matter. pause the rreq */

I think I'd say:

	/* If need retry is set, error should not matter unless we hit too
	 * many retries.  Pause the generation of new subreqs.
	 */

But other than that:

#3 lore raw

PATCH v3 3/4 netfs: avoid double increment of retry_count in subreq

In reply to [email protected]

From: Shyam Prasad N <[email protected]>

This change fixes the instance of double incrementing of retry_count. The increment of this count already happens when netfs_reissue_write gets called. Incrementing this value before is not necessary.

Fixes 4acb665cf4f3 ("netfs: Work around recursion by abandoning retry if nothing read")
Cc David Howells <[email protected]>
---
 fs/netfs/write_retry.c | 1 -
 1 file changed, 1 deletion(-)
fs/netfs/write_retry.c +0 -1
index fc9c3e0d34d81..29489a23a2209 100644
@@ -98,7 +98,6 @@ static void netfs_retry_write_stream(struct netfs_io_request *wreq,
 			subreq->start	= start;
 			subreq->len	= len;
 			__clear_bit(NETFS_SREQ_NEED_RETRY, &subreq->flags);
-			subreq->retry_count++;
 			trace_netfs_sreq(subreq, netfs_sreq_trace_retry);
 
 			/* Renegotiate max_len (wsize) */
Signature · 1 line
2.43.0
#5 lore raw

PATCH v3 4/4 cifs: make retry logic in read/write path consistent with other paths

In reply to [email protected]

From: Shyam Prasad N <[email protected]>

Today in most other code paths in cifs.ko, the decision of whether to retry a command depends on two mount options: retrans and hard. However, the read/write code paths diverged from this and would only retry if the error returned was -EAGAIN. However, there are other replayable errors in cifs.ko, for which is_replayable_errors helper was written. This change makes read/write codepaths consistent with other code-paths.

This change also does the following:
1. The SMB2 read/write code diverged significantly (presumably since they were changed during netfs refactor at different times). This changes the response verification logic to be consistent.
2. Moves the netfs tracepoints to slightly different locations in order to make debugging easier.

---
 fs/smb/client/cifsglob.h |  2 +
 fs/smb/client/smb2pdu.c  | 79 ++++++++++++++++++++++++++++++++++++----
 2 files changed, 74 insertions(+), 7 deletions(-)
fs/smb/client/cifsglob.h +2 -0
index 3eca5bfb70303..f6ebd3fd176d7 100644
@@ -1507,6 +1507,8 @@ struct cifs_io_subrequest {
 	int				result;
 	bool				have_xid;
 	bool				replay;
+	unsigned int			retries;	/* number of retries so far */
+	unsigned int			cur_sleep;	/* time to sleep before replay */
 	struct kvec			iov[2];
 	struct TCP_Server_Info		*server;
 #ifdef CONFIG_CIFS_SMB_DIRECT
fs/smb/client/smb2pdu.c +72 -7

153 lines not on this page · raw message

Signature · 1 line
2.43.0
maintainer
#6 lore raw

Re: [PATCH v3 4/4] cifs: make retry logic in read/write path consistent with other paths

fs/smb/client/cifsglob.h struct cifs_io_subrequest { · line 1510

Quoted 1 line · [email protected] wrote:
fs/smb/client/cifsglob.h +1 -0
+	unsigned int			retries;	/* number of retries so far */

Is this redundant with netfs_io_subrequest::retry_count? (This can be changed from u8 to unsigned int if it helps). I suspect that there might be a fight over who gets to increment it, though.

fs/smb/client/smb2pdu.c smb2_readv_callback(struct TCP_Server_Info *server, struct mid_q_entry *mid) · line 4661

Quoted 3 lines
fs/smb/client/smb2pdu.c +3 -0
+				if (is_replayable_error(rc)) {
+					trace_netfs_sreq(&rdata->subreq, netfs_sreq_trace_io_req_submitted);
+					__set_bit(NETFS_SREQ_NEED_RETRY, &rdata->subreq.flags);

You didn't see MID_RESPONSE_SUBMITTED, so I would pick a different trace value there.

David

#7 lore raw

Re: [PATCH v3 4/4] cifs: make retry logic in read/write path consistent with other paths

Quoted 8 lines · David Howells
Quoted 1 line · [email protected] wrote:

+ unsigned int retries; /* number of retries so far */

Is this redundant with netfs_io_subrequest::retry_count? (This can be changed from u8 to unsigned int if it helps). I suspect that there might be a fight over who gets to increment it, though.

This is mainly used to track the number of retransmissions from the client (retrans mount option) when soft mounts are used. I don't mind netfs doing it's own tracking (the purpose maybe different from what is there here). I don't see a major issue if they're not in sync with each other too.
So I'm okay with that.

Quoted 7 lines

fs/smb/client/smb2pdu.c smb2_readv_callback(struct TCP_Server_Info *server, struct mid_q_entry *mid) · line 4661

Quoted 4 lines
fs/smb/client/smb2pdu.c +3 -0
+                             if (is_replayable_error(rc)) {
+                                     trace_netfs_sreq(&rdata->subreq, netfs_sreq_trace_io_req_submitted);
+                                     __set_bit(NETFS_SREQ_NEED_RETRY, &rdata->subreq.flags);

You didn't see MID_RESPONSE_SUBMITTED, so I would pick a different trace value there.

That's a typo. Thanks for reviewing. Will fix it.

Quoted 3 lines

David

Signature · 2 lines
Regards,
Shyam
#8 lore raw
In reply to [email protected]

Have updated cifs-2.6.git for-next with these four patches

Quoted 547 lines · On Thu, Jan 29, 2026 at 11:37 AM <[email protected]> wrote:

From: Shyam Prasad N <[email protected]>

On replayable errors, we call smb2_should_replays that does these things today:
1. decide if we need to replay the command again
2. sleep to back-off the failed request
3. update the next sleep value

We will not be able to use this for async requests, when this is processed in callbacks (as this will be called in cifsd threads that should not sleep in response processing).

Modify the behaviour by taking the sleep out of smb2_should_replay and performing the sleep for back-off just before actually performing the replay.

---
 fs/smb/client/cached_dir.c |   6 +-
 fs/smb/client/smb2inode.c  |  21 +++++--
 fs/smb/client/smb2ops.c    |  32 ++++++++---
 fs/smb/client/smb2pdu.c    | 112 +++++++++++++++++++++++++++----------
 4 files changed, 129 insertions(+), 42 deletions(-)
fs/smb/client/cached_dir.c +5 -1
index 1db7ab6c2529c..df9977030d199 100644
@@ -154,7 +154,7 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon,
        struct cached_fid *cfid;
        struct cached_fids *cfids;
        const char *npath;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
        __le32 lease_flags = 0;
 
        if (cifs_sb->root == NULL)
@@ -304,6 +304,10 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon,
        smb2_set_related(&rqst[1]);
 
        if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
+
                smb2_set_replay(server, &rqst[0]);
                smb2_set_replay(server, &rqst[1]);
        }
fs/smb/client/smb2inode.c +16 -5
index 2ded3246600c0..498a26a7bd415 100644
@@ -188,7 +188,7 @@ static int smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon,
        struct reparse_data_buffer *rbuf;
        struct TCP_Server_Info *server;
        int resp_buftype[MAX_COMPOUND];
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
        __u8 delete_pending[8] = {1,};
        struct kvec *rsp_iov, *iov;
        struct inode *inode = NULL;
@@ -638,18 +638,26 @@ static int smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon,
        num_rqst++;
 
        if (cfile) {
-               if (retries)
+               if (retries) {
+                       /* Back-off before retry */
+                       if (cur_sleep)
+                               msleep(cur_sleep);
                        for (i = 1; i < num_rqst - 2; i++)
                                smb2_set_replay(server, &rqst[i]);
+               }
 
                rc = compound_send_recv(xid, ses, server,
                                        flags, num_rqst - 2,
                                        &rqst[1], &resp_buftype[1],
                                        &rsp_iov[1]);
        } else {
-               if (retries)
+               if (retries) {
+                       /* Back-off before retry */
+                       if (cur_sleep)
+                               msleep(cur_sleep);
                        for (i = 0; i < num_rqst; i++)
                                smb2_set_replay(server, &rqst[i]);
+               }
 
                rc = compound_send_recv(xid, ses, server,
                                        flags, num_rqst,
@@ -1180,7 +1188,7 @@ smb2_unlink(const unsigned int xid, struct cifs_tcon *tcon, const char *name,
 {
        struct kvec open_iov[SMB2_CREATE_IOV_SIZE];
        __le16 *utf16_path __free(kfree) = NULL;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
        struct TCP_Server_Info *server;
        struct cifs_open_parms oparms;
        struct smb2_create_req *creq;
@@ -1242,6 +1250,9 @@ smb2_unlink(const unsigned int xid, struct cifs_tcon *tcon, const char *name,
                goto err_free;
 
        if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                for (int i = 0; i < ARRAY_SIZE(rqst);  i++)
                        smb2_set_replay(server, &rqst[i]);
        }
@@ -1262,7 +1273,7 @@ smb2_unlink(const unsigned int xid, struct cifs_tcon *tcon, const char *name,
        if (rc == -EINVAL && dentry) {
                dentry = NULL;
                retries = 0;
-               cur_sleep = 1;
+               cur_sleep = 0;
                goto again;
        }
        /*
fs/smb/client/smb2ops.c +24 -8
index a16ded46b5a26..7980c6f80730f 100644
@@ -1184,7 +1184,7 @@ smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon,
        struct smb2_file_full_ea_info *ea;
        struct smb2_query_info_rsp *rsp;
        int rc, used_len = 0;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -1314,6 +1314,9 @@ smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon,
        smb2_set_related(&rqst[2]);
 
        if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst[0]);
                smb2_set_replay(server, &rqst[1]);
                smb2_set_replay(server, &rqst[2]);
@@ -1582,7 +1585,7 @@ smb2_ioctl_query_info(const unsigned int xid,
        void *data[2];
        int create_options = is_dir ? CREATE_NOT_FILE : CREATE_NOT_DIR;
        void (*free_req1_func)(struct smb_rqst *r);
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -1731,6 +1734,9 @@ smb2_ioctl_query_info(const unsigned int xid,
        smb2_set_related(&rqst[2]);
 
        if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst[0]);
                smb2_set_replay(server, &rqst[1]);
                smb2_set_replay(server, &rqst[2]);
@@ -2440,7 +2446,7 @@ smb2_query_dir_first(const unsigned int xid, struct cifs_tcon *tcon,
        struct smb2_query_directory_rsp *qd_rsp = NULL;
        struct smb2_create_rsp *op_rsp = NULL;
        struct TCP_Server_Info *server;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -2498,6 +2504,9 @@ smb2_query_dir_first(const unsigned int xid, struct cifs_tcon *tcon,
        smb2_set_related(&rqst[1]);
 
        if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst[0]);
                smb2_set_replay(server, &rqst[1]);
        }
@@ -2774,10 +2783,14 @@ bool smb2_should_replay(struct cifs_tcon *tcon,
                return false;
 
        if (tcon->retry || (*pretries)++ < tcon->ses->server->retrans) {
-               msleep(*pcur_sleep);
-               (*pcur_sleep) = ((*pcur_sleep) << 1);
-               if ((*pcur_sleep) > CIFS_MAX_SLEEP)
-                       (*pcur_sleep) = CIFS_MAX_SLEEP;
+               /* Update sleep time for exponential backoff */
+               if (!(*pcur_sleep))
+                       (*pcur_sleep) = 1;
+               else {
+                       (*pcur_sleep) = ((*pcur_sleep) << 1);
+                       if ((*pcur_sleep) > CIFS_MAX_SLEEP)
+                               (*pcur_sleep) = CIFS_MAX_SLEEP;
+               }
                return true;
        }
 
@@ -2808,7 +2821,7 @@ smb2_query_info_compound(const unsigned int xid, struct cifs_tcon *tcon,
        int rc;
        __le16 *utf16_path;
        struct cached_fid *cfid;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -2898,6 +2911,9 @@ smb2_query_info_compound(const unsigned int xid, struct cifs_tcon *tcon,
        smb2_set_related(&rqst[2]);
 
        if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                if (!cfid) {
                        smb2_set_replay(server, &rqst[0]);
                        smb2_set_replay(server, &rqst[2]);
fs/smb/client/smb2pdu.c +84 -29
index 5d57c895ca37a..7d75ba675f774 100644
@@ -2904,7 +2904,7 @@ int smb311_posix_mkdir(const unsigned int xid, struct inode *inode,
        unsigned int total_len;
        __le16 *utf16_path = NULL;
        struct TCP_Server_Info *server;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -3016,8 +3016,12 @@ int smb311_posix_mkdir(const unsigned int xid, struct inode *inode,
        trace_smb3_posix_mkdir_enter(xid, tcon->tid, ses->Suid, full_path, CREATE_NOT_FILE,
                                    FILE_WRITE_ATTRIBUTES);
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        /* resource #4: response buffer */
        rc = cifs_send_recv(xid, ses, server,
@@ -3265,7 +3269,7 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms *oparms, __le16 *path,
        int resp_buftype = CIFS_NO_BUFFER;
        int rc = 0;
        int flags = 0;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -3293,8 +3297,12 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms *oparms, __le16 *path,
        trace_smb3_open_enter(xid, tcon->tid, tcon->ses->Suid, oparms->path,
                oparms->create_options, oparms->desired_access);
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, ses, server,
                            &rqst, &resp_buftype, flags,
@@ -3478,7 +3486,7 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
        int resp_buftype = CIFS_NO_BUFFER;
        int rc = 0;
        int flags = 0;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
        if (!tcon)
                return smb_EIO(smb_eio_trace_null_pointers);
@@ -3518,8 +3526,12 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
        if (rc)
                goto ioctl_exit;
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, ses, server,
                            &rqst, &resp_buftype, flags,
@@ -3675,7 +3687,7 @@ __SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
        int rc = 0;
        int flags = 0;
        bool query_attrs = false;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -3707,8 +3719,12 @@ __SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
        if (rc)
                goto close_exit;
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, ses, server,
                            &rqst, &resp_buftype, flags, &rsp_iov);
@@ -3878,7 +3894,7 @@ query_info(const unsigned int xid, struct cifs_tcon *tcon,
        struct TCP_Server_Info *server;
        int flags = 0;
        bool allocated = false;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
        cifs_dbg(FYI, "Query Info\n");
 
@@ -3912,8 +3928,12 @@ query_info(const unsigned int xid, struct cifs_tcon *tcon,
        trace_smb3_query_info_enter(xid, persistent_fid, tcon->tid,
                                    ses->Suid, info_class, (__u32)info_type);
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, ses, server,
                            &rqst, &resp_buftype, flags, &rsp_iov);
@@ -4069,7 +4089,7 @@ SMB2_change_notify(const unsigned int xid, struct cifs_tcon *tcon,
        int resp_buftype = CIFS_NO_BUFFER;
        int flags = 0;
        int rc = 0;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -4100,8 +4120,12 @@ SMB2_change_notify(const unsigned int xid, struct cifs_tcon *tcon,
        trace_smb3_notify_enter(xid, persistent_fid, tcon->tid, ses->Suid,
                                (u8)watch_tree, completion_filter);
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, ses, server,
                            &rqst, &resp_buftype, flags, &rsp_iov);
@@ -4405,7 +4429,7 @@ SMB2_flush(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
        int resp_buftype = CIFS_NO_BUFFER;
        int flags = 0;
        int rc = 0;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -4431,8 +4455,12 @@ SMB2_flush(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
 
        trace_smb3_flush_enter(xid, persistent_fid, tcon->tid, ses->Suid);
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, ses, server,
                            &rqst, &resp_buftype, flags, &rsp_iov);
@@ -5190,7 +5218,7 @@ SMB2_write(const unsigned int xid, struct cifs_io_parms *io_parms,
        int flags = 0;
        unsigned int total_len;
        struct TCP_Server_Info *server;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -5238,8 +5266,12 @@ SMB2_write(const unsigned int xid, struct cifs_io_parms *io_parms,
        rqst.rq_iov = iov;
        rqst.rq_nvec = n_vec + 1;
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, io_parms->tcon->ses, server,
                            &rqst,
@@ -5590,7 +5622,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
        struct cifs_ses *ses = tcon->ses;
        struct TCP_Server_Info *server;
        int flags = 0;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -5615,8 +5647,12 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
        if (rc)
                goto qdir_exit;
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, ses, server,
                            &rqst, &resp_buftype, flags, &rsp_iov);
@@ -5725,7 +5761,7 @@ send_set_info(const unsigned int xid, struct cifs_tcon *tcon,
        struct cifs_ses *ses = tcon->ses;
        struct TCP_Server_Info *server;
        int flags = 0;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -5758,8 +5794,12 @@ send_set_info(const unsigned int xid, struct cifs_tcon *tcon,
                return rc;
        }
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, ses, server,
                            &rqst, &resp_buftype, flags,
@@ -5838,7 +5878,7 @@ SMB2_oplock_break(const unsigned int xid, struct cifs_tcon *tcon,
        struct kvec iov[1];
        struct kvec rsp_iov;
        int resp_buf_type;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -5868,8 +5908,12 @@ SMB2_oplock_break(const unsigned int xid, struct cifs_tcon *tcon,
        rqst.rq_iov = iov;
        rqst.rq_nvec = 1;
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, ses, server,
                            &rqst, &resp_buf_type, flags, &rsp_iov);
@@ -5971,7 +6015,7 @@ SMB311_posix_qfs_info(const unsigned int xid, struct cifs_tcon *tcon,
        struct TCP_Server_Info *server;
        FILE_SYSTEM_POSIX_INFO *info = NULL;
        int flags = 0;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -5992,8 +6036,12 @@ SMB311_posix_qfs_info(const unsigned int xid, struct cifs_tcon *tcon,
        rqst.rq_iov = &iov;
        rqst.rq_nvec = 1;
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, ses, server,
                            &rqst, &resp_buftype, flags, &rsp_iov);
@@ -6036,7 +6084,7 @@ SMB2_QFS_attr(const unsigned int xid, struct cifs_tcon *tcon,
        struct TCP_Server_Info *server;
        unsigned int rsp_len, offset;
        int flags = 0;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -6073,8 +6121,12 @@ SMB2_QFS_attr(const unsigned int xid, struct cifs_tcon *tcon,
        rqst.rq_iov = &iov;
        rqst.rq_nvec = 1;
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, ses, server,
                            &rqst, &resp_buftype, flags, &rsp_iov);
@@ -6136,7 +6188,7 @@ smb2_lockv(const unsigned int xid, struct cifs_tcon *tcon,
        int flags = CIFS_NO_RSP_BUF;
        unsigned int total_len;
        struct TCP_Server_Info *server;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -6172,8 +6224,12 @@ smb2_lockv(const unsigned int xid, struct cifs_tcon *tcon,
        rqst.rq_iov = iov;
        rqst.rq_nvec = 2;
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, tcon->ses, server,
                            &rqst, &resp_buf_type, flags,
--

2.43.0

Signature · 3 lines
Thanks,

Steve
#9 lore raw
Quoted 556 lines · Steve French

Have updated cifs-2.6.git for-next with these four patches

Quoted 545 lines · On Thu, Jan 29, 2026 at 11:37 AM <[email protected]> wrote:

From: Shyam Prasad N <[email protected]>

On replayable errors, we call smb2_should_replays that does these things today:
1. decide if we need to replay the command again
2. sleep to back-off the failed request
3. update the next sleep value

We will not be able to use this for async requests, when this is processed in callbacks (as this will be called in cifsd threads that should not sleep in response processing).

Modify the behaviour by taking the sleep out of smb2_should_replay and performing the sleep for back-off just before actually performing the replay.

---
 fs/smb/client/cached_dir.c |   6 +-
 fs/smb/client/smb2inode.c  |  21 +++++--
 fs/smb/client/smb2ops.c    |  32 ++++++++---
 fs/smb/client/smb2pdu.c    | 112 +++++++++++++++++++++++++++----------
 4 files changed, 129 insertions(+), 42 deletions(-)
fs/smb/client/cached_dir.c +5 -1
index 1db7ab6c2529c..df9977030d199 100644
@@ -154,7 +154,7 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon,
        struct cached_fid *cfid;
        struct cached_fids *cfids;
        const char *npath;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
        __le32 lease_flags = 0;
 
        if (cifs_sb->root == NULL)
@@ -304,6 +304,10 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon,
        smb2_set_related(&rqst[1]);
 
        if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
+
                smb2_set_replay(server, &rqst[0]);
                smb2_set_replay(server, &rqst[1]);
        }
fs/smb/client/smb2inode.c +16 -5
index 2ded3246600c0..498a26a7bd415 100644
@@ -188,7 +188,7 @@ static int smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon,
        struct reparse_data_buffer *rbuf;
        struct TCP_Server_Info *server;
        int resp_buftype[MAX_COMPOUND];
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
        __u8 delete_pending[8] = {1,};
        struct kvec *rsp_iov, *iov;
        struct inode *inode = NULL;
@@ -638,18 +638,26 @@ static int smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon,
        num_rqst++;
 
        if (cfile) {
-               if (retries)
+               if (retries) {
+                       /* Back-off before retry */
+                       if (cur_sleep)
+                               msleep(cur_sleep);
                        for (i = 1; i < num_rqst - 2; i++)
                                smb2_set_replay(server, &rqst[i]);
+               }
 
                rc = compound_send_recv(xid, ses, server,
                                        flags, num_rqst - 2,
                                        &rqst[1], &resp_buftype[1],
                                        &rsp_iov[1]);
        } else {
-               if (retries)
+               if (retries) {
+                       /* Back-off before retry */
+                       if (cur_sleep)
+                               msleep(cur_sleep);
                        for (i = 0; i < num_rqst; i++)
                                smb2_set_replay(server, &rqst[i]);
+               }
 
                rc = compound_send_recv(xid, ses, server,
                                        flags, num_rqst,
@@ -1180,7 +1188,7 @@ smb2_unlink(const unsigned int xid, struct cifs_tcon *tcon, const char *name,
 {
        struct kvec open_iov[SMB2_CREATE_IOV_SIZE];
        __le16 *utf16_path __free(kfree) = NULL;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
        struct TCP_Server_Info *server;
        struct cifs_open_parms oparms;
        struct smb2_create_req *creq;
@@ -1242,6 +1250,9 @@ smb2_unlink(const unsigned int xid, struct cifs_tcon *tcon, const char *name,
                goto err_free;
 
        if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                for (int i = 0; i < ARRAY_SIZE(rqst);  i++)
                        smb2_set_replay(server, &rqst[i]);
        }
@@ -1262,7 +1273,7 @@ smb2_unlink(const unsigned int xid, struct cifs_tcon *tcon, const char *name,
        if (rc == -EINVAL && dentry) {
                dentry = NULL;
                retries = 0;
-               cur_sleep = 1;
+               cur_sleep = 0;
                goto again;
        }
        /*
fs/smb/client/smb2ops.c +24 -8
index a16ded46b5a26..7980c6f80730f 100644
@@ -1184,7 +1184,7 @@ smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon,
        struct smb2_file_full_ea_info *ea;
        struct smb2_query_info_rsp *rsp;
        int rc, used_len = 0;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -1314,6 +1314,9 @@ smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon,
        smb2_set_related(&rqst[2]);
 
        if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst[0]);
                smb2_set_replay(server, &rqst[1]);
                smb2_set_replay(server, &rqst[2]);
@@ -1582,7 +1585,7 @@ smb2_ioctl_query_info(const unsigned int xid,
        void *data[2];
        int create_options = is_dir ? CREATE_NOT_FILE : CREATE_NOT_DIR;
        void (*free_req1_func)(struct smb_rqst *r);
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -1731,6 +1734,9 @@ smb2_ioctl_query_info(const unsigned int xid,
        smb2_set_related(&rqst[2]);
 
        if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst[0]);
                smb2_set_replay(server, &rqst[1]);
                smb2_set_replay(server, &rqst[2]);
@@ -2440,7 +2446,7 @@ smb2_query_dir_first(const unsigned int xid, struct cifs_tcon *tcon,
        struct smb2_query_directory_rsp *qd_rsp = NULL;
        struct smb2_create_rsp *op_rsp = NULL;
        struct TCP_Server_Info *server;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -2498,6 +2504,9 @@ smb2_query_dir_first(const unsigned int xid, struct cifs_tcon *tcon,
        smb2_set_related(&rqst[1]);
 
        if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst[0]);
                smb2_set_replay(server, &rqst[1]);
        }
@@ -2774,10 +2783,14 @@ bool smb2_should_replay(struct cifs_tcon *tcon,
                return false;
 
        if (tcon->retry || (*pretries)++ < tcon->ses->server->retrans) {
-               msleep(*pcur_sleep);
-               (*pcur_sleep) = ((*pcur_sleep) << 1);
-               if ((*pcur_sleep) > CIFS_MAX_SLEEP)
-                       (*pcur_sleep) = CIFS_MAX_SLEEP;
+               /* Update sleep time for exponential backoff */
+               if (!(*pcur_sleep))
+                       (*pcur_sleep) = 1;
+               else {
+                       (*pcur_sleep) = ((*pcur_sleep) << 1);
+                       if ((*pcur_sleep) > CIFS_MAX_SLEEP)
+                               (*pcur_sleep) = CIFS_MAX_SLEEP;
+               }
                return true;
        }
 
@@ -2808,7 +2821,7 @@ smb2_query_info_compound(const unsigned int xid, struct cifs_tcon *tcon,
        int rc;
        __le16 *utf16_path;
        struct cached_fid *cfid;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -2898,6 +2911,9 @@ smb2_query_info_compound(const unsigned int xid, struct cifs_tcon *tcon,
        smb2_set_related(&rqst[2]);
 
        if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                if (!cfid) {
                        smb2_set_replay(server, &rqst[0]);
                        smb2_set_replay(server, &rqst[2]);
fs/smb/client/smb2pdu.c +84 -29
index 5d57c895ca37a..7d75ba675f774 100644
@@ -2904,7 +2904,7 @@ int smb311_posix_mkdir(const unsigned int xid, struct inode *inode,
        unsigned int total_len;
        __le16 *utf16_path = NULL;
        struct TCP_Server_Info *server;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -3016,8 +3016,12 @@ int smb311_posix_mkdir(const unsigned int xid, struct inode *inode,
        trace_smb3_posix_mkdir_enter(xid, tcon->tid, ses->Suid, full_path, CREATE_NOT_FILE,
                                    FILE_WRITE_ATTRIBUTES);
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        /* resource #4: response buffer */
        rc = cifs_send_recv(xid, ses, server,
@@ -3265,7 +3269,7 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms *oparms, __le16 *path,
        int resp_buftype = CIFS_NO_BUFFER;
        int rc = 0;
        int flags = 0;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -3293,8 +3297,12 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms *oparms, __le16 *path,
        trace_smb3_open_enter(xid, tcon->tid, tcon->ses->Suid, oparms->path,
                oparms->create_options, oparms->desired_access);
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, ses, server,
                            &rqst, &resp_buftype, flags,
@@ -3478,7 +3486,7 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
        int resp_buftype = CIFS_NO_BUFFER;
        int rc = 0;
        int flags = 0;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
        if (!tcon)
                return smb_EIO(smb_eio_trace_null_pointers);
@@ -3518,8 +3526,12 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
        if (rc)
                goto ioctl_exit;
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, ses, server,
                            &rqst, &resp_buftype, flags,
@@ -3675,7 +3687,7 @@ __SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
        int rc = 0;
        int flags = 0;
        bool query_attrs = false;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -3707,8 +3719,12 @@ __SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
        if (rc)
                goto close_exit;
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, ses, server,
                            &rqst, &resp_buftype, flags, &rsp_iov);
@@ -3878,7 +3894,7 @@ query_info(const unsigned int xid, struct cifs_tcon *tcon,
        struct TCP_Server_Info *server;
        int flags = 0;
        bool allocated = false;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
        cifs_dbg(FYI, "Query Info\n");
 
@@ -3912,8 +3928,12 @@ query_info(const unsigned int xid, struct cifs_tcon *tcon,
        trace_smb3_query_info_enter(xid, persistent_fid, tcon->tid,
                                    ses->Suid, info_class, (__u32)info_type);
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, ses, server,
                            &rqst, &resp_buftype, flags, &rsp_iov);
@@ -4069,7 +4089,7 @@ SMB2_change_notify(const unsigned int xid, struct cifs_tcon *tcon,
        int resp_buftype = CIFS_NO_BUFFER;
        int flags = 0;
        int rc = 0;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -4100,8 +4120,12 @@ SMB2_change_notify(const unsigned int xid, struct cifs_tcon *tcon,
        trace_smb3_notify_enter(xid, persistent_fid, tcon->tid, ses->Suid,
                                (u8)watch_tree, completion_filter);
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, ses, server,
                            &rqst, &resp_buftype, flags, &rsp_iov);
@@ -4405,7 +4429,7 @@ SMB2_flush(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
        int resp_buftype = CIFS_NO_BUFFER;
        int flags = 0;
        int rc = 0;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -4431,8 +4455,12 @@ SMB2_flush(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
 
        trace_smb3_flush_enter(xid, persistent_fid, tcon->tid, ses->Suid);
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, ses, server,
                            &rqst, &resp_buftype, flags, &rsp_iov);
@@ -5190,7 +5218,7 @@ SMB2_write(const unsigned int xid, struct cifs_io_parms *io_parms,
        int flags = 0;
        unsigned int total_len;
        struct TCP_Server_Info *server;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -5238,8 +5266,12 @@ SMB2_write(const unsigned int xid, struct cifs_io_parms *io_parms,
        rqst.rq_iov = iov;
        rqst.rq_nvec = n_vec + 1;
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, io_parms->tcon->ses, server,
                            &rqst,
@@ -5590,7 +5622,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
        struct cifs_ses *ses = tcon->ses;
        struct TCP_Server_Info *server;
        int flags = 0;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -5615,8 +5647,12 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
        if (rc)
                goto qdir_exit;
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, ses, server,
                            &rqst, &resp_buftype, flags, &rsp_iov);
@@ -5725,7 +5761,7 @@ send_set_info(const unsigned int xid, struct cifs_tcon *tcon,
        struct cifs_ses *ses = tcon->ses;
        struct TCP_Server_Info *server;
        int flags = 0;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -5758,8 +5794,12 @@ send_set_info(const unsigned int xid, struct cifs_tcon *tcon,
                return rc;
        }
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, ses, server,
                            &rqst, &resp_buftype, flags,
@@ -5838,7 +5878,7 @@ SMB2_oplock_break(const unsigned int xid, struct cifs_tcon *tcon,
        struct kvec iov[1];
        struct kvec rsp_iov;
        int resp_buf_type;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -5868,8 +5908,12 @@ SMB2_oplock_break(const unsigned int xid, struct cifs_tcon *tcon,
        rqst.rq_iov = iov;
        rqst.rq_nvec = 1;
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, ses, server,
                            &rqst, &resp_buf_type, flags, &rsp_iov);
@@ -5971,7 +6015,7 @@ SMB311_posix_qfs_info(const unsigned int xid, struct cifs_tcon *tcon,
        struct TCP_Server_Info *server;
        FILE_SYSTEM_POSIX_INFO *info = NULL;
        int flags = 0;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -5992,8 +6036,12 @@ SMB311_posix_qfs_info(const unsigned int xid, struct cifs_tcon *tcon,
        rqst.rq_iov = &iov;
        rqst.rq_nvec = 1;
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, ses, server,
                            &rqst, &resp_buftype, flags, &rsp_iov);
@@ -6036,7 +6084,7 @@ SMB2_QFS_attr(const unsigned int xid, struct cifs_tcon *tcon,
        struct TCP_Server_Info *server;
        unsigned int rsp_len, offset;
        int flags = 0;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -6073,8 +6121,12 @@ SMB2_QFS_attr(const unsigned int xid, struct cifs_tcon *tcon,
        rqst.rq_iov = &iov;
        rqst.rq_nvec = 1;
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, ses, server,
                            &rqst, &resp_buftype, flags, &rsp_iov);
@@ -6136,7 +6188,7 @@ smb2_lockv(const unsigned int xid, struct cifs_tcon *tcon,
        int flags = CIFS_NO_RSP_BUF;
        unsigned int total_len;
        struct TCP_Server_Info *server;
-       int retries = 0, cur_sleep = 1;
+       int retries = 0, cur_sleep = 0;
 
 replay_again:
        /* reinitialize for possible replay */
@@ -6172,8 +6224,12 @@ smb2_lockv(const unsigned int xid, struct cifs_tcon *tcon,
        rqst.rq_iov = iov;
        rqst.rq_nvec = 2;
 
-       if (retries)
+       if (retries) {
+               /* Back-off before retry */
+               if (cur_sleep)
+                       msleep(cur_sleep);
                smb2_set_replay(server, &rqst);
+       }
 
        rc = cifs_send_recv(xid, tcon->ses, server,
                            &rqst, &resp_buf_type, flags,
--
Quoted 2 lines

2.43.0

--
Thanks,

Quoted 1 line

Steve

Resent a v4 of all 4 patches again, so that there's no confusion about the patches. Please consider v4 of all 4 patches.

Signature · 2 lines
Regards,
Shyam