projects / unix-history / blobdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
BSD 4_4_Lite2 release
[unix-history] / usr / src / sys / nfs / nfs_srvcache.c
diff --git a/usr/src/sys/nfs/nfs_srvcache.c b/usr/src/sys/nfs/nfs_srvcache.c
index 59bedc7..954987b 100644 (file)
--- a/usr/src/sys/nfs/nfs_srvcache.c
+++ b/usr/src/sys/nfs/nfs_srvcache.c
@@ -1,13 +1,39 @@
 /*
 /*
- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1989, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Rick Macklem at The University of Guelph.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * Rick Macklem at The University of Guelph.
  *
- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
  *
  *
- *     @(#)nfs_srvcache.c      7.21 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)nfs_srvcache.c      8.3 (Berkeley) 3/30/95
  */
 
 /*
  */
 
 /*
@@ -32,17 +58,20 @@
 #endif
 #include <nfs/nfsm_subs.h>
 #include <nfs/rpcv2.h>
 #endif
 #include <nfs/nfsm_subs.h>
 #include <nfs/rpcv2.h>
-#include <nfs/nfsv2.h>
+#include <nfs/nfsproto.h>
 #include <nfs/nfs.h>
 #include <nfs/nfsrvcache.h>
 #include <nfs/nqnfs.h>
 
 #include <nfs/nfs.h>
 #include <nfs/nfsrvcache.h>
 #include <nfs/nqnfs.h>
 
+extern struct nfsstats nfsstats;
+extern int nfsv2_procid[NFS_NPROCS];
 long numnfsrvcache, desirednfsrvcache = NFSRVCACHESIZ;
 
 long numnfsrvcache, desirednfsrvcache = NFSRVCACHESIZ;
 
-#define        NFSRCHASH(xid)          (((xid) + ((xid) >> 24)) & rheadhash)
-static struct nfsrvcache *nfsrvlruhead, **nfsrvlrutail = &nfsrvlruhead;
-static struct nfsrvcache **rheadhtbl;
-static u_long rheadhash;
+#define        NFSRCHASH(xid) \
+       (&nfsrvhashtbl[((xid) + ((xid) >> 24)) & nfsrvhash])
+LIST_HEAD(nfsrvhash, nfsrvcache) *nfsrvhashtbl;
+TAILQ_HEAD(nfsrvlru, nfsrvcache) nfsrvlruhead;
+u_long nfsrvhash;
 
 #define TRUE   1
 #define        FALSE   0
 
 #define TRUE   1
 #define        FALSE   0
@@ -61,7 +90,6 @@ int nonidempotent[NFS_NPROCS] = {
        FALSE,
        FALSE,
        FALSE,
        FALSE,
        FALSE,
        FALSE,
-       FALSE,
        TRUE,
        TRUE,
        TRUE,
        TRUE,
        TRUE,
        TRUE,
@@ -70,6 +98,10 @@ int nonidempotent[NFS_NPROCS] = {
        TRUE,
        TRUE,
        TRUE,
        TRUE,
        TRUE,
        TRUE,
+       TRUE,
+       FALSE,
+       FALSE,
+       FALSE,
        FALSE,
        FALSE,
        FALSE,
        FALSE,
        FALSE,
        FALSE,
@@ -80,7 +112,7 @@ int nonidempotent[NFS_NPROCS] = {
 };
 
 /* True iff the rpc reply is an nfs status ONLY! */
 };
 
 /* True iff the rpc reply is an nfs status ONLY! */
