Merge tag 'nfs-for-3.4-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull NFS client updates for Linux 3.4 from Trond Myklebust:
 "New features include:
   - Add NFS client support for containers.

     This should enable most of the necessary functionality, including
     lockd support, and support for rpc.statd, NFSv4 idmapper and
     RPCSEC_GSS upcalls into the correct network namespace from which
     the mount system call was issued.

   - NFSv4 idmapper scalability improvements

     Base the idmapper cache on the keyring interface to allow
     concurrent access to idmapper entries.  Start the process of
     migrating users from the single-threaded daemon-based approach to
     the multi-threaded request-key based approach.

   - NFSv4.1 implementation id.

     Allows the NFSv4.1 client and server to mutually identify each
     other for logging and debugging purposes.

   - Support the 'vers=4.1' mount option for mounting NFSv4.1 instead of
     having to use the more counterintuitive 'vers=4,minorversion=1'.

   - SUNRPC tracepoints.

     Start the process of adding tracepoints in order to improve
     debugging of the RPC layer.

   - pNFS object layout support for autologin.

  Important bugfixes include:

   - Fix a bug in rpc_wake_up/rpc_wake_up_status that caused them to
     fail to wake up all tasks when applied to priority waitqueues.

   - Ensure that we handle read delegations correctly, when we try to
     truncate a file.

   - A number of fixes for NFSv4 state manager loops (mostly to do with
     delegation recovery)."

* tag 'nfs-for-3.4-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (224 commits)
  NFS: fix sb->s_id in nfs debug prints
  xprtrdma: Remove assumption that each segment is <= PAGE_SIZE
  xprtrdma: The transport should not bug-check when a dup reply is received
  pnfs-obj: autologin: Add support for protocol autologin
  NFS: Remove nfs4_setup_sequence from generic rename code
  NFS: Remove nfs4_setup_sequence from generic unlink code
  NFS: Remove nfs4_setup_sequence from generic read code
  NFS: Remove nfs4_setup_sequence from generic write code
  NFS: Fix more NFS debug related build warnings
  SUNRPC/LOCKD: Fix build warnings when CONFIG_SUNRPC_DEBUG is undefined
  nfs: non void functions must return a value
  SUNRPC: Kill compiler warning when RPC_DEBUG is unset
  SUNRPC/NFS: Add Kbuild dependencies for NFS_DEBUG/RPC_DEBUG
  NFS: Use cond_resched_lock() to reduce latencies in the commit scans
  NFSv4: It is not safe to dereference lsp->ls_state in release_lockowner
  NFS: ncommit count is being double decremented
  SUNRPC: We must not use list_for_each_entry_safe() in rpc_wake_up()
  Try using machine credentials for RENEW calls
  NFSv4.1: Fix a few issues in filelayout_commit_pagelist
  NFSv4.1: Clean ups and bugfixes for the pNFS read/writeback/commit code
  ...

1 files changed, 177 insertions, 0 deletions

diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
new file mode 100644
index 00000000000..43be87d5dd5
--- /dev/null
+++ b/include/trace/events/sunrpc.h
@@ -0,0 +1,177 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM sunrpc
+
+#if !defined(_TRACE_SUNRPC_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_SUNRPC_H
+
+#include <linux/sunrpc/sched.h>
+#include <linux/sunrpc/clnt.h>
+#include <linux/tracepoint.h>
+
+DECLARE_EVENT_CLASS(rpc_task_status,
+
+        TP_PROTO(struct rpc_task *task),
+
+        TP_ARGS(task),
+
+        TP_STRUCT__entry(
+                __field(const struct rpc_task *, task)
+                __field(const struct rpc_clnt *, clnt)
+                __field(int, status)
+        ),
+
+        TP_fast_assign(
+                __entry->task = task;
+                __entry->clnt = task->tk_client;
+                __entry->status = task->tk_status;
+        ),
+
+        TP_printk("task:%p@%p, status %d",__entry->task, __entry->clnt, __entry->status)
+);
+
+DEFINE_EVENT(rpc_task_status, rpc_call_status,
+        TP_PROTO(struct rpc_task *task),
+
+        TP_ARGS(task)
+);
+
+DEFINE_EVENT(rpc_task_status, rpc_bind_status,
+        TP_PROTO(struct rpc_task *task),
+
+        TP_ARGS(task)
+);
+
+TRACE_EVENT(rpc_connect_status,
+        TP_PROTO(struct rpc_task *task, int status),
+
+        TP_ARGS(task, status),
+
+        TP_STRUCT__entry(
+                __field(const struct rpc_task *, task)
+                __field(const struct rpc_clnt *, clnt)
+                __field(int, status)
+        ),
+
+        TP_fast_assign(
+                __entry->task = task;
+                __entry->clnt = task->tk_client;
+                __entry->status = status;
+        ),
+
+        TP_printk("task:%p@%p, status %d",__entry->task, __entry->clnt, __entry->status)
+);
+
+DECLARE_EVENT_CLASS(rpc_task_running,
+
+        TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const void *action),
+
+        TP_ARGS(clnt, task, action),
+
+        TP_STRUCT__entry(
+                __field(const struct rpc_clnt *, clnt)
+                __field(const struct rpc_task *, task)
+                __field(const void *, action)
+                __field(unsigned long, runstate)
+                __field(int, status)
+                __field(unsigned short, flags)
+                ),
+
+        TP_fast_assign(
+                __entry->clnt = clnt;
+                __entry->task = task;
+                __entry->action = action;
+                __entry->runstate = task->tk_runstate;
+                __entry->status = task->tk_status;
+                __entry->flags = task->tk_flags;
+                ),
+
+        TP_printk("task:%p@%p flags=%4.4x state=%4.4lx status=%d action=%pf",
+                __entry->task,
+                __entry->clnt,
+                __entry->flags,
+                __entry->runstate,
+                __entry->status,
+                __entry->action
+                )
+);
+
+DEFINE_EVENT(rpc_task_running, rpc_task_begin,
+
+        TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const void *action),
+
+        TP_ARGS(clnt, task, action)
+
+);
+
+DEFINE_EVENT(rpc_task_running, rpc_task_run_action,
+
+        TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const void *action),
+
+        TP_ARGS(clnt, task, action)
+
+);
+
+DEFINE_EVENT(rpc_task_running, rpc_task_complete,
+
+        TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const void *action),
+
+        TP_ARGS(clnt, task, action)
+
+);
+
+DECLARE_EVENT_CLASS(rpc_task_queued,
+
+        TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const struct rpc_wait_queue *q),
+
+        TP_ARGS(clnt, task, q),
+
+        TP_STRUCT__entry(
+                __field(const struct rpc_clnt *, clnt)
+                __field(const struct rpc_task *, task)
+                __field(unsigned long, timeout)
+                __field(unsigned long, runstate)
+                __field(int, status)
+                __field(unsigned short, flags)
+                __string(q_name, rpc_qname(q))
+                ),
+
+        TP_fast_assign(
+                __entry->clnt = clnt;
+                __entry->task = task;
+                __entry->timeout = task->tk_timeout;
+                __entry->runstate = task->tk_runstate;
+                __entry->status = task->tk_status;
+                __entry->flags = task->tk_flags;
+                __assign_str(q_name, rpc_qname(q));
+                ),
+
+        TP_printk("task:%p@%p flags=%4.4x state=%4.4lx status=%d timeout=%lu queue=%s",
+                __entry->task,
+                __entry->clnt,
+                __entry->flags,
+                __entry->runstate,
+                __entry->status,
+                __entry->timeout,
+                __get_str(q_name)
+                )
+);
+
+DEFINE_EVENT(rpc_task_queued, rpc_task_sleep,
+
+        TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const struct rpc_wait_queue *q),
+
+        TP_ARGS(clnt, task, q)
+
+);
+
+DEFINE_EVENT(rpc_task_queued, rpc_task_wakeup,
+
+        TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const struct rpc_wait_queue *q),
+
+        TP_ARGS(clnt, task, q)
+
+);
+
+#endif /* _TRACE_SUNRPC_H */
+
+#include <trace/define_trace.h>