1 files changed, 27 insertions, 48 deletions

diff --git a/net/dccp/probe.c b/net/dccp/probe.c
index 81368a7f5379..eaa59d82ab0f 100644
--- a/net/dccp/probe.c
+++ b/net/dccp/probe.c
@@ -46,75 +46,54 @@ static struct {
         struct kfifo      *fifo;
         spinlock_t        lock;
         wait_queue_head_t wait;
-        struct timespec   tstart;
+        ktime_t           start;
 } dccpw;
 
-static void printl(const char *fmt, ...)
+static void jdccp_write_xmit(struct sock *sk)
 {
-        va_list args;
-        int len;
-        struct timespec now;
-        char tbuf[256];
-
-        va_start(args, fmt);
-        getnstimeofday(&now);
-
-        now = timespec_sub(now, dccpw.tstart);
-
-        len = sprintf(tbuf, "%lu.%06lu ",
-                      (unsigned long) now.tv_sec,
-                      (unsigned long) now.tv_nsec / NSEC_PER_USEC);
-        len += vscnprintf(tbuf+len, sizeof(tbuf)-len, fmt, args);
-        va_end(args);
-
-        kfifo_put(dccpw.fifo, tbuf, len);
-        wake_up(&dccpw.wait);
-}
-
-static int jdccp_sendmsg(struct kiocb *iocb, struct sock *sk,
-                         struct msghdr *msg, size_t size)
-{
-        const struct dccp_minisock *dmsk = dccp_msk(sk);
         const struct inet_sock *inet = inet_sk(sk);
-        const struct ccid3_hc_tx_sock *hctx;
+        struct ccid3_hc_tx_sock *hctx = NULL;
+        struct timespec tv;
+        char buf[256];
+        int len, ccid = ccid_get_current_tx_ccid(dccp_sk(sk));
 
-        if (dmsk->dccpms_tx_ccid == DCCPC_CCID3)
+        if (ccid == DCCPC_CCID3)
                 hctx = ccid3_hc_tx_sk(sk);
-        else
-                hctx = NULL;
 
-        if (port == 0 || ntohs(inet->dport) == port ||
-            ntohs(inet->sport) == port) {
-                if (hctx)
-                        printl("%d.%d.%d.%d:%u %d.%d.%d.%d:%u %d %d %d %d %u "
-                               "%llu %llu %d\n",
-                               NIPQUAD(inet->saddr), ntohs(inet->sport),
-                               NIPQUAD(inet->daddr), ntohs(inet->dport), size,
-                               hctx->ccid3hctx_s, hctx->ccid3hctx_rtt,
-                               hctx->ccid3hctx_p, hctx->ccid3hctx_x_calc,
-                               hctx->ccid3hctx_x_recv >> 6,
-                               hctx->ccid3hctx_x >> 6, hctx->ccid3hctx_t_ipi);
-                else
-                        printl("%d.%d.%d.%d:%u %d.%d.%d.%d:%u %d\n",
+        if (!port || ntohs(inet->dport) == port || ntohs(inet->sport) == port) {
+
+                tv  = ktime_to_timespec(ktime_sub(ktime_get(), dccpw.start));
+                len = sprintf(buf, "%lu.%09lu %d.%d.%d.%d:%u %d.%d.%d.%d:%u %d",
+                               (unsigned long)tv.tv_sec,
+                               (unsigned long)tv.tv_nsec,
                                NIPQUAD(inet->saddr), ntohs(inet->sport),
-                               NIPQUAD(inet->daddr), ntohs(inet->dport), size);
+                               NIPQUAD(inet->daddr), ntohs(inet->dport), ccid);
+
+                if (hctx)
+                        len += sprintf(buf + len, " %d %d %d %u %u %u %d",
+                               hctx->s, hctx->rtt, hctx->p, hctx->x_calc,
+                               (unsigned)(hctx->x_recv >> 6),
+                               (unsigned)(hctx->x >> 6), hctx->t_ipi);
+
+                len += sprintf(buf + len, "\n");
+                kfifo_put(dccpw.fifo, buf, len);
+                wake_up(&dccpw.wait);
         }
 
         jprobe_return();
-        return 0;
 }
 
 static struct jprobe dccp_send_probe = {
         .kp     = {
-                .symbol_name = "dccp_sendmsg",
+                .symbol_name = "dccp_write_xmit",
         },
-        .entry  = jdccp_sendmsg,
+        .entry  = jdccp_write_xmit,
 };
 
 static int dccpprobe_open(struct inode *inode, struct file *file)
 {
         kfifo_reset(dccpw.fifo);
-        getnstimeofday(&dccpw.tstart);
+        dccpw.start = ktime_get();
         return 0;
 }