net: Postpone skb_clear_delivery_time() until knowing the skb is delivered locally

The previous patches handled the delivery_time in the ingress path
before the routing decision is made.  This patch can postpone clearing
delivery_time in a skb until knowing it is delivered locally and also
set the (rcv) timestamp if needed.  This patch moves the
skb_clear_delivery_time() from dev.c to ip_local_deliver_finish()
and ip6_input_finish().

Signed-off-by: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/dev.c b/net/core/dev.c
index 4b572bbbd07e6869f982c77174e543fd6835ce79..5db2443c237132946fd0f3dc095d29711cccec12 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5220,10 +5220,8 @@ another_round:
                        goto out;
        }
 
-       if (skb_skip_tc_classify(skb)) {
-               skb_clear_delivery_time(skb);
+       if (skb_skip_tc_classify(skb))
                goto skip_classify;
-       }
 
        if (pfmemalloc)
                goto skip_taps;
@@ -5252,14 +5250,12 @@ skip_taps:
                        goto another_round;
                if (!skb)
                        goto out;
-               skb_clear_delivery_time(skb);
 
                nf_skip_egress(skb, false);
                if (nf_ingress(skb, &pt_prev, &ret, orig_dev) < 0)
                        goto out;
-       } else
+       }
 #endif
-               skb_clear_delivery_time(skb);
        skb_reset_redirect(skb);
 skip_classify:
        if (pfmemalloc && !skb_pfmemalloc_protocol(skb))

diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
index d94f9f7e60c35d00c1cfac81f59b20283382b5cf..95f7bb052784e4cacf5aab85a4fa7ce5d6b39633 100644 (file)
--- a/net/ipv4/ip_input.c
+++ b/net/ipv4/ip_input.c
@@ -226,6 +226,7 @@ resubmit:
 
 static int ip_local_deliver_finish(struct net *net, struct sock *sk, struct sk_buff *skb)
 {
+       skb_clear_delivery_time(skb);
        __skb_pull(skb, skb_network_header_len(skb));
 
        rcu_read_lock();

diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c
index d4b1e2c5aa76dd09efc6c48bf7e281447fdf10c1..5b5ea35635f9f8b147dac5d3a126789299a3e932 100644 (file)
--- a/net/ipv6/ip6_input.c
+++ b/net/ipv6/ip6_input.c
@@ -459,6 +459,7 @@ discard:
 
 static int ip6_input_finish(struct net *net, struct sock *sk, struct sk_buff *skb)
 {
+       skb_clear_delivery_time(skb);
        rcu_read_lock();
        ip6_protocol_deliver_rcu(net, skb, 0, false);
        rcu_read_unlock();