This is a note to let you know that I've just added the patch titled
NFSv4.1: Don't decrease the value of seq_nr_highest_sent
to the 5.15-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:
nfsv4.1-don-t-decrease-the-value-of-seq_nr_highest_sent.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From f07a5d2427fc113dc50c5c818eba8929bc27b8ca Mon Sep 17 00:00:00 2001
From: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
Date: Tue, 12 Jul 2022 09:16:04 -0400
Subject: NFSv4.1: Don't decrease the value of seq_nr_highest_sent
From: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
commit f07a5d2427fc113dc50c5c818eba8929bc27b8ca upstream.
When we're trying to figure out what the server may or may not have seen
in terms of request numbers, do not assume that requests with a larger
number were missed, just because we saw a reply to a request with a
smaller number.
Fixes: 3453d5708b33 ("NFSv4.1: Avoid false retries when RPC calls are interrupted")
Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/nfs/nfs4proc.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -787,10 +787,9 @@ static void nfs4_slot_sequence_record_se
if ((s32)(seqnr - slot->seq_nr_highest_sent) > 0)
slot->seq_nr_highest_sent = seqnr;
}
-static void nfs4_slot_sequence_acked(struct nfs4_slot *slot,
- u32 seqnr)
+static void nfs4_slot_sequence_acked(struct nfs4_slot *slot, u32 seqnr)
{
- slot->seq_nr_highest_sent = seqnr;
+ nfs4_slot_sequence_record_sent(slot, seqnr);
slot->seq_nr_last_acked = seqnr;
}
Patches currently in stable-queue which might be from trond.myklebust@xxxxxxxxxxxxxxx are
queue-5.15/nfsv4-pnfs-fix-a-use-after-free-bug-in-open.patch
queue-5.15/nfsv4.1-handle-nfs4err_delay-replies-to-op_sequence-correctly.patch
queue-5.15/nfsv4.1-don-t-decrease-the-value-of-seq_nr_highest_sent.patch
queue-5.15/nfsv4.1-reclaim_complete-must-handle-eacces.patch
queue-5.15/sunrpc-reinitialise-the-backchannel-request-buffers-before-reuse.patch
queue-5.15/sunrpc-fix-expiry-of-auth-creds.patch
queue-5.15/nfsv4-fix-races-in-the-legacy-idmapper-upcall.patch
