Skip to main content

Browse the archive

https://github.com/torvalds/linux
23 October 2021, 00:29:24 UTC
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 
netfilter: never get/set skb->tstamp
 
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
History
Tip revision: 916f6efae62305796e012e7c3a7884a267cbacbf authored by Florian Westphal on 17 April 2019, 00:17:23 UTC
netfilter: never get/set skb->tstamp
Tip revision: 916f6ef
File Mode Size
Kconfig -rw-r--r-- 2.4 KB
Makefile -rw-r--r-- 317 bytes
compat.c -rw-r--r-- 3.3 KB
dquot.c -rw-r--r-- 79.1 KB
kqid.c -rw-r--r-- 3.2 KB
netlink.c -rw-r--r-- 2.8 KB
quota.c -rw-r--r-- 24.5 KB
quota_tree.c -rw-r--r-- 18.2 KB
quota_tree.h -rw-r--r-- 728 bytes
quota_v1.c -rw-r--r-- 6.6 KB
quota_v2.c -rw-r--r-- 11.8 KB
quotaio_v1.h -rw-r--r-- 1.3 KB
quotaio_v2.h -rw-r--r-- 2.6 KB
back to top