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-- | 2.8 KB |
| Makefile | -rw-r--r-- | 484 bytes |
| auth.c | -rw-r--r-- | 12.2 KB |
| budget.c | -rw-r--r-- | 23.9 KB |
| commit.c | -rw-r--r-- | 20.5 KB |
| compress.c | -rw-r--r-- | 6.7 KB |
| crypto.c | -rw-r--r-- | 2.3 KB |
| debug.c | -rw-r--r-- | 84.1 KB |
| debug.h | -rw-r--r-- | 12.5 KB |
| dir.c | -rw-r--r-- | 42.9 KB |
| file.c | -rw-r--r-- | 47.2 KB |
| find.c | -rw-r--r-- | 30.1 KB |
| gc.c | -rw-r--r-- | 28.7 KB |
| io.c | -rw-r--r-- | 35.7 KB |
| ioctl.c | -rw-r--r-- | 6.1 KB |
| journal.c | -rw-r--r-- | 51.3 KB |
| key.h | -rw-r--r-- | 14.9 KB |
| log.c | -rw-r--r-- | 19.9 KB |
| lprops.c | -rw-r--r-- | 36.0 KB |
| lpt.c | -rw-r--r-- | 62.4 KB |
| lpt_commit.c | -rw-r--r-- | 51.2 KB |
| master.c | -rw-r--r-- | 11.7 KB |
| misc.c | -rw-r--r-- | 1.3 KB |
| misc.h | -rw-r--r-- | 8.1 KB |
| orphan.c | -rw-r--r-- | 24.7 KB |
| recovery.c | -rw-r--r-- | 43.6 KB |
| replay.c | -rw-r--r-- | 34.5 KB |
| sb.c | -rw-r--r-- | 26.7 KB |
| scan.c | -rw-r--r-- | 9.5 KB |
| shrinker.c | -rw-r--r-- | 9.6 KB |
| super.c | -rw-r--r-- | 62.9 KB |
| tnc.c | -rw-r--r-- | 92.1 KB |
| tnc_commit.c | -rw-r--r-- | 27.6 KB |
| tnc_misc.c | -rw-r--r-- | 13.3 KB |
| ubifs-media.h | -rw-r--r-- | 24.6 KB |
| ubifs.h | -rw-r--r-- | 71.1 KB |
| xattr.c | -rw-r--r-- | 18.2 KB |
Computing file changes ...
