https://github.com/torvalds/linux
Revision 916f6efae62305796e012e7c3a7884a267cbacbf authored by Florian Westphal on 17 April 2019, 00:17:23 UTC, committed by Pablo Neira Ayuso on 22 April 2019, 08:34:30 UTC
setting net.netfilter.nf_conntrack_timestamp=1 breaks xmit with fq
scheduler. skb->tstamp might be "refreshed" using ktime_get_real(),
but fq expects CLOCK_MONOTONIC.
This patch removes all places in netfilter that check/set skb->tstamp:
1. To fix the bogus "start" time seen with conntrack timestamping for
outgoing packets, never use skb->tstamp and always use current time.
2. In nfqueue and nflog, only use skb->tstamp for incoming packets,
as determined by current hook (prerouting, input, forward).
3. xt_time has to use system clock as well rather than skb->tstamp.
We could still use skb->tstamp for prerouting/input/foward, but
I see no advantage to make this conditional.
Fixes: fb420d5d91c1 ("tcp/fq: move back to CLOCK_MONOTONIC")
Cc: Eric Dumazet <edumazet@google.com>
Reported-by: Michal Soltys <soltys@ziu.info>
Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
1 parent 7caa56f
Tip revision: 916f6efae62305796e012e7c3a7884a267cbacbf authored by Florian Westphal on 17 April 2019, 00:17:23 UTC
netfilter: never get/set skb->tstamp
netfilter: never get/set skb->tstamp
Tip revision: 916f6ef
| File | Mode | Size |
|---|---|---|
| ChangeLog | -rw-r--r-- | 14.0 KB |
| Kconfig | -rw-r--r-- | 917 bytes |
| Makefile | -rw-r--r-- | 206 bytes |
| TODO | -rw-r--r-- | 385 bytes |
| befs.h | -rw-r--r-- | 3.0 KB |
| befs_fs_types.h | -rw-r--r-- | 5.0 KB |
| btree.c | -rw-r--r-- | 21.9 KB |
| btree.h | -rw-r--r-- | 343 bytes |
| datastream.c | -rw-r--r-- | 15.9 KB |
| datastream.h | -rw-r--r-- | 575 bytes |
| debug.c | -rw-r--r-- | 7.1 KB |
| endian.h | -rw-r--r-- | 3.2 KB |
| inode.c | -rw-r--r-- | 1.2 KB |
| inode.h | -rw-r--r-- | 120 bytes |
| io.c | -rw-r--r-- | 1.4 KB |
| io.h | -rw-r--r-- | 110 bytes |
| linuxvfs.c | -rw-r--r-- | 25.6 KB |
| super.c | -rw-r--r-- | 3.3 KB |
| super.h | -rw-r--r-- | 131 bytes |
Computing file changes ...
