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
File | Mode | Size |
---|---|---|
Kconfig | -rw-r--r-- | 3.2 KB |
Makefile | -rw-r--r-- | 459 bytes |
aops.c | -rw-r--r-- | 52.4 KB |
aops.h | -rw-r--r-- | 3.9 KB |
attrib.c | -rw-r--r-- | 89.6 KB |
attrib.h | -rw-r--r-- | 4.2 KB |
bitmap.c | -rw-r--r-- | 5.4 KB |
bitmap.h | -rw-r--r-- | 3.5 KB |
collate.c | -rw-r--r-- | 3.6 KB |
collate.h | -rw-r--r-- | 1.7 KB |
compress.c | -rw-r--r-- | 28.7 KB |
debug.c | -rw-r--r-- | 4.8 KB |
debug.h | -rw-r--r-- | 2.3 KB |
dir.c | -rw-r--r-- | 51.5 KB |
dir.h | -rw-r--r-- | 1.6 KB |
endian.h | -rw-r--r-- | 2.2 KB |
file.c | -rw-r--r-- | 60.6 KB |
index.c | -rw-r--r-- | 14.8 KB |
index.h | -rw-r--r-- | 5.5 KB |
inode.c | -rw-r--r-- | 96.5 KB |
inode.h | -rw-r--r-- | 11.1 KB |
layout.h | -rw-r--r-- | 97.0 KB |
lcnalloc.c | -rw-r--r-- | 32.4 KB |
lcnalloc.h | -rw-r--r-- | 5.7 KB |
logfile.c | -rw-r--r-- | 28.2 KB |
logfile.h | -rw-r--r-- | 13.5 KB |
malloc.h | -rw-r--r-- | 3.0 KB |
mft.c | -rw-r--r-- | 99.4 KB |
mft.h | -rw-r--r-- | 4.0 KB |
mst.c | -rw-r--r-- | 6.9 KB |
namei.c | -rw-r--r-- | 14.1 KB |
ntfs.h | -rw-r--r-- | 5.0 KB |
quota.c | -rw-r--r-- | 3.6 KB |
quota.h | -rw-r--r-- | 1.2 KB |
runlist.c | -rw-r--r-- | 59.5 KB |
runlist.h | -rw-r--r-- | 3.3 KB |
super.c | -rw-r--r-- | 99.6 KB |
sysctl.c | -rw-r--r-- | 2.3 KB |
sysctl.h | -rw-r--r-- | 1.4 KB |
time.h | -rw-r--r-- | 3.5 KB |
types.h | -rw-r--r-- | 2.0 KB |
unistr.c | -rw-r--r-- | 12.2 KB |
upcase.c | -rw-r--r-- | 3.8 KB |
usnjrnl.c | -rw-r--r-- | 2.7 KB |
usnjrnl.h | -rw-r--r-- | 9.1 KB |
volume.h | -rw-r--r-- | 6.8 KB |
Computing file changes ...