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-- | 4.1 KB |
| Makefile | -rw-r--r-- | 774 bytes |
| font_10x18.c | -rw-r--r-- | 140.6 KB |
| font_6x10.c | -rw-r--r-- | 60.8 KB |
| font_6x11.c | -rw-r--r-- | 66.6 KB |
| font_7x14.c | -rw-r--r-- | 79.3 KB |
| font_8x16.c | -rw-r--r-- | 93.9 KB |
| font_8x8.c | -rw-r--r-- | 49.9 KB |
| font_acorn_8x8.c | -rw-r--r-- | 15.7 KB |
| font_mini_4x6.c | -rw-r--r-- | 54.6 KB |
| font_pearl_8x8.c | -rw-r--r-- | 54.6 KB |
| font_sun12x22.c | -rw-r--r-- | 181.5 KB |
| font_sun8x16.c | -rw-r--r-- | 22.1 KB |
| font_ter16x32.c | -rw-r--r-- | 100.8 KB |
| fonts.c | -rw-r--r-- | 3.1 KB |
Computing file changes ...
