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 |
---|---|---|
kasan | ||
Kconfig | -rw-r--r-- | 24.6 KB |
Kconfig.debug | -rw-r--r-- | 4.3 KB |
Makefile | -rw-r--r-- | 3.5 KB |
backing-dev.c | -rw-r--r-- | 27.0 KB |
balloon_compaction.c | -rw-r--r-- | 5.5 KB |
cleancache.c | -rw-r--r-- | 9.9 KB |
cma.c | -rw-r--r-- | 14.1 KB |
cma.h | -rw-r--r-- | 573 bytes |
cma_debug.c | -rw-r--r-- | 4.5 KB |
compaction.c | -rw-r--r-- | 75.0 KB |
debug.c | -rw-r--r-- | 5.9 KB |
debug_page_ref.c | -rw-r--r-- | 1.4 KB |
dmapool.c | -rw-r--r-- | 13.9 KB |
early_ioremap.c | -rw-r--r-- | 6.8 KB |
fadvise.c | -rw-r--r-- | 5.3 KB |
failslab.c | -rw-r--r-- | 1.4 KB |
filemap.c | -rw-r--r-- | 95.4 KB |
frame_vector.c | -rw-r--r-- | 6.4 KB |
frontswap.c | -rw-r--r-- | 14.2 KB |
gup.c | -rw-r--r-- | 54.9 KB |
gup_benchmark.c | -rw-r--r-- | 2.7 KB |
highmem.c | -rw-r--r-- | 11.7 KB |
hmm.c | -rw-r--r-- | 33.2 KB |
huge_memory.c | -rw-r--r-- | 82.5 KB |
hugetlb.c | -rw-r--r-- | 133.0 KB |
hugetlb_cgroup.c | -rw-r--r-- | 10.9 KB |
hwpoison-inject.c | -rw-r--r-- | 3.2 KB |
init-mm.c | -rw-r--r-- | 1.2 KB |
internal.h | -rw-r--r-- | 17.3 KB |
interval_tree.c | -rw-r--r-- | 3.1 KB |
khugepaged.c | -rw-r--r-- | 48.1 KB |
kmemleak-test.c | -rw-r--r-- | 3.2 KB |
kmemleak.c | -rw-r--r-- | 60.5 KB |
ksm.c | -rw-r--r-- | 89.4 KB |
list_lru.c | -rw-r--r-- | 14.6 KB |
maccess.c | -rw-r--r-- | 3.1 KB |
madvise.c | -rw-r--r-- | 22.9 KB |
memblock.c | -rw-r--r-- | 54.9 KB |
memcontrol.c | -rw-r--r-- | 170.3 KB |
memfd.c | -rw-r--r-- | 7.8 KB |
memory-failure.c | -rw-r--r-- | 52.1 KB |
memory.c | -rw-r--r-- | 124.5 KB |
memory_hotplug.c | -rw-r--r-- | 48.7 KB |
mempolicy.c | -rw-r--r-- | 72.4 KB |
mempool.c | -rw-r--r-- | 15.8 KB |
memtest.c | -rw-r--r-- | 2.8 KB |
migrate.c | -rw-r--r-- | 76.8 KB |
mincore.c | -rw-r--r-- | 6.7 KB |
mlock.c | -rw-r--r-- | 22.6 KB |
mm_init.c | -rw-r--r-- | 4.8 KB |
mmap.c | -rw-r--r-- | 99.9 KB |
mmu_context.c | -rw-r--r-- | 1.3 KB |
mmu_gather.c | -rw-r--r-- | 6.3 KB |
mmu_notifier.c | -rw-r--r-- | 11.5 KB |
mmzone.c | -rw-r--r-- | 2.4 KB |
mprotect.c | -rw-r--r-- | 15.6 KB |
mremap.c | -rw-r--r-- | 19.3 KB |
msync.c | -rw-r--r-- | 2.6 KB |
nommu.c | -rw-r--r-- | 47.6 KB |
oom_kill.c | -rw-r--r-- | 30.3 KB |
page-writeback.c | -rw-r--r-- | 84.4 KB |
page_alloc.c | -rw-r--r-- | 232.7 KB |
page_counter.c | -rw-r--r-- | 6.6 KB |
page_ext.c | -rw-r--r-- | 11.0 KB |
page_idle.c | -rw-r--r-- | 5.5 KB |
page_io.c | -rw-r--r-- | 10.5 KB |
page_isolation.c | -rw-r--r-- | 9.3 KB |
page_owner.c | -rw-r--r-- | 15.1 KB |
page_poison.c | -rw-r--r-- | 3.0 KB |
page_vma_mapped.c | -rw-r--r-- | 7.6 KB |
pagewalk.c | -rw-r--r-- | 8.7 KB |
percpu-internal.h | -rw-r--r-- | 5.9 KB |
percpu-km.c | -rw-r--r-- | 3.0 KB |
percpu-stats.c | -rw-r--r-- | 5.7 KB |
percpu-vm.c | -rw-r--r-- | 10.3 KB |
percpu.c | -rw-r--r-- | 85.7 KB |
pgtable-generic.c | -rw-r--r-- | 5.3 KB |
process_vm_access.c | -rw-r--r-- | 10.0 KB |
quicklist.c | -rw-r--r-- | 2.4 KB |
readahead.c | -rw-r--r-- | 16.5 KB |
rmap.c | -rw-r--r-- | 53.7 KB |
rodata_test.c | -rw-r--r-- | 1.4 KB |
shmem.c | -rw-r--r-- | 104.8 KB |
slab.c | -rw-r--r-- | 111.2 KB |
slab.h | -rw-r--r-- | 14.6 KB |
slab_common.c | -rw-r--r-- | 39.1 KB |
slob.c | -rw-r--r-- | 16.2 KB |
slub.c | -rw-r--r-- | 143.1 KB |
sparse-vmemmap.c | -rw-r--r-- | 6.6 KB |
sparse.c | -rw-r--r-- | 21.4 KB |
swap.c | -rw-r--r-- | 28.6 KB |
swap_cgroup.c | -rw-r--r-- | 5.2 KB |
swap_slots.c | -rw-r--r-- | 9.4 KB |
swap_state.c | -rw-r--r-- | 22.4 KB |
swapfile.c | -rw-r--r-- | 91.6 KB |
truncate.c | -rw-r--r-- | 26.4 KB |
usercopy.c | -rw-r--r-- | 9.5 KB |
userfaultfd.c | -rw-r--r-- | 16.0 KB |
util.c | -rw-r--r-- | 20.0 KB |
vmacache.c | -rw-r--r-- | 2.7 KB |
vmalloc.c | -rw-r--r-- | 70.9 KB |
vmpressure.c | -rw-r--r-- | 13.9 KB |
vmscan.c | -rw-r--r-- | 122.8 KB |
vmstat.c | -rw-r--r-- | 51.6 KB |
workingset.c | -rw-r--r-- | 19.1 KB |
z3fold.c | -rw-r--r-- | 30.6 KB |
zbud.c | -rw-r--r-- | 18.2 KB |
zpool.c | -rw-r--r-- | 10.7 KB |
zsmalloc.c | -rw-r--r-- | 60.4 KB |
zswap.c | -rw-r--r-- | 34.7 KB |
Computing file changes ...