]> git.baikalelectronics.ru Git - kernel.git/commit
netfilter: never get/set skb->tstamp
authorFlorian Westphal <fw@strlen.de>
Wed, 17 Apr 2019 00:17:23 +0000 (02:17 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 22 Apr 2019 08:34:30 +0000 (10:34 +0200)
commit9322fb6339df12f0dd9a50958c7da09905adcdd2
tree59c30037beaae0f4685e6ac4117764f67169bb29
parentd49732edaea111a0859a2de863f37427e227588a
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: 8932dea156bd ("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>
net/netfilter/nf_conntrack_core.c
net/netfilter/nfnetlink_log.c
net/netfilter/nfnetlink_queue.c
net/netfilter/xt_time.c