git: 926bb27c3014 - stable/12 - nfsd: fix BindConnectionToSession so that it clears "cb path down"

Rick Macklem rmacklem at FreeBSD.org
Sun Apr 18 01:52:46 UTC 2021


The branch stable/12 has been updated by rmacklem:

URL: https://cgit.FreeBSD.org/src/commit/?id=926bb27c3014e2cc09aa09199a0b1f69c57e9263

commit 926bb27c3014e2cc09aa09199a0b1f69c57e9263
Author:     Rick Macklem <rmacklem at FreeBSD.org>
AuthorDate: 2021-04-04 22:05:39 +0000
Commit:     Rick Macklem <rmacklem at FreeBSD.org>
CommitDate: 2021-04-18 01:49:47 +0000

    nfsd: fix BindConnectionToSession so that it clears "cb path down"
    
    Commit 01ae8969a9ee stopped the NFSv4.1/4.2 server from implicitly
    binding the back channel to a new TCP connection so that it
    conforms to RFC5661, for NFSv4.1/4.2. An effect of this
    for the Linux NFS client is that it will do a
    BindConnectionToSession when it sees NFSV4SEQ_CBPATHDOWN
    set in a sequence reply. It will do this for every RPC
    reply until it no longer sees the flag.
    Without that patch, this will happen until the client does
    an Open, which will clear LCL_CBDOWN.
    
    This patch clears LCL_CBDOWN right away, so that
    NFSV4SEQ_CBPATHDOWN will no longer be sent to the client
    in Sequence replies and the Linux client will not repeat
    the BindConnectionToSession RPCs.
    
    This is not critical for correct behaviour, but reduces
    RPC overheads for cases where the Open will not be done
    for a while.
    
    (cherry picked from commit 6f2addd838810ce33c7e9ad9543827d45e0b491c)
---
 sys/fs/nfsserver/nfs_nfsdstate.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c
index d9fd1bbb588d..09b637c14e52 100644
--- a/sys/fs/nfsserver/nfs_nfsdstate.c
+++ b/sys/fs/nfsserver/nfs_nfsdstate.c
@@ -6416,6 +6416,7 @@ nfsrv_bindconnsess(struct nfsrv_descript *nd, uint8_t *sessionid, int *foreaftp)
 				sep->sess_crflags |= NFSV4CRSESS_CONNBACKCHAN;
 				clp->lc_flags |= LCL_DONEBINDCONN |
 				    LCL_NEEDSCBNULL;
+				clp->lc_flags &= ~LCL_CBDOWN;
 				if (*foreaftp == NFSCDFS4_BACK)
 					*foreaftp = NFSCDFS4_BACK;
 				else


More information about the dev-commits-src-all mailing list