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 |
|---|---|---|
| platform | ||
| acbuffer.h | -rw-r--r-- | 8.6 KB |
| acconfig.h | -rw-r--r-- | 7.4 KB |
| acexcep.h | -rw-r--r-- | 16.8 KB |
| acnames.h | -rw-r--r-- | 2.1 KB |
| acoutput.h | -rw-r--r-- | 16.4 KB |
| acpi.h | -rw-r--r-- | 1.3 KB |
| acpi_bus.h | -rw-r--r-- | 19.1 KB |
| acpi_drivers.h | -rw-r--r-- | 4.2 KB |
| acpi_io.h | -rw-r--r-- | 713 bytes |
| acpi_lpat.h | -rw-r--r-- | 1.5 KB |
| acpi_numa.h | -rw-r--r-- | 623 bytes |
| acpiosxf.h | -rw-r--r-- | 11.3 KB |
| acpixf.h | -rw-r--r-- | 30.2 KB |
| acrestyp.h | -rw-r--r-- | 18.8 KB |
| actbl.h | -rw-r--r-- | 18.3 KB |
| actbl1.h | -rw-r--r-- | 40.3 KB |
| actbl2.h | -rw-r--r-- | 45.5 KB |
| actbl3.h | -rw-r--r-- | 20.9 KB |
| actypes.h | -rw-r--r-- | 40.8 KB |
| acuuid.h | -rw-r--r-- | 2.4 KB |
| apei.h | -rw-r--r-- | 1.3 KB |
| battery.h | -rw-r--r-- | 561 bytes |
| button.h | -rw-r--r-- | 621 bytes |
| cppc_acpi.h | -rw-r--r-- | 3.3 KB |
| ghes.h | -rw-r--r-- | 2.9 KB |
| hed.h | -rw-r--r-- | 371 bytes |
| nfit.h | -rw-r--r-- | 351 bytes |
| pcc.h | -rw-r--r-- | 816 bytes |
| pdc_intel.h | -rw-r--r-- | 1.0 KB |
| processor.h | -rw-r--r-- | 11.0 KB |
| reboot.h | -rw-r--r-- | 201 bytes |
| video.h | -rw-r--r-- | 2.8 KB |
Computing file changes ...
