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 |
|---|---|---|
| Kconfig | -rw-r--r-- | 1.4 KB |
| Makefile | -rw-r--r-- | 343 bytes |
| acl.c | -rw-r--r-- | 3.2 KB |
| acl.h | -rw-r--r-- | 743 bytes |
| aops.c | -rw-r--r-- | 23.9 KB |
| aops.h | -rw-r--r-- | 587 bytes |
| bmap.c | -rw-r--r-- | 63.6 KB |
| bmap.h | -rw-r--r-- | 2.2 KB |
| dentry.c | -rw-r--r-- | 2.7 KB |
| dir.c | -rw-r--r-- | 52.2 KB |
| dir.h | -rw-r--r-- | 2.6 KB |
| export.c | -rw-r--r-- | 4.7 KB |
| file.c | -rw-r--r-- | 33.1 KB |
| gfs2.h | -rw-r--r-- | 524 bytes |
| glock.c | -rw-r--r-- | 53.5 KB |
| glock.h | -rw-r--r-- | 8.9 KB |
| glops.c | -rw-r--r-- | 16.6 KB |
| glops.h | -rw-r--r-- | 1.1 KB |
| incore.h | -rw-r--r-- | 23.4 KB |
| inode.c | -rw-r--r-- | 48.9 KB |
| inode.h | -rw-r--r-- | 4.2 KB |
| lock_dlm.c | -rw-r--r-- | 39.1 KB |
| log.c | -rw-r--r-- | 28.1 KB |
| log.h | -rw-r--r-- | 2.4 KB |
| lops.c | -rw-r--r-- | 21.6 KB |
| lops.h | -rw-r--r-- | 3.0 KB |
| main.c | -rw-r--r-- | 6.0 KB |
| meta_io.c | -rw-r--r-- | 10.7 KB |
| meta_io.h | -rw-r--r-- | 2.6 KB |
| ops_fstype.c | -rw-r--r-- | 34.8 KB |
| quota.c | -rw-r--r-- | 42.5 KB |
| quota.h | -rw-r--r-- | 2.2 KB |
| recovery.c | -rw-r--r-- | 13.5 KB |
| recovery.h | -rw-r--r-- | 1.3 KB |
| rgrp.c | -rw-r--r-- | 71.4 KB |
| rgrp.h | -rw-r--r-- | 3.5 KB |
| super.c | -rw-r--r-- | 42.4 KB |
| super.h | -rw-r--r-- | 1.9 KB |
| sys.c | -rw-r--r-- | 17.8 KB |
| sys.h | -rw-r--r-- | 659 bytes |
| trace_gfs2.h | -rw-r--r-- | 17.5 KB |
| trans.c | -rw-r--r-- | 7.1 KB |
| trans.h | -rw-r--r-- | 1.5 KB |
| util.c | -rw-r--r-- | 7.5 KB |
| util.h | -rw-r--r-- | 5.1 KB |
| xattr.c | -rw-r--r-- | 32.0 KB |
| xattr.h | -rw-r--r-- | 2.0 KB |
Computing file changes ...
