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-- | 5.1 KB |
| Makefile | -rw-r--r-- | 918 bytes |
| acl.h | -rw-r--r-- | 2.4 KB |
| auth.c | -rw-r--r-- | 2.1 KB |
| auth.h | -rw-r--r-- | 378 bytes |
| blocklayout.c | -rw-r--r-- | 11.2 KB |
| blocklayoutxdr.c | -rw-r--r-- | 5.2 KB |
| blocklayoutxdr.h | -rw-r--r-- | 1.4 KB |
| cache.h | -rw-r--r-- | 1.8 KB |
| current_stateid.h | -rw-r--r-- | 1.4 KB |
| export.c | -rw-r--r-- | 31.8 KB |
| export.h | -rw-r--r-- | 3.0 KB |
| fault_inject.c | -rw-r--r-- | 3.7 KB |
| flexfilelayout.c | -rw-r--r-- | 3.4 KB |
| flexfilelayoutxdr.c | -rw-r--r-- | 2.7 KB |
| flexfilelayoutxdr.h | -rw-r--r-- | 1.1 KB |
| idmap.h | -rw-r--r-- | 2.3 KB |
| lockd.c | -rw-r--r-- | 1.7 KB |
| netns.h | -rw-r--r-- | 4.0 KB |
| nfs2acl.c | -rw-r--r-- | 9.3 KB |
| nfs3acl.c | -rw-r--r-- | 6.6 KB |
| nfs3proc.c | -rw-r--r-- | 24.4 KB |
| nfs3xdr.c | -rw-r--r-- | 27.4 KB |
| nfs4acl.c | -rw-r--r-- | 21.8 KB |
| nfs4callback.c | -rw-r--r-- | 31.8 KB |
| nfs4idmap.c | -rw-r--r-- | 16.2 KB |
| nfs4layouts.c | -rw-r--r-- | 18.6 KB |
| nfs4proc.c | -rw-r--r-- | 76.4 KB |
| nfs4recover.c | -rw-r--r-- | 35.5 KB |
| nfs4state.c | -rw-r--r-- | 188.5 KB |
| nfs4xdr.c | -rw-r--r-- | 116.3 KB |
| nfscache.c | -rw-r--r-- | 15.3 KB |
| nfsctl.c | -rw-r--r-- | 33.7 KB |
| nfsd.h | -rw-r--r-- | 16.9 KB |
| nfsfh.c | -rw-r--r-- | 18.5 KB |
| nfsfh.h | -rw-r--r-- | 7.5 KB |
| nfsproc.c | -rw-r--r-- | 21.3 KB |
| nfssvc.c | -rw-r--r-- | 21.6 KB |
| nfsxdr.c | -rw-r--r-- | 13.3 KB |
| pnfs.h | -rw-r--r-- | 2.7 KB |
| state.h | -rw-r--r-- | 23.1 KB |
| stats.c | -rw-r--r-- | 2.7 KB |
| stats.h | -rw-r--r-- | 1.5 KB |
| trace.c | -rw-r--r-- | 48 bytes |
| trace.h | -rw-r--r-- | 4.4 KB |
| vfs.c | -rw-r--r-- | 51.4 KB |
| vfs.h | -rw-r--r-- | 5.8 KB |
| xdr.h | -rw-r--r-- | 3.6 KB |
| xdr3.h | -rw-r--r-- | 7.2 KB |
| xdr4.h | -rw-r--r-- | 24.4 KB |
| xdr4cb.h | -rw-r--r-- | 1.8 KB |
Computing file changes ...