-static int repliesstatus[NFS_NPROCS] = {
+static int nfsv2_repstat[NFS_NPROCS] = {
        FALSE,
        FALSE,
        FALSE,
        FALSE,
        FALSE,
        FALSE,
@@ -99,20 +131,17 @@ static int repliesstatus[NFS_NPROCS] = {
        TRUE,
        FALSE,
        FALSE,
        TRUE,
        FALSE,
        FALSE,
-       FALSE,
-       FALSE,
-       FALSE,
-       FALSE,
-       TRUE,
 };
 
 /*
  * Initialize the server request cache list
  */
 };
 
 /*
  * Initialize the server request cache list
  */
+void
 nfsrv_initcache()
 {
 
 nfsrv_initcache()
 {
 
-       rheadhtbl = hashinit(desirednfsrvcache, M_NFSD, &rheadhash);
+       nfsrvhashtbl = hashinit(desirednfsrvcache, M_NFSD, &nfsrvhash);
+       TAILQ_INIT(&nfsrvlruhead);
 }
 
 /*
 }
 
 /*
@@ -129,24 +158,29 @@ nfsrv_initcache()
  *   return DOIT
  * Update/add new request at end of lru list
  */
  *   return DOIT
  * Update/add new request at end of lru list
  */
-nfsrv_getcache(nam, nd, repp)
-       struct mbuf *nam;
-       register struct nfsd *nd;
+int
+nfsrv_getcache(nd, slp, repp)
+       register struct nfsrv_descript *nd;
+       struct nfssvc_sock *slp;
        struct mbuf **repp;
 {
        struct mbuf **repp;
 {
-       register struct nfsrvcache *rp, *rq, **rpp;
+       register struct nfsrvcache *rp;
        struct mbuf *mb;
        struct sockaddr_in *saddr;
        caddr_t bpos;
        int ret;
 
        struct mbuf *mb;
        struct sockaddr_in *saddr;
        caddr_t bpos;
        int ret;
 
-       if (nd->nd_nqlflag != NQL_NOVAL)
+       /*
+        * Don't cache recent requests for reliable transport protocols.
+        * (Maybe we should for the case of a reconnect, but..)
+        */
+       if (!nd->nd_nam2)
                return (RC_DOIT);
                return (RC_DOIT);
-       rpp = &rheadhtbl[NFSRCHASH(nd->nd_retxid)];
 loop:
 loop:
-       for (rp = *rpp; rp; rp = rp->rc_forw) {
+       for (rp = NFSRCHASH(nd->nd_retxid)->lh_first; rp != 0;
+           rp = rp->rc_hash.le_next) {
            if (nd->nd_retxid == rp->rc_xid && nd->nd_procnum == rp->rc_proc &&
            if (nd->nd_retxid == rp->rc_xid && nd->nd_procnum == rp->rc_proc &&
-               netaddr_match(NETFAMILY(rp), &rp->rc_haddr, nam)) {
+               netaddr_match(NETFAMILY(rp), &rp->rc_haddr, nd->nd_nam)) {
                        if ((rp->rc_flag & RC_LOCKED) != 0) {
                                rp->rc_flag |= RC_WANTED;
                                (void) tsleep((caddr_t)rp, PZERO-1, "nfsrc", 0);
                        if ((rp->rc_flag & RC_LOCKED) != 0) {
                                rp->rc_flag |= RC_WANTED;
                                (void) tsleep((caddr_t)rp, PZERO-1, "nfsrc", 0);
@@ -154,15 +188,9 @@ loop:
                        }
                        rp->rc_flag |= RC_LOCKED;
                        /* If not at end of LRU chain, move it there */
                        }
                        rp->rc_flag |= RC_LOCKED;
                        /* If not at end of LRU chain, move it there */
-                       if (rp->rc_next) {
-                               /* remove from LRU chain */
-                               *rp->rc_prev = rp->rc_next;
-                               rp->rc_next->rc_prev = rp->rc_prev;
-                               /* and replace at end of it */
-                               rp->rc_next = NULL;
-                               rp->rc_prev = nfsrvlrutail;
-                               *nfsrvlrutail = rp;
-                               nfsrvlrutail = &rp->rc_next;
+                       if (rp->rc_lru.tqe_next) {
+                               TAILQ_REMOVE(&nfsrvlruhead, rp, rc_lru);
+                               TAILQ_INSERT_TAIL(&nfsrvlruhead, rp, rc_lru);
                        }
                        if (rp->rc_state == RC_UNUSED)
                                panic("nfsrv cache");
                        }
                        if (rp->rc_state == RC_UNUSED)
                                panic("nfsrv cache");
@@ -171,7 +199,7 @@ loop:
                                ret = RC_DROPIT;
                        } else if (rp->rc_flag & RC_REPSTATUS) {
                                nfsstats.srvcache_nonidemdonehits++;
                                ret = RC_DROPIT;
                        } else if (rp->rc_flag & RC_REPSTATUS) {
                                nfsstats.srvcache_nonidemdonehits++;
-                               nfs_rephead(0, nd, rp->rc_status,
+                               nfs_rephead(0, nd, slp, rp->rc_status,
                                   0, (u_quad_t *)0, repp, &mb, &bpos);
                                ret = RC_REPLY;
                        } else if (rp->rc_flag & RC_REPMBUF) {
                                   0, (u_quad_t *)0, repp, &mb, &bpos);
                                ret = RC_REPLY;
                        } else if (rp->rc_flag & RC_REPMBUF) {
@@ -200,34 +228,25 @@ loop:
                numnfsrvcache++;
                rp->rc_flag = RC_LOCKED;
        } else {
                numnfsrvcache++;
                rp->rc_flag = RC_LOCKED;
        } else {
-               rp = nfsrvlruhead;
+               rp = nfsrvlruhead.tqh_first;
                while ((rp->rc_flag & RC_LOCKED) != 0) {
                        rp->rc_flag |= RC_WANTED;
                        (void) tsleep((caddr_t)rp, PZERO-1, "nfsrc", 0);
                while ((rp->rc_flag & RC_LOCKED) != 0) {
                        rp->rc_flag |= RC_WANTED;
                        (void) tsleep((caddr_t)rp, PZERO-1, "nfsrc", 0);
-                       rp = nfsrvlruhead;
+                       rp = nfsrvlruhead.tqh_first;
                }
                rp->rc_flag |= RC_LOCKED;
                }
                rp->rc_flag |= RC_LOCKED;
-               /* remove from hash chain */
-               if (rq = rp->rc_forw)
-                       rq->rc_back = rp->rc_back;
-               *rp->rc_back = rq;
-               /* remove from LRU chain */
-               *rp->rc_prev = rp->rc_next;
-               rp->rc_next->rc_prev = rp->rc_prev;
+               LIST_REMOVE(rp, rc_hash);
+               TAILQ_REMOVE(&nfsrvlruhead, rp, rc_lru);
                if (rp->rc_flag & RC_REPMBUF)
                        m_freem(rp->rc_reply);
                if (rp->rc_flag & RC_NAM)
                        MFREE(rp->rc_nam, mb);
                rp->rc_flag &= (RC_LOCKED | RC_WANTED);
        }
                if (rp->rc_flag & RC_REPMBUF)
                        m_freem(rp->rc_reply);
                if (rp->rc_flag & RC_NAM)
                        MFREE(rp->rc_nam, mb);
                rp->rc_flag &= (RC_LOCKED | RC_WANTED);
        }
-       /* place at end of LRU list */
-       rp->rc_next = NULL;
-       rp->rc_prev = nfsrvlrutail;
-       *nfsrvlrutail = rp;
-       nfsrvlrutail = &rp->rc_next;
+       TAILQ_INSERT_TAIL(&nfsrvlruhead, rp, rc_lru);
        rp->rc_state = RC_INPROG;
        rp->rc_xid = nd->nd_retxid;
        rp->rc_state = RC_INPROG;
        rp->rc_xid = nd->nd_retxid;
-       saddr = mtod(nam, struct sockaddr_in *);
+       saddr = mtod(nd->nd_nam, struct sockaddr_in *);
        switch (saddr->sin_family) {
        case AF_INET:
                rp->rc_flag |= RC_INETADDR;
        switch (saddr->sin_family) {
        case AF_INET:
                rp->rc_flag |= RC_INETADDR;
@@ -236,16 +255,11 @@ loop:
        case AF_ISO:
        default:
                rp->rc_flag |= RC_NAM;
        case AF_ISO:
        default:
                rp->rc_flag |= RC_NAM;
-               rp->rc_nam = m_copym(nam, 0, M_COPYALL, M_WAIT);
+               rp->rc_nam = m_copym(nd->nd_nam, 0, M_COPYALL, M_WAIT);
                break;
        };
        rp->rc_proc = nd->nd_procnum;
                break;
        };
        rp->rc_proc = nd->nd_procnum;
-       /* insert into hash chain */
-       if (rq = *rpp)
-               rq->rc_back = &rp->rc_forw;
-       rp->rc_forw = rq;
-       rp->rc_back = rpp;
-       *rpp = rp;
+       LIST_INSERT_HEAD(NFSRCHASH(nd->nd_retxid), rp, rc_hash);
        rp->rc_flag &= ~RC_LOCKED;
        if (rp->rc_flag & RC_WANTED) {
                rp->rc_flag &= ~RC_WANTED;
        rp->rc_flag &= ~RC_LOCKED;
        if (rp->rc_flag & RC_WANTED) {
                rp->rc_flag &= ~RC_WANTED;
@@ -258,20 +272,20 @@ loop:
  * Update a request cache entry after the rpc has been done
  */
 void
  * Update a request cache entry after the rpc has been done
  */
 void
-nfsrv_updatecache(nam, nd, repvalid, repmbuf)
-       struct mbuf *nam;
-       register struct nfsd *nd;
+nfsrv_updatecache(nd, repvalid, repmbuf)
+       register struct nfsrv_descript *nd;
        int repvalid;
        struct mbuf *repmbuf;
 {
        register struct nfsrvcache *rp;
 
        int repvalid;
        struct mbuf *repmbuf;
 {
        register struct nfsrvcache *rp;
 
-       if (nd->nd_nqlflag != NQL_NOVAL)
+       if (!nd->nd_nam2)
                return;
 loop:
                return;
 loop:
-       for (rp = rheadhtbl[NFSRCHASH(nd->nd_retxid)]; rp; rp = rp->rc_forw) {
+       for (rp = NFSRCHASH(nd->nd_retxid)->lh_first; rp != 0;
+           rp = rp->rc_hash.le_next) {
            if (nd->nd_retxid == rp->rc_xid && nd->nd_procnum == rp->rc_proc &&
            if (nd->nd_retxid == rp->rc_xid && nd->nd_procnum == rp->rc_proc &&
-               netaddr_match(NETFAMILY(rp), &rp->rc_haddr, nam)) {
+               netaddr_match(NETFAMILY(rp), &rp->rc_haddr, nd->nd_nam)) {
                        if ((rp->rc_flag & RC_LOCKED) != 0) {
                                rp->rc_flag |= RC_WANTED;
                                (void) tsleep((caddr_t)rp, PZERO-1, "nfsrc", 0);
                        if ((rp->rc_flag & RC_LOCKED) != 0) {
                                rp->rc_flag |= RC_WANTED;
                                (void) tsleep((caddr_t)rp, PZERO-1, "nfsrc", 0);
@@ -284,7 +298,8 @@ loop:
                         * the reply for non-idempotent rpc's.
                         */
                        if (repvalid && nonidempotent[nd->nd_procnum]) {
                         * the reply for non-idempotent rpc's.
                         */
                        if (repvalid && nonidempotent[nd->nd_procnum]) {
-                               if (repliesstatus[nd->nd_procnum]) {
+                               if ((nd->nd_flag & ND_NFSV3) == 0 &&
+                                 nfsv2_repstat[nfsv2_procid[nd->nd_procnum]]) {
                                        rp->rc_status = nd->nd_repstat;
                                        rp->rc_flag |= RC_REPSTATUS;
                                } else {
                                        rp->rc_status = nd->nd_repstat;
                                        rp->rc_flag |= RC_REPSTATUS;
                                } else {
@@ -311,12 +326,11 @@ nfsrv_cleancache()
 {
        register struct nfsrvcache *rp, *nextrp;
 
 {
        register struct nfsrvcache *rp, *nextrp;
 
-       for (rp = nfsrvlruhead; rp; rp = nextrp) {
-               nextrp = rp->rc_next;
+       for (rp = nfsrvlruhead.tqh_first; rp != 0; rp = nextrp) {
+               nextrp = rp->rc_lru.tqe_next;
+               LIST_REMOVE(rp, rc_hash);
+               TAILQ_REMOVE(&nfsrvlruhead, rp, rc_lru);
                free(rp, M_NFSD);
        }
                free(rp, M_NFSD);
        }
-       bzero((char *)rheadhtbl, (rheadhash + 1) * sizeof(void *));
-       nfsrvlruhead = NULL;
-       nfsrvlrutail = &nfsrvlruhead;
        numnfsrvcache = 0;
 }
        numnfsrvcache = 0;
 }
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.