2006-06-05 17:30:32 -07:00
|
|
|
/*
|
|
|
|
* tcpprobe - Observe the TCP flow with kprobes.
|
|
|
|
*
|
|
|
|
* The idea for this came from Werner Almesberger's umlsim
|
|
|
|
* Copyright (C) 2004, Stephen Hemminger <shemminger@osdl.org>
|
|
|
|
*
|
|
|
|
* 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
|
2007-07-11 19:43:52 -07:00
|
|
|
* the Free Software Foundation; either version 2 of the License.
|
2006-06-05 17:30:32 -07:00
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
2012-03-12 00:03:32 -07:00
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
2006-06-05 17:30:32 -07:00
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/kprobes.h>
|
|
|
|
#include <linux/socket.h>
|
|
|
|
#include <linux/tcp.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 01:04:11 -07:00
|
|
|
#include <linux/slab.h>
|
2006-06-05 17:30:32 -07:00
|
|
|
#include <linux/proc_fs.h>
|
|
|
|
#include <linux/module.h>
|
2007-03-24 21:35:33 -07:00
|
|
|
#include <linux/ktime.h>
|
|
|
|
#include <linux/time.h>
|
2007-09-12 03:01:34 -07:00
|
|
|
#include <net/net_namespace.h>
|
2006-06-05 17:30:32 -07:00
|
|
|
|
|
|
|
#include <net/tcp.h>
|
|
|
|
|
2007-01-23 12:38:57 -07:00
|
|
|
MODULE_AUTHOR("Stephen Hemminger <shemminger@linux-foundation.org>");
|
2006-06-05 17:30:32 -07:00
|
|
|
MODULE_DESCRIPTION("TCP cwnd snooper");
|
|
|
|
MODULE_LICENSE("GPL");
|
2007-07-11 19:43:52 -07:00
|
|
|
MODULE_VERSION("1.1");
|
2006-06-05 17:30:32 -07:00
|
|
|
|
2013-12-22 23:37:30 -07:00
|
|
|
static int port __read_mostly;
|
2006-06-05 17:30:32 -07:00
|
|
|
MODULE_PARM_DESC(port, "Port to match (0=all)");
|
|
|
|
module_param(port, int, 0);
|
|
|
|
|
2010-01-25 16:47:50 -07:00
|
|
|
static unsigned int bufsize __read_mostly = 4096;
|
2007-07-11 19:43:52 -07:00
|
|
|
MODULE_PARM_DESC(bufsize, "Log buffer size in packets (4096)");
|
2010-01-25 16:47:50 -07:00
|
|
|
module_param(bufsize, uint, 0);
|
2006-06-05 17:30:32 -07:00
|
|
|
|
2013-12-22 23:37:30 -07:00
|
|
|
static unsigned int fwmark __read_mostly;
|
net: tcp_probe: allow more advanced ingress filtering by mark
Currently, the tcp_probe snooper can either filter packets by a given
port (handed to the module via module parameter e.g. port=80) or lets
all TCP traffic pass (port=0, default). When a port is specified, the
port number is tested against the sk's source/destination port. Thus,
if one of them matches, the information will be further processed for
the log.
As this is quite limited, allow for more advanced filtering possibilities
which can facilitate debugging/analysis with the help of the tcp_probe
snooper. Therefore, similarly as added to BPF machine in commit 7e75f93e
("pkt_sched: ingress socket filter by mark"), add the possibility to
use skb->mark as a filter.
If the mark is not being used otherwise, this allows ingress filtering
by flow (e.g. in order to track updates from only a single flow, or a
subset of all flows for a given port) and other things such as dynamic
logging and reconfiguration without removing/re-inserting the tcp_probe
module, etc. Simple example:
insmod net/ipv4/tcp_probe.ko fwmark=8888 full=1
...
iptables -A INPUT -i eth4 -t mangle -p tcp --dport 22 \
--sport 60952 -j MARK --set-mark 8888
[... sampling interval ...]
iptables -D INPUT -i eth4 -t mangle -p tcp --dport 22 \
--sport 60952 -j MARK --set-mark 8888
The current option to filter by a given port is still being preserved. A
similar approach could be done for the sctp_probe module as a follow-up.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-08-23 07:16:33 -07:00
|
|
|
MODULE_PARM_DESC(fwmark, "skb mark to match (0=no mark)");
|
|
|
|
module_param(fwmark, uint, 0);
|
|
|
|
|
2007-03-24 21:35:33 -07:00
|
|
|
static int full __read_mostly;
|
|
|
|
MODULE_PARM_DESC(full, "Full log (1=every ack packet received, 0=only cwnd changes)");
|
|
|
|
module_param(full, int, 0);
|
|
|
|
|
2006-06-05 17:30:32 -07:00
|
|
|
static const char procname[] = "tcpprobe";
|
|
|
|
|
2007-07-11 19:43:52 -07:00
|
|
|
struct tcp_log {
|
|
|
|
ktime_t tstamp;
|
2013-08-21 10:48:00 -07:00
|
|
|
union {
|
|
|
|
struct sockaddr raw;
|
|
|
|
struct sockaddr_in v4;
|
|
|
|
struct sockaddr_in6 v6;
|
|
|
|
} src, dst;
|
2007-07-11 19:43:52 -07:00
|
|
|
u16 length;
|
|
|
|
u32 snd_nxt;
|
|
|
|
u32 snd_una;
|
|
|
|
u32 snd_wnd;
|
2013-08-21 10:47:58 -07:00
|
|
|
u32 rcv_wnd;
|
2007-07-11 19:43:52 -07:00
|
|
|
u32 snd_cwnd;
|
|
|
|
u32 ssthresh;
|
|
|
|
u32 srtt;
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct {
|
2007-03-24 21:35:33 -07:00
|
|
|
spinlock_t lock;
|
2006-06-05 17:30:32 -07:00
|
|
|
wait_queue_head_t wait;
|
2007-03-24 21:35:33 -07:00
|
|
|
ktime_t start;
|
|
|
|
u32 lastcwnd;
|
2006-06-05 17:30:32 -07:00
|
|
|
|
2007-07-11 19:43:52 -07:00
|
|
|
unsigned long head, tail;
|
|
|
|
struct tcp_log *log;
|
|
|
|
} tcp_probe;
|
|
|
|
|
|
|
|
static inline int tcp_probe_used(void)
|
2006-06-05 17:30:32 -07:00
|
|
|
{
|
2010-01-25 16:47:50 -07:00
|
|
|
return (tcp_probe.head - tcp_probe.tail) & (bufsize - 1);
|
2007-07-11 19:43:52 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline int tcp_probe_avail(void)
|
|
|
|
{
|
2010-01-25 16:47:50 -07:00
|
|
|
return bufsize - tcp_probe_used() - 1;
|
2007-06-05 00:19:24 -07:00
|
|
|
}
|
2006-06-05 17:30:32 -07:00
|
|
|
|
2013-08-21 10:48:00 -07:00
|
|
|
#define tcp_probe_copy_fl_to_si4(inet, si4, mem) \
|
|
|
|
do { \
|
|
|
|
si4.sin_family = AF_INET; \
|
|
|
|
si4.sin_port = inet->inet_##mem##port; \
|
|
|
|
si4.sin_addr.s_addr = inet->inet_##mem##addr; \
|
|
|
|
} while (0) \
|
|
|
|
|
2007-03-24 21:35:33 -07:00
|
|
|
/*
|
|
|
|
* Hook inserted to be called before each receive packet.
|
|
|
|
* Note: arguments must match tcp_rcv_established()!
|
|
|
|
*/
|
2013-09-03 12:23:22 -07:00
|
|
|
static void jtcp_rcv_established(struct sock *sk, struct sk_buff *skb,
|
|
|
|
const struct tcphdr *th, unsigned int len)
|
2006-06-05 17:30:32 -07:00
|
|
|
{
|
|
|
|
const struct tcp_sock *tp = tcp_sk(sk);
|
|
|
|
const struct inet_sock *inet = inet_sk(sk);
|
|
|
|
|
net: tcp_probe: allow more advanced ingress filtering by mark
Currently, the tcp_probe snooper can either filter packets by a given
port (handed to the module via module parameter e.g. port=80) or lets
all TCP traffic pass (port=0, default). When a port is specified, the
port number is tested against the sk's source/destination port. Thus,
if one of them matches, the information will be further processed for
the log.
As this is quite limited, allow for more advanced filtering possibilities
which can facilitate debugging/analysis with the help of the tcp_probe
snooper. Therefore, similarly as added to BPF machine in commit 7e75f93e
("pkt_sched: ingress socket filter by mark"), add the possibility to
use skb->mark as a filter.
If the mark is not being used otherwise, this allows ingress filtering
by flow (e.g. in order to track updates from only a single flow, or a
subset of all flows for a given port) and other things such as dynamic
logging and reconfiguration without removing/re-inserting the tcp_probe
module, etc. Simple example:
insmod net/ipv4/tcp_probe.ko fwmark=8888 full=1
...
iptables -A INPUT -i eth4 -t mangle -p tcp --dport 22 \
--sport 60952 -j MARK --set-mark 8888
[... sampling interval ...]
iptables -D INPUT -i eth4 -t mangle -p tcp --dport 22 \
--sport 60952 -j MARK --set-mark 8888
The current option to filter by a given port is still being preserved. A
similar approach could be done for the sctp_probe module as a follow-up.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-08-23 07:16:33 -07:00
|
|
|
/* Only update if port or skb mark matches */
|
|
|
|
if (((port == 0 && fwmark == 0) ||
|
|
|
|
ntohs(inet->inet_dport) == port ||
|
|
|
|
ntohs(inet->inet_sport) == port ||
|
|
|
|
(fwmark > 0 && skb->mark == fwmark)) &&
|
2009-11-23 11:41:23 -07:00
|
|
|
(full || tp->snd_cwnd != tcp_probe.lastcwnd)) {
|
2007-07-11 19:43:52 -07:00
|
|
|
|
|
|
|
spin_lock(&tcp_probe.lock);
|
|
|
|
/* If log fills, just silently drop */
|
|
|
|
if (tcp_probe_avail() > 1) {
|
|
|
|
struct tcp_log *p = tcp_probe.log + tcp_probe.head;
|
|
|
|
|
|
|
|
p->tstamp = ktime_get();
|
2013-08-21 10:48:00 -07:00
|
|
|
switch (sk->sk_family) {
|
|
|
|
case AF_INET:
|
|
|
|
tcp_probe_copy_fl_to_si4(inet, p->src.v4, s);
|
|
|
|
tcp_probe_copy_fl_to_si4(inet, p->dst.v4, d);
|
|
|
|
break;
|
|
|
|
case AF_INET6:
|
ipv6: make lookups simpler and faster
TCP listener refactoring, part 4 :
To speed up inet lookups, we moved IPv4 addresses from inet to struct
sock_common
Now is time to do the same for IPv6, because it permits us to have fast
lookups for all kind of sockets, including upcoming SYN_RECV.
Getting IPv6 addresses in TCP lookups currently requires two extra cache
lines, plus a dereference (and memory stall).
inet6_sk(sk) does the dereference of inet_sk(__sk)->pinet6
This patch is way bigger than its IPv4 counter part, because for IPv4,
we could add aliases (inet_daddr, inet_rcv_saddr), while on IPv6,
it's not doable easily.
inet6_sk(sk)->daddr becomes sk->sk_v6_daddr
inet6_sk(sk)->rcv_saddr becomes sk->sk_v6_rcv_saddr
And timewait socket also have tw->tw_v6_daddr & tw->tw_v6_rcv_saddr
at the same offset.
We get rid of INET6_TW_MATCH() as INET6_MATCH() is now the generic
macro.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-03 15:42:29 -07:00
|
|
|
memset(&p->src.v6, 0, sizeof(p->src.v6));
|
|
|
|
memset(&p->dst.v6, 0, sizeof(p->dst.v6));
|
|
|
|
#if IS_ENABLED(CONFIG_IPV6)
|
|
|
|
p->src.v6.sin6_family = AF_INET6;
|
|
|
|
p->src.v6.sin6_port = inet->inet_sport;
|
|
|
|
p->src.v6.sin6_addr = inet6_sk(sk)->saddr;
|
|
|
|
|
|
|
|
p->dst.v6.sin6_family = AF_INET6;
|
|
|
|
p->dst.v6.sin6_port = inet->inet_dport;
|
|
|
|
p->dst.v6.sin6_addr = sk->sk_v6_daddr;
|
|
|
|
#endif
|
2013-08-21 10:48:00 -07:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
BUG();
|
|
|
|
}
|
|
|
|
|
2007-07-11 19:43:52 -07:00
|
|
|
p->length = skb->len;
|
|
|
|
p->snd_nxt = tp->snd_nxt;
|
|
|
|
p->snd_una = tp->snd_una;
|
|
|
|
p->snd_cwnd = tp->snd_cwnd;
|
|
|
|
p->snd_wnd = tp->snd_wnd;
|
2013-08-21 10:47:58 -07:00
|
|
|
p->rcv_wnd = tp->rcv_wnd;
|
2007-07-14 18:57:19 -07:00
|
|
|
p->ssthresh = tcp_current_ssthresh(sk);
|
2014-02-26 15:02:48 -07:00
|
|
|
p->srtt = tp->srtt_us >> 3;
|
2007-07-11 19:43:52 -07:00
|
|
|
|
2010-01-25 16:47:50 -07:00
|
|
|
tcp_probe.head = (tcp_probe.head + 1) & (bufsize - 1);
|
2007-07-11 19:43:52 -07:00
|
|
|
}
|
|
|
|
tcp_probe.lastcwnd = tp->snd_cwnd;
|
|
|
|
spin_unlock(&tcp_probe.lock);
|
|
|
|
|
|
|
|
wake_up(&tcp_probe.wait);
|
2006-06-05 17:30:32 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
jprobe_return();
|
|
|
|
}
|
|
|
|
|
2007-07-11 19:43:52 -07:00
|
|
|
static struct jprobe tcp_jprobe = {
|
2006-10-02 02:17:30 -07:00
|
|
|
.kp = {
|
2007-03-24 21:35:33 -07:00
|
|
|
.symbol_name = "tcp_rcv_established",
|
2006-10-02 02:17:30 -07:00
|
|
|
},
|
2007-07-19 01:48:10 -07:00
|
|
|
.entry = jtcp_rcv_established,
|
2006-06-05 17:30:32 -07:00
|
|
|
};
|
|
|
|
|
2012-04-14 18:34:41 -07:00
|
|
|
static int tcpprobe_open(struct inode *inode, struct file *file)
|
2006-06-05 17:30:32 -07:00
|
|
|
{
|
2007-07-11 19:43:52 -07:00
|
|
|
/* Reset (empty) log */
|
|
|
|
spin_lock_bh(&tcp_probe.lock);
|
|
|
|
tcp_probe.head = tcp_probe.tail = 0;
|
|
|
|
tcp_probe.start = ktime_get();
|
|
|
|
spin_unlock_bh(&tcp_probe.lock);
|
|
|
|
|
2006-06-05 17:30:32 -07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-07-11 19:43:52 -07:00
|
|
|
static int tcpprobe_sprint(char *tbuf, int n)
|
|
|
|
{
|
|
|
|
const struct tcp_log *p
|
2010-01-25 16:47:50 -07:00
|
|
|
= tcp_probe.log + tcp_probe.tail;
|
2007-07-11 19:43:52 -07:00
|
|
|
struct timespec tv
|
|
|
|
= ktime_to_timespec(ktime_sub(p->tstamp, tcp_probe.start));
|
|
|
|
|
2010-11-14 00:06:08 -07:00
|
|
|
return scnprintf(tbuf, n,
|
2013-08-21 10:48:00 -07:00
|
|
|
"%lu.%09lu %pISpc %pISpc %d %#x %#x %u %u %u %u %u\n",
|
2014-08-29 23:32:05 -07:00
|
|
|
(unsigned long)tv.tv_sec,
|
|
|
|
(unsigned long)tv.tv_nsec,
|
2013-08-21 10:48:00 -07:00
|
|
|
&p->src, &p->dst, p->length, p->snd_nxt, p->snd_una,
|
2013-08-21 10:47:58 -07:00
|
|
|
p->snd_cwnd, p->ssthresh, p->snd_wnd, p->srtt, p->rcv_wnd);
|
2007-07-11 19:43:52 -07:00
|
|
|
}
|
|
|
|
|
2006-06-05 17:30:32 -07:00
|
|
|
static ssize_t tcpprobe_read(struct file *file, char __user *buf,
|
|
|
|
size_t len, loff_t *ppos)
|
|
|
|
{
|
2009-03-13 16:05:14 -07:00
|
|
|
int error = 0;
|
|
|
|
size_t cnt = 0;
|
2006-06-05 17:30:32 -07:00
|
|
|
|
2009-03-13 16:05:14 -07:00
|
|
|
if (!buf)
|
2006-06-05 17:30:32 -07:00
|
|
|
return -EINVAL;
|
|
|
|
|
2007-07-11 19:43:52 -07:00
|
|
|
while (cnt < len) {
|
2013-09-03 09:24:02 -07:00
|
|
|
char tbuf[256];
|
2007-07-11 19:43:52 -07:00
|
|
|
int width;
|
|
|
|
|
|
|
|
/* Wait for data in buffer */
|
|
|
|
error = wait_event_interruptible(tcp_probe.wait,
|
|
|
|
tcp_probe_used() > 0);
|
|
|
|
if (error)
|
|
|
|
break;
|
2006-06-05 17:30:32 -07:00
|
|
|
|
2007-07-11 19:43:52 -07:00
|
|
|
spin_lock_bh(&tcp_probe.lock);
|
|
|
|
if (tcp_probe.head == tcp_probe.tail) {
|
|
|
|
/* multiple readers race? */
|
|
|
|
spin_unlock_bh(&tcp_probe.lock);
|
|
|
|
continue;
|
|
|
|
}
|
2006-06-05 17:30:32 -07:00
|
|
|
|
2007-07-11 19:43:52 -07:00
|
|
|
width = tcpprobe_sprint(tbuf, sizeof(tbuf));
|
2006-06-05 17:30:32 -07:00
|
|
|
|
2008-04-24 21:11:58 -07:00
|
|
|
if (cnt + width < len)
|
2010-01-25 16:47:50 -07:00
|
|
|
tcp_probe.tail = (tcp_probe.tail + 1) & (bufsize - 1);
|
2006-06-05 17:30:32 -07:00
|
|
|
|
2007-07-11 19:43:52 -07:00
|
|
|
spin_unlock_bh(&tcp_probe.lock);
|
|
|
|
|
|
|
|
/* if record greater than space available
|
|
|
|
return partial buffer (so far) */
|
2008-04-24 21:11:58 -07:00
|
|
|
if (cnt + width >= len)
|
2007-07-11 19:43:52 -07:00
|
|
|
break;
|
|
|
|
|
2008-04-24 21:11:58 -07:00
|
|
|
if (copy_to_user(buf + cnt, tbuf, width))
|
|
|
|
return -EFAULT;
|
2007-07-11 19:43:52 -07:00
|
|
|
cnt += width;
|
|
|
|
}
|
2006-06-05 17:30:32 -07:00
|
|
|
|
2007-07-11 19:43:52 -07:00
|
|
|
return cnt == 0 ? error : cnt;
|
2006-06-05 17:30:32 -07:00
|
|
|
}
|
|
|
|
|
2007-02-12 01:55:35 -07:00
|
|
|
static const struct file_operations tcpprobe_fops = {
|
2006-06-05 17:30:32 -07:00
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.open = tcpprobe_open,
|
|
|
|
.read = tcpprobe_read,
|
llseek: automatically add .llseek fop
All file_operations should get a .llseek operation so we can make
nonseekable_open the default for future file operations without a
.llseek pointer.
The three cases that we can automatically detect are no_llseek, seq_lseek
and default_llseek. For cases where we can we can automatically prove that
the file offset is always ignored, we use noop_llseek, which maintains
the current behavior of not returning an error from a seek.
New drivers should normally not use noop_llseek but instead use no_llseek
and call nonseekable_open at open time. Existing drivers can be converted
to do the same when the maintainer knows for certain that no user code
relies on calling seek on the device file.
The generated code is often incorrectly indented and right now contains
comments that clarify for each added line why a specific variant was
chosen. In the version that gets submitted upstream, the comments will
be gone and I will manually fix the indentation, because there does not
seem to be a way to do that using coccinelle.
Some amount of new code is currently sitting in linux-next that should get
the same modifications, which I will do at the end of the merge window.
Many thanks to Julia Lawall for helping me learn to write a semantic
patch that does all this.
===== begin semantic patch =====
// This adds an llseek= method to all file operations,
// as a preparation for making no_llseek the default.
//
// The rules are
// - use no_llseek explicitly if we do nonseekable_open
// - use seq_lseek for sequential files
// - use default_llseek if we know we access f_pos
// - use noop_llseek if we know we don't access f_pos,
// but we still want to allow users to call lseek
//
@ open1 exists @
identifier nested_open;
@@
nested_open(...)
{
<+...
nonseekable_open(...)
...+>
}
@ open exists@
identifier open_f;
identifier i, f;
identifier open1.nested_open;
@@
int open_f(struct inode *i, struct file *f)
{
<+...
(
nonseekable_open(...)
|
nested_open(...)
)
...+>
}
@ read disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ read_no_fpos disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
... when != off
}
@ write @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ write_no_fpos @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
... when != off
}
@ fops0 @
identifier fops;
@@
struct file_operations fops = {
...
};
@ has_llseek depends on fops0 @
identifier fops0.fops;
identifier llseek_f;
@@
struct file_operations fops = {
...
.llseek = llseek_f,
...
};
@ has_read depends on fops0 @
identifier fops0.fops;
identifier read_f;
@@
struct file_operations fops = {
...
.read = read_f,
...
};
@ has_write depends on fops0 @
identifier fops0.fops;
identifier write_f;
@@
struct file_operations fops = {
...
.write = write_f,
...
};
@ has_open depends on fops0 @
identifier fops0.fops;
identifier open_f;
@@
struct file_operations fops = {
...
.open = open_f,
...
};
// use no_llseek if we call nonseekable_open
////////////////////////////////////////////
@ nonseekable1 depends on !has_llseek && has_open @
identifier fops0.fops;
identifier nso ~= "nonseekable_open";
@@
struct file_operations fops = {
... .open = nso, ...
+.llseek = no_llseek, /* nonseekable */
};
@ nonseekable2 depends on !has_llseek @
identifier fops0.fops;
identifier open.open_f;
@@
struct file_operations fops = {
... .open = open_f, ...
+.llseek = no_llseek, /* open uses nonseekable */
};
// use seq_lseek for sequential files
/////////////////////////////////////
@ seq depends on !has_llseek @
identifier fops0.fops;
identifier sr ~= "seq_read";
@@
struct file_operations fops = {
... .read = sr, ...
+.llseek = seq_lseek, /* we have seq_read */
};
// use default_llseek if there is a readdir
///////////////////////////////////////////
@ fops1 depends on !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier readdir_e;
@@
// any other fop is used that changes pos
struct file_operations fops = {
... .readdir = readdir_e, ...
+.llseek = default_llseek, /* readdir is present */
};
// use default_llseek if at least one of read/write touches f_pos
/////////////////////////////////////////////////////////////////
@ fops2 depends on !fops1 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read.read_f;
@@
// read fops use offset
struct file_operations fops = {
... .read = read_f, ...
+.llseek = default_llseek, /* read accesses f_pos */
};
@ fops3 depends on !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write.write_f;
@@
// write fops use offset
struct file_operations fops = {
... .write = write_f, ...
+ .llseek = default_llseek, /* write accesses f_pos */
};
// Use noop_llseek if neither read nor write accesses f_pos
///////////////////////////////////////////////////////////
@ fops4 depends on !fops1 && !fops2 && !fops3 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
identifier write_no_fpos.write_f;
@@
// write fops use offset
struct file_operations fops = {
...
.write = write_f,
.read = read_f,
...
+.llseek = noop_llseek, /* read and write both use no f_pos */
};
@ depends on has_write && !has_read && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write_no_fpos.write_f;
@@
struct file_operations fops = {
... .write = write_f, ...
+.llseek = noop_llseek, /* write uses no f_pos */
};
@ depends on has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
@@
struct file_operations fops = {
... .read = read_f, ...
+.llseek = noop_llseek, /* read uses no f_pos */
};
@ depends on !has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
@@
struct file_operations fops = {
...
+.llseek = noop_llseek, /* no read or write fn */
};
===== End semantic patch =====
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Julia Lawall <julia@diku.dk>
Cc: Christoph Hellwig <hch@infradead.org>
2010-08-15 09:52:59 -07:00
|
|
|
.llseek = noop_llseek,
|
2006-06-05 17:30:32 -07:00
|
|
|
};
|
|
|
|
|
|
|
|
static __init int tcpprobe_init(void)
|
|
|
|
{
|
|
|
|
int ret = -ENOMEM;
|
|
|
|
|
2013-08-21 10:47:59 -07:00
|
|
|
/* Warning: if the function signature of tcp_rcv_established,
|
|
|
|
* has been changed, you also have to change the signature of
|
|
|
|
* jtcp_rcv_established, otherwise you end up right here!
|
|
|
|
*/
|
|
|
|
BUILD_BUG_ON(__same_type(tcp_rcv_established,
|
|
|
|
jtcp_rcv_established) == 0);
|
|
|
|
|
2007-07-11 19:43:52 -07:00
|
|
|
init_waitqueue_head(&tcp_probe.wait);
|
|
|
|
spin_lock_init(&tcp_probe.lock);
|
|
|
|
|
2010-01-25 16:47:50 -07:00
|
|
|
if (bufsize == 0)
|
2007-07-11 19:43:52 -07:00
|
|
|
return -EINVAL;
|
|
|
|
|
2010-01-25 16:47:50 -07:00
|
|
|
bufsize = roundup_pow_of_two(bufsize);
|
2008-07-10 16:51:32 -07:00
|
|
|
tcp_probe.log = kcalloc(bufsize, sizeof(struct tcp_log), GFP_KERNEL);
|
2007-07-11 19:43:52 -07:00
|
|
|
if (!tcp_probe.log)
|
|
|
|
goto err0;
|
2006-06-05 17:30:32 -07:00
|
|
|
|
2013-02-17 18:34:54 -07:00
|
|
|
if (!proc_create(procname, S_IRUSR, init_net.proc_net, &tcpprobe_fops))
|
2006-06-05 17:30:32 -07:00
|
|
|
goto err0;
|
|
|
|
|
2007-07-11 19:43:52 -07:00
|
|
|
ret = register_jprobe(&tcp_jprobe);
|
2006-06-05 17:30:32 -07:00
|
|
|
if (ret)
|
|
|
|
goto err1;
|
|
|
|
|
net: tcp_probe: allow more advanced ingress filtering by mark
Currently, the tcp_probe snooper can either filter packets by a given
port (handed to the module via module parameter e.g. port=80) or lets
all TCP traffic pass (port=0, default). When a port is specified, the
port number is tested against the sk's source/destination port. Thus,
if one of them matches, the information will be further processed for
the log.
As this is quite limited, allow for more advanced filtering possibilities
which can facilitate debugging/analysis with the help of the tcp_probe
snooper. Therefore, similarly as added to BPF machine in commit 7e75f93e
("pkt_sched: ingress socket filter by mark"), add the possibility to
use skb->mark as a filter.
If the mark is not being used otherwise, this allows ingress filtering
by flow (e.g. in order to track updates from only a single flow, or a
subset of all flows for a given port) and other things such as dynamic
logging and reconfiguration without removing/re-inserting the tcp_probe
module, etc. Simple example:
insmod net/ipv4/tcp_probe.ko fwmark=8888 full=1
...
iptables -A INPUT -i eth4 -t mangle -p tcp --dport 22 \
--sport 60952 -j MARK --set-mark 8888
[... sampling interval ...]
iptables -D INPUT -i eth4 -t mangle -p tcp --dport 22 \
--sport 60952 -j MARK --set-mark 8888
The current option to filter by a given port is still being preserved. A
similar approach could be done for the sctp_probe module as a follow-up.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-08-23 07:16:33 -07:00
|
|
|
pr_info("probe registered (port=%d/fwmark=%u) bufsize=%u\n",
|
|
|
|
port, fwmark, bufsize);
|
2006-06-05 17:30:32 -07:00
|
|
|
return 0;
|
|
|
|
err1:
|
2013-02-17 18:34:56 -07:00
|
|
|
remove_proc_entry(procname, init_net.proc_net);
|
2006-06-05 17:30:32 -07:00
|
|
|
err0:
|
2007-07-11 19:43:52 -07:00
|
|
|
kfree(tcp_probe.log);
|
2006-06-05 17:30:32 -07:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
module_init(tcpprobe_init);
|
|
|
|
|
|
|
|
static __exit void tcpprobe_exit(void)
|
|
|
|
{
|
2013-02-17 18:34:56 -07:00
|
|
|
remove_proc_entry(procname, init_net.proc_net);
|
2007-07-11 19:43:52 -07:00
|
|
|
unregister_jprobe(&tcp_jprobe);
|
|
|
|
kfree(tcp_probe.log);
|
2006-06-05 17:30:32 -07:00
|
|
|
}
|
|
|
|
module_exit(tcpprobe_exit);
|