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 |
|---|---|---|
| partitions | ||
| Kconfig | -rw-r--r-- | 6.5 KB |
| Kconfig.iosched | -rw-r--r-- | 1.1 KB |
| Makefile | -rw-r--r-- | 1.5 KB |
| badblocks.c | -rw-r--r-- | 14.5 KB |
| bfq-cgroup.c | -rw-r--r-- | 33.5 KB |
| bfq-iosched.c | -rw-r--r-- | 194.9 KB |
| bfq-iosched.h | -rw-r--r-- | 35.0 KB |
| bfq-wf2q.c | -rw-r--r-- | 52.4 KB |
| bio-integrity.c | -rw-r--r-- | 12.9 KB |
| bio.c | -rw-r--r-- | 54.5 KB |
| blk-cgroup.c | -rw-r--r-- | 46.6 KB |
| blk-core.c | -rw-r--r-- | 48.5 KB |
| blk-exec.c | -rw-r--r-- | 2.5 KB |
| blk-flush.c | -rw-r--r-- | 14.4 KB |
| blk-integrity.c | -rw-r--r-- | 12.0 KB |
| blk-ioc.c | -rw-r--r-- | 10.2 KB |
| blk-iolatency.c | -rw-r--r-- | 28.1 KB |
| blk-lib.c | -rw-r--r-- | 10.2 KB |
| blk-map.c | -rw-r--r-- | 5.9 KB |
| blk-merge.c | -rw-r--r-- | 24.1 KB |
| blk-mq-cpumap.c | -rw-r--r-- | 1.7 KB |
| blk-mq-debugfs-zoned.c | -rw-r--r-- | 435 bytes |
| blk-mq-debugfs.c | -rw-r--r-- | 26.2 KB |
| blk-mq-debugfs.h | -rw-r--r-- | 2.7 KB |
| blk-mq-pci.c | -rw-r--r-- | 1.7 KB |
| blk-mq-rdma.c | -rw-r--r-- | 1.7 KB |
| blk-mq-sched.c | -rw-r--r-- | 13.2 KB |
| blk-mq-sched.h | -rw-r--r-- | 2.6 KB |
| blk-mq-sysfs.c | -rw-r--r-- | 8.4 KB |
| blk-mq-tag.c | -rw-r--r-- | 14.5 KB |
| blk-mq-tag.h | -rw-r--r-- | 2.3 KB |
| blk-mq-virtio.c | -rw-r--r-- | 1.7 KB |
| blk-mq.c | -rw-r--r-- | 84.7 KB |
| blk-mq.h | -rw-r--r-- | 6.5 KB |
| blk-pm.c | -rw-r--r-- | 6.6 KB |
| blk-pm.h | -rw-r--r-- | 1.4 KB |
| blk-rq-qos.c | -rw-r--r-- | 6.3 KB |
| blk-rq-qos.h | -rw-r--r-- | 4.4 KB |
| blk-settings.c | -rw-r--r-- | 26.7 KB |
| blk-softirq.c | -rw-r--r-- | 3.7 KB |
| blk-stat.c | -rw-r--r-- | 4.6 KB |
| blk-stat.h | -rw-r--r-- | 4.6 KB |
| blk-sysfs.c | -rw-r--r-- | 25.2 KB |
| blk-throttle.c | -rw-r--r-- | 67.9 KB |
| blk-timeout.c | -rw-r--r-- | 3.7 KB |
| blk-wbt.c | -rw-r--r-- | 19.9 KB |
| blk-wbt.h | -rw-r--r-- | 3.0 KB |
| blk-zoned.c | -rw-r--r-- | 11.7 KB |
| blk.h | -rw-r--r-- | 10.1 KB |
| bounce.c | -rw-r--r-- | 9.4 KB |
| bsg-lib.c | -rw-r--r-- | 10.4 KB |
| bsg.c | -rw-r--r-- | 11.3 KB |
| cmdline-parser.c | -rw-r--r-- | 4.9 KB |
| compat_ioctl.c | -rw-r--r-- | 10.9 KB |
| elevator.c | -rw-r--r-- | 16.4 KB |
| genhd.c | -rw-r--r-- | 49.5 KB |
| ioctl.c | -rw-r--r-- | 15.3 KB |
| ioprio.c | -rw-r--r-- | 5.1 KB |
| kyber-iosched.c | -rw-r--r-- | 28.3 KB |
| mq-deadline.c | -rw-r--r-- | 20.6 KB |
| opal_proto.h | -rw-r--r-- | 9.3 KB |
| partition-generic.c | -rw-r--r-- | 17.1 KB |
| scsi_ioctl.c | -rw-r--r-- | 19.1 KB |
| sed-opal.c | -rw-r--r-- | 58.8 KB |
| t10-pi.c | -rw-r--r-- | 7.9 KB |
Computing file changes ...
