Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux

Pull nfsd changes from J Bruce Fields:
 "Miscellaneous bugfixes, plus:

   - An overhaul of the DRC cache by Jeff Layton.  The main effect is
     just to make it larger.  This decreases the chances of intermittent
     errors especially in the UDP case.  But we'll need to watch for any
     reports of performance regressions.

   - Containerized nfsd: with some limitations, we now support
     per-container nfs-service, thanks to extensive work from Stanislav
     Kinsbursky over the last year."

Some notes about conflicts, since there were *two* non-data semantic
conflicts here:

 - idr_remove_all() had been added by a memory leak fix, but has since
   become deprecated since idr_destroy() does it for us now.

 - xs_local_connect() had been added by this branch to make AF_LOCAL
   connections be synchronous, but in the meantime Trond had changed the
   calling convention in order to avoid a RCU dereference.

There were a couple of more obvious actual source-level conflicts due to
the hlist traversal changes and one just due to code changes next to
each other, but those were trivial.

* 'for-3.9' of git://linux-nfs.org/~bfields/linux: (49 commits)
  SUNRPC: make AF_LOCAL connect synchronous
  nfsd: fix compiler warning about ambiguous types in nfsd_cache_csum
  svcrpc: fix rpc server shutdown races
  svcrpc: make svc_age_temp_xprts enqueue under sv_lock
  lockd: nlmclnt_reclaim(): avoid stack overflow
  nfsd: enable NFSv4 state in containers
  nfsd: disable usermode helper client tracker in container
  nfsd: use proper net while reading "exports" file
  nfsd: containerize NFSd filesystem
  nfsd: fix comments on nfsd_cache_lookup
  SUNRPC: move cache_detail->cache_request callback call to cache_read()
  SUNRPC: remove "cache_request" argument in sunrpc_cache_pipe_upcall() function
  SUNRPC: rework cache upcall logic
  SUNRPC: introduce cache_detail->cache_request callback
  NFS: simplify and clean cache library
  NFS: use SUNRPC cache creation and destruction helper for DNS cache
  nfsd4: free_stid can be static
  nfsd: keep a checksum of the first 256 bytes of request
  sunrpc: trim off trailing checksum before returning decrypted or integrity authenticated buffer
  sunrpc: fix comment in struct xdr_buf definition
  ...

5 files changed, 178 insertions, 158 deletions

diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
new file mode 100644
index 000000000000..07d8e53bedfc
--- /dev/null
+++ b/include/linux/sunrpc/addr.h
@@ -0,0 +1,170 @@
+/*
+ * linux/include/linux/sunrpc/addr.h
+ *
+ * Various routines for copying and comparing sockaddrs and for
+ * converting them to and from presentation format.
+ */
+#ifndef _LINUX_SUNRPC_ADDR_H
+#define _LINUX_SUNRPC_ADDR_H
+
+#include <linux/socket.h>
+#include <linux/in.h>
+#include <linux/in6.h>
+#include <net/ipv6.h>
+
+size_t          rpc_ntop(const struct sockaddr *, char *, const size_t);
+size_t          rpc_pton(struct net *, const char *, const size_t,
+                         struct sockaddr *, const size_t);
+char *          rpc_sockaddr2uaddr(const struct sockaddr *, gfp_t);
+size_t          rpc_uaddr2sockaddr(struct net *, const char *, const size_t,
+                                   struct sockaddr *, const size_t);
+
+static inline unsigned short rpc_get_port(const struct sockaddr *sap)
+{
+        switch (sap->sa_family) {
+        case AF_INET:
+                return ntohs(((struct sockaddr_in *)sap)->sin_port);
+        case AF_INET6:
+                return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
+        }
+        return 0;
+}
+
+static inline void rpc_set_port(struct sockaddr *sap,
+                                const unsigned short port)
+{
+        switch (sap->sa_family) {
+        case AF_INET:
+                ((struct sockaddr_in *)sap)->sin_port = htons(port);
+                break;
+        case AF_INET6:
+                ((struct sockaddr_in6 *)sap)->sin6_port = htons(port);
+                break;
+        }
+}
+
+#define IPV6_SCOPE_DELIMITER            '%'
+#define IPV6_SCOPE_ID_LEN               sizeof("%nnnnnnnnnn")
+
+static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
+                                   const struct sockaddr *sap2)
+{
+        const struct sockaddr_in *sin1 = (const struct sockaddr_in *)sap1;
+        const struct sockaddr_in *sin2 = (const struct sockaddr_in *)sap2;
+
+        return sin1->sin_addr.s_addr == sin2->sin_addr.s_addr;
+}
+
+static inline bool __rpc_copy_addr4(struct sockaddr *dst,
+                                    const struct sockaddr *src)
+{
+        const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
+        struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
+
+        dsin->sin_family = ssin->sin_family;
+        dsin->sin_addr.s_addr = ssin->sin_addr.s_addr;
+        return true;
+}
+
+#if IS_ENABLED(CONFIG_IPV6)
+static inline bool __rpc_cmp_addr6(const struct sockaddr *sap1,
+                                   const struct sockaddr *sap2)
+{
+        const struct sockaddr_in6 *sin1 = (const struct sockaddr_in6 *)sap1;
+        const struct sockaddr_in6 *sin2 = (const struct sockaddr_in6 *)sap2;
+
+        if (!ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr))
+                return false;
+        else if (ipv6_addr_type(&sin1->sin6_addr) & IPV6_ADDR_LINKLOCAL)
+                return sin1->sin6_scope_id == sin2->sin6_scope_id;
+
+        return true;
+}
+
+static inline bool __rpc_copy_addr6(struct sockaddr *dst,
+                                    const struct sockaddr *src)
+{
+        const struct sockaddr_in6 *ssin6 = (const struct sockaddr_in6 *) src;
+        struct sockaddr_in6 *dsin6 = (struct sockaddr_in6 *) dst;
+
+        dsin6->sin6_family = ssin6->sin6_family;
+        dsin6->sin6_addr = ssin6->sin6_addr;
+        dsin6->sin6_scope_id = ssin6->sin6_scope_id;
+        return true;
+}
+#else   /* !(IS_ENABLED(CONFIG_IPV6) */
+static inline bool __rpc_cmp_addr6(const struct sockaddr *sap1,
+                                   const struct sockaddr *sap2)
+{
+        return false;
+}
+
+static inline bool __rpc_copy_addr6(struct sockaddr *dst,
+                                    const struct sockaddr *src)
+{
+        return false;
+}
+#endif  /* !(IS_ENABLED(CONFIG_IPV6) */
+
+/**
+ * rpc_cmp_addr - compare the address portion of two sockaddrs.
+ * @sap1: first sockaddr
+ * @sap2: second sockaddr
+ *
+ * Just compares the family and address portion. Ignores port, but
+ * compares the scope if it's a link-local address.
+ *
+ * Returns true if the addrs are equal, false if they aren't.
+ */
+static inline bool rpc_cmp_addr(const struct sockaddr *sap1,
+                                const struct sockaddr *sap2)
+{
+        if (sap1->sa_family == sap2->sa_family) {
+                switch (sap1->sa_family) {
+                case AF_INET:
+                        return __rpc_cmp_addr4(sap1, sap2);
+                case AF_INET6:
+                        return __rpc_cmp_addr6(sap1, sap2);
+                }
+        }
+        return false;
+}
+
+/**
+ * rpc_copy_addr - copy the address portion of one sockaddr to another
+ * @dst: destination sockaddr
+ * @src: source sockaddr
+ *
+ * Just copies the address portion and family. Ignores port, scope, etc.
+ * Caller is responsible for making certain that dst is large enough to hold
+ * the address in src. Returns true if address family is supported. Returns
+ * false otherwise.
+ */
+static inline bool rpc_copy_addr(struct sockaddr *dst,
+                                 const struct sockaddr *src)
+{
+        switch (src->sa_family) {
+        case AF_INET:
+                return __rpc_copy_addr4(dst, src);
+        case AF_INET6:
+                return __rpc_copy_addr6(dst, src);
+        }
+        return false;
+}
+
+/**
+ * rpc_get_scope_id - return scopeid for a given sockaddr
+ * @sa: sockaddr to get scopeid from
+ *
+ * Returns the value of the sin6_scope_id for AF_INET6 addrs, or 0 if
+ * not an AF_INET6 address.
+ */
+static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
+{
+        if (sa->sa_family != AF_INET6)
+                return 0;
+
+        return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
+}
+
+#endif /* _LINUX_SUNRPC_ADDR_H */
diff --git a/include/linux/sunrpc/cache.h b/include/linux/sunrpc/cache.h
index 5dc9ee4d616e..303399b1ba59 100644
--- a/include/linux/sunrpc/cache.h
+++ b/include/linux/sunrpc/cache.h
@@ -83,6 +83,10 @@ struct cache_detail {
         int                     (*cache_upcall)(struct cache_detail *,
                                                 struct cache_head *);
 
+        void                    (*cache_request)(struct cache_detail *cd,
+                                                 struct cache_head *ch,
+                                                 char **bpp, int *blen);
+
         int                     (*cache_parse)(struct cache_detail *,
                                                char *buf, int len);
 
@@ -157,11 +161,7 @@ sunrpc_cache_update(struct cache_detail *detail,
                     struct cache_head *new, struct cache_head *old, int hash);
 
 extern int
-sunrpc_cache_pipe_upcall(struct cache_detail *detail, struct cache_head *h,
-                void (*cache_request)(struct cache_detail *,
-                                      struct cache_head *,
-                                      char **,
-                                      int *));
+sunrpc_cache_pipe_upcall(struct cache_detail *detail, struct cache_head *h);
 
 
 extern void cache_clean_deferred(void *owner);
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index 34206b84d8da..4a4abde000cb 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -165,157 +165,5 @@ size_t		rpc_peeraddr(struct rpc_clnt *, struct sockaddr *, size_t);
 const char      *rpc_peeraddr2str(struct rpc_clnt *, enum rpc_display_format_t);
 int             rpc_localaddr(struct rpc_clnt *, struct sockaddr *, size_t);
 
-size_t          rpc_ntop(const struct sockaddr *, char *, const size_t);
-size_t          rpc_pton(struct net *, const char *, const size_t,
-                         struct sockaddr *, const size_t);
-char *          rpc_sockaddr2uaddr(const struct sockaddr *, gfp_t);
-size_t          rpc_uaddr2sockaddr(struct net *, const char *, const size_t,
-                                   struct sockaddr *, const size_t);
-
-static inline unsigned short rpc_get_port(const struct sockaddr *sap)
-{
-        switch (sap->sa_family) {
-        case AF_INET:
-                return ntohs(((struct sockaddr_in *)sap)->sin_port);
-        case AF_INET6:
-                return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
-        }
-        return 0;
-}
-
-static inline void rpc_set_port(struct sockaddr *sap,
-                                const unsigned short port)
-{
-        switch (sap->sa_family) {
-        case AF_INET:
-                ((struct sockaddr_in *)sap)->sin_port = htons(port);
-                break;
-        case AF_INET6:
-                ((struct sockaddr_in6 *)sap)->sin6_port = htons(port);
-                break;
-        }
-}
-
-#define IPV6_SCOPE_DELIMITER            '%'
-#define IPV6_SCOPE_ID_LEN               sizeof("%nnnnnnnnnn")
-
-static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
-                                   const struct sockaddr *sap2)
-{
-        const struct sockaddr_in *sin1 = (const struct sockaddr_in *)sap1;
-        const struct sockaddr_in *sin2 = (const struct sockaddr_in *)sap2;
-
-        return sin1->sin_addr.s_addr == sin2->sin_addr.s_addr;
-}
-
-static inline bool __rpc_copy_addr4(struct sockaddr *dst,
-                                    const struct sockaddr *src)
-{
-        const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
-        struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
-
-        dsin->sin_family = ssin->sin_family;
-        dsin->sin_addr.s_addr = ssin->sin_addr.s_addr;
-        return true;
-}
-
-#if IS_ENABLED(CONFIG_IPV6)
-static inline bool __rpc_cmp_addr6(const struct sockaddr *sap1,
-                                   const struct sockaddr *sap2)
-{
-        const struct sockaddr_in6 *sin1 = (const struct sockaddr_in6 *)sap1;
-        const struct sockaddr_in6 *sin2 = (const struct sockaddr_in6 *)sap2;
-
-        if (!ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr))
-                return false;
-        else if (ipv6_addr_type(&sin1->sin6_addr) & IPV6_ADDR_LINKLOCAL)
-                return sin1->sin6_scope_id == sin2->sin6_scope_id;
-
-        return true;
-}
-
-static inline bool __rpc_copy_addr6(struct sockaddr *dst,
-                                    const struct sockaddr *src)
-{
-        const struct sockaddr_in6 *ssin6 = (const struct sockaddr_in6 *) src;
-        struct sockaddr_in6 *dsin6 = (struct sockaddr_in6 *) dst;
-
-        dsin6->sin6_family = ssin6->sin6_family;
-        dsin6->sin6_addr = ssin6->sin6_addr;
-        return true;
-}
-#else   /* !(IS_ENABLED(CONFIG_IPV6) */
-static inline bool __rpc_cmp_addr6(const struct sockaddr *sap1,
-                                   const struct sockaddr *sap2)
-{
-        return false;
-}
-
-static inline bool __rpc_copy_addr6(struct sockaddr *dst,
-                                    const struct sockaddr *src)
-{
-        return false;
-}
-#endif  /* !(IS_ENABLED(CONFIG_IPV6) */
-
-/**
- * rpc_cmp_addr - compare the address portion of two sockaddrs.
- * @sap1: first sockaddr
- * @sap2: second sockaddr
- *
- * Just compares the family and address portion. Ignores port, scope, etc.
- * Returns true if the addrs are equal, false if they aren't.
- */
-static inline bool rpc_cmp_addr(const struct sockaddr *sap1,
-                                const struct sockaddr *sap2)
-{
-        if (sap1->sa_family == sap2->sa_family) {
-                switch (sap1->sa_family) {
-                case AF_INET:
-                        return __rpc_cmp_addr4(sap1, sap2);
-                case AF_INET6:
-                        return __rpc_cmp_addr6(sap1, sap2);
-                }
-        }
-        return false;
-}
-
-/**
- * rpc_copy_addr - copy the address portion of one sockaddr to another
- * @dst: destination sockaddr
- * @src: source sockaddr
- *
- * Just copies the address portion and family. Ignores port, scope, etc.
- * Caller is responsible for making certain that dst is large enough to hold
- * the address in src. Returns true if address family is supported. Returns
- * false otherwise.
- */
-static inline bool rpc_copy_addr(struct sockaddr *dst,
-                                 const struct sockaddr *src)
-{
-        switch (src->sa_family) {
-        case AF_INET:
-                return __rpc_copy_addr4(dst, src);
-        case AF_INET6:
-                return __rpc_copy_addr6(dst, src);
-        }
-        return false;
-}
-
-/**
- * rpc_get_scope_id - return scopeid for a given sockaddr
- * @sa: sockaddr to get scopeid from
- *
- * Returns the value of the sin6_scope_id for AF_INET6 addrs, or 0 if
- * not an AF_INET6 address.
- */
-static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
-{
-        if (sa->sa_family != AF_INET6)
-                return 0;
-
-        return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
-}
-
 #endif /* __KERNEL__ */
 #endif /* _LINUX_SUNRPC_CLNT_H */
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 676ddf53b3ee..1f0216b9a6c9 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -50,6 +50,7 @@ struct svc_pool {
         unsigned int            sp_nrthreads;   /* # of threads in pool */
         struct list_head        sp_all_threads; /* all server threads */
         struct svc_pool_stats   sp_stats;       /* statistics on pool operation */
+        int                     sp_task_pending;/* has pending task */
 } ____cacheline_aligned_in_smp;
 
 /*
diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index 63988990bd36..15f9204ee70b 100644
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -56,7 +56,7 @@ struct xdr_buf {
         struct kvec     head[1],        /* RPC header + non-page data */
                         tail[1];        /* Appended after page data */
 
-        struct page **  pages;          /* Array of contiguous pages */
+        struct page **  pages;          /* Array of pages */
         unsigned int    page_base,      /* Start of page data */
                         page_len,       /* Length of page data */
                         flags;          /* Flags for data disposition */
@@ -152,6 +152,7 @@ xdr_adjust_iovec(struct kvec *iov, __be32 *p)
 extern void xdr_shift_buf(struct xdr_buf *, size_t);
 extern void xdr_buf_from_iov(struct kvec *, struct xdr_buf *);
 extern int xdr_buf_subsegment(struct xdr_buf *, struct xdr_buf *, unsigned int, unsigned int);
+extern void xdr_buf_trim(struct xdr_buf *, unsigned int);
 extern int xdr_buf_read_netobj(struct xdr_buf *, struct xdr_netobj *, unsigned int);
 extern int read_bytes_from_xdr_buf(struct xdr_buf *, unsigned int, void *, unsigned int);
 extern int write_bytes_to_xdr_buf(struct xdr_buf *, unsigned int, void *, unsigned int);