4 files changed, 17 insertions, 7 deletions

diff --git a/include/linux/sunrpc/metrics.h b/include/linux/sunrpc/metrics.h
index 1b3751327575..0ee3f7052846 100644
--- a/include/linux/sunrpc/metrics.h
+++ b/include/linux/sunrpc/metrics.h
@@ -30,7 +30,7 @@
 #include <linux/ktime.h>
 #include <linux/spinlock.h>
 
-#define RPC_IOSTATS_VERS        "1.0"
+#define RPC_IOSTATS_VERS        "1.1"
 
 struct rpc_iostats {
         spinlock_t              om_lock;
@@ -66,6 +66,11 @@ struct rpc_iostats {
         ktime_t                 om_queue,       /* queued for xmit */
                                 om_rtt,         /* RPC RTT */
                                 om_execute;     /* RPC execution */
+        /*
+         * The count of operations that complete with tk_status < 0.
+         * These statuses usually indicate error conditions.
+         */
+        unsigned long           om_error_status;
 } ____cacheline_aligned;
 
 struct rpc_task;
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index 191916168e67..f820780280b5 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -23,6 +23,7 @@
 #include <linux/sched/mm.h>
 
 #include <linux/sunrpc/clnt.h>
+#include <linux/sunrpc/metrics.h>
 
 #include "sunrpc.h"
 
@@ -842,6 +843,10 @@ rpc_reset_task_statistics(struct rpc_task *task)
 void rpc_exit_task(struct rpc_task *task)
 {
         task->tk_action = NULL;
+        if (task->tk_ops->rpc_count_stats)
+                task->tk_ops->rpc_count_stats(task, task->tk_calldata);
+        else if (task->tk_client)
+                rpc_count_iostats(task, task->tk_client->cl_metrics);
         if (task->tk_ops->rpc_call_done != NULL) {
                 task->tk_ops->rpc_call_done(task, task->tk_calldata);
                 if (task->tk_action != NULL) {
diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c
index 2b6dc7e5f74f..48ea776364f8 100644
--- a/net/sunrpc/stats.c
+++ b/net/sunrpc/stats.c
@@ -177,6 +177,8 @@ void rpc_count_iostats_metrics(const struct rpc_task *task,
 
         execute = ktime_sub(now, task->tk_start);
         op_metrics->om_execute = ktime_add(op_metrics->om_execute, execute);
+        if (task->tk_status < 0)
+                op_metrics->om_error_status++;
 
         spin_unlock(&op_metrics->om_lock);
 
@@ -219,13 +221,14 @@ static void _add_rpc_iostats(struct rpc_iostats *a, struct rpc_iostats *b)
         a->om_queue = ktime_add(a->om_queue, b->om_queue);
         a->om_rtt = ktime_add(a->om_rtt, b->om_rtt);
         a->om_execute = ktime_add(a->om_execute, b->om_execute);
+        a->om_error_status += b->om_error_status;
 }
 
 static void _print_rpc_iostats(struct seq_file *seq, struct rpc_iostats *stats,
                                int op, const struct rpc_procinfo *procs)
 {
         _print_name(seq, op, procs);
-        seq_printf(seq, "%lu %lu %lu %Lu %Lu %Lu %Lu %Lu\n",
+        seq_printf(seq, "%lu %lu %lu %llu %llu %llu %llu %llu %lu\n",
                    stats->om_ops,
                    stats->om_ntrans,
                    stats->om_timeouts,
@@ -233,7 +236,8 @@ static void _print_rpc_iostats(struct seq_file *seq, struct rpc_iostats *stats,
                    stats->om_bytes_recv,
                    ktime_to_ms(stats->om_queue),
                    ktime_to_ms(stats->om_rtt),
-                   ktime_to_ms(stats->om_execute));
+                   ktime_to_ms(stats->om_execute),
+                   stats->om_error_status);
 }
 
 void rpc_clnt_show_stats(struct seq_file *seq, struct rpc_clnt *clnt)
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 8d41fcf25650..c4d138202abb 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -1760,10 +1760,6 @@ void xprt_release(struct rpc_task *task)
         }
 
         xprt = req->rq_xprt;
-        if (task->tk_ops->rpc_count_stats != NULL)
-                task->tk_ops->rpc_count_stats(task, task->tk_calldata);
-        else if (task->tk_client)
-                rpc_count_iostats(task, task->tk_client->cl_metrics);
         xprt_request_dequeue_all(task, req);
         spin_lock(&xprt->transport_lock);
         xprt->ops->release_xprt(xprt, task);