b8c6bcee1d
This fixes the problem that dccp_probe output can grow quite large without apparent benefit (many identical data points), creating huge files (up to over one Gigabyte for a few minutes' test run) which are very hard to post-process (in one instance it got so bad that gnuplot ate up all memory plus swap). The cause for the problem is that the kprobe is inserted into dccp_sendmsg(), which can be called in a polling-mode (whenever the TX queue is full due to congestion-control issues, EAGAIN is returned). This creates many very similar data points, i.e. the increase of processing time does not increase the quality/information of the probe output. The fix is to attach the probe to a different function -- write_xmit was chosen since it gets called continually (both via userspace and timer); an input-path function would stop sampling as soon as the other end stops sending feedback. For comparison the output file sizes for the same 20 second test run over a lossy link: * before / without patch: 118 Megabytes * after / with patch: 1.2 Megabytes and there was much less noise in the output. To allow backward compatibility with scripts that people use, the now-unused `size' field in the output has been replaced with the CCID identifier. This also serves for future compatibility - support for CCID2 is work in progress (depends on the still unfinished SRTT/RTTVAR updates). While at it, the update to ktime_t was also performed. Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk> Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
181 lines
4.4 KiB
C
181 lines
4.4 KiB
C
/*
|
|
* dccp_probe - Observe the DCCP flow with kprobes.
|
|
*
|
|
* The idea for this came from Werner Almesberger's umlsim
|
|
* Copyright (C) 2004, Stephen Hemminger <shemminger@osdl.org>
|
|
*
|
|
* Modified for DCCP from Stephen Hemminger's code
|
|
* Copyright (C) 2006, Ian McDonald <ian.mcdonald@jandi.co.nz>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/kprobes.h>
|
|
#include <linux/socket.h>
|
|
#include <linux/dccp.h>
|
|
#include <linux/proc_fs.h>
|
|
#include <linux/module.h>
|
|
#include <linux/kfifo.h>
|
|
#include <linux/vmalloc.h>
|
|
#include <net/net_namespace.h>
|
|
|
|
#include "dccp.h"
|
|
#include "ccid.h"
|
|
#include "ccids/ccid3.h"
|
|
|
|
static int port;
|
|
|
|
static int bufsize = 64 * 1024;
|
|
|
|
static const char procname[] = "dccpprobe";
|
|
|
|
static struct {
|
|
struct kfifo *fifo;
|
|
spinlock_t lock;
|
|
wait_queue_head_t wait;
|
|
ktime_t start;
|
|
} dccpw;
|
|
|
|
static void jdccp_write_xmit(struct sock *sk)
|
|
{
|
|
const struct inet_sock *inet = inet_sk(sk);
|
|
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 (ccid == DCCPC_CCID3)
|
|
hctx = ccid3_hc_tx_sk(sk);
|
|
|
|
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), 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();
|
|
}
|
|
|
|
static struct jprobe dccp_send_probe = {
|
|
.kp = {
|
|
.symbol_name = "dccp_write_xmit",
|
|
},
|
|
.entry = jdccp_write_xmit,
|
|
};
|
|
|
|
static int dccpprobe_open(struct inode *inode, struct file *file)
|
|
{
|
|
kfifo_reset(dccpw.fifo);
|
|
dccpw.start = ktime_get();
|
|
return 0;
|
|
}
|
|
|
|
static ssize_t dccpprobe_read(struct file *file, char __user *buf,
|
|
size_t len, loff_t *ppos)
|
|
{
|
|
int error = 0, cnt = 0;
|
|
unsigned char *tbuf;
|
|
|
|
if (!buf)
|
|
return -EINVAL;
|
|
|
|
if (len == 0)
|
|
return 0;
|
|
|
|
tbuf = vmalloc(len);
|
|
if (!tbuf)
|
|
return -ENOMEM;
|
|
|
|
error = wait_event_interruptible(dccpw.wait,
|
|
__kfifo_len(dccpw.fifo) != 0);
|
|
if (error)
|
|
goto out_free;
|
|
|
|
cnt = kfifo_get(dccpw.fifo, tbuf, len);
|
|
error = copy_to_user(buf, tbuf, cnt) ? -EFAULT : 0;
|
|
|
|
out_free:
|
|
vfree(tbuf);
|
|
|
|
return error ? error : cnt;
|
|
}
|
|
|
|
static const struct file_operations dccpprobe_fops = {
|
|
.owner = THIS_MODULE,
|
|
.open = dccpprobe_open,
|
|
.read = dccpprobe_read,
|
|
};
|
|
|
|
static __init int dccpprobe_init(void)
|
|
{
|
|
int ret = -ENOMEM;
|
|
|
|
init_waitqueue_head(&dccpw.wait);
|
|
spin_lock_init(&dccpw.lock);
|
|
dccpw.fifo = kfifo_alloc(bufsize, GFP_KERNEL, &dccpw.lock);
|
|
if (IS_ERR(dccpw.fifo))
|
|
return PTR_ERR(dccpw.fifo);
|
|
|
|
if (!proc_net_fops_create(&init_net, procname, S_IRUSR, &dccpprobe_fops))
|
|
goto err0;
|
|
|
|
ret = register_jprobe(&dccp_send_probe);
|
|
if (ret)
|
|
goto err1;
|
|
|
|
pr_info("DCCP watch registered (port=%d)\n", port);
|
|
return 0;
|
|
err1:
|
|
proc_net_remove(&init_net, procname);
|
|
err0:
|
|
kfifo_free(dccpw.fifo);
|
|
return ret;
|
|
}
|
|
module_init(dccpprobe_init);
|
|
|
|
static __exit void dccpprobe_exit(void)
|
|
{
|
|
kfifo_free(dccpw.fifo);
|
|
proc_net_remove(&init_net, procname);
|
|
unregister_jprobe(&dccp_send_probe);
|
|
|
|
}
|
|
module_exit(dccpprobe_exit);
|
|
|
|
MODULE_PARM_DESC(port, "Port to match (0=all)");
|
|
module_param(port, int, 0);
|
|
|
|
MODULE_PARM_DESC(bufsize, "Log buffer size (default 64k)");
|
|
module_param(bufsize, int, 0);
|
|
|
|
MODULE_AUTHOR("Ian McDonald <ian.mcdonald@jandi.co.nz>");
|
|
MODULE_DESCRIPTION("DCCP snooper");
|
|
MODULE_LICENSE("GPL");
|