ipv6: Count interface receive statistics on the ingress netdev

The statistics such as InHdrErrors should be counted on the ingress
netdev rather than on the dev from the dst, which is the egress.

Signed-off-by: Stephen Suryaputra <ssuryaextr@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 21 insertions, 34 deletions

diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
index bc68eb661970..5bc2bf3733ab 100644
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
@@ -280,6 +280,7 @@ static const struct tlvtype_proc tlvprocdestopt_lst[] = {
 
 static int ipv6_destopt_rcv(struct sk_buff *skb)
 {
+        struct inet6_dev *idev = __in6_dev_get(skb->dev);
         struct inet6_skb_parm *opt = IP6CB(skb);
 #if IS_ENABLED(CONFIG_IPV6_MIP6)
         __u16 dstbuf;
@@ -291,7 +292,7 @@ static int ipv6_destopt_rcv(struct sk_buff *skb)
         if (!pskb_may_pull(skb, skb_transport_offset(skb) + 8) ||
             !pskb_may_pull(skb, (skb_transport_offset(skb) +
                                  ((skb_transport_header(skb)[1] + 1) << 3)))) {
-                __IP6_INC_STATS(dev_net(dst->dev), ip6_dst_idev(dst),
+                __IP6_INC_STATS(dev_net(dst->dev), idev,
                                 IPSTATS_MIB_INHDRERRORS);
 fail_and_free:
                 kfree_skb(skb);
@@ -319,8 +320,7 @@ fail_and_free:
                 return 1;
         }
 
-        __IP6_INC_STATS(dev_net(dst->dev),
-                        ip6_dst_idev(dst), IPSTATS_MIB_INHDRERRORS);
+        __IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);
         return -1;
 }
 
@@ -416,8 +416,7 @@ looped_back:
         }
 
         if (hdr->segments_left >= (hdr->hdrlen >> 1)) {
-                __IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),
-                                IPSTATS_MIB_INHDRERRORS);
+                __IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);
                 icmpv6_param_prob(skb, ICMPV6_HDR_FIELD,
                                   ((&hdr->segments_left) -
                                    skb_network_header(skb)));
@@ -456,8 +455,7 @@ looped_back:
 
         if (skb_dst(skb)->dev->flags & IFF_LOOPBACK) {
                 if (ipv6_hdr(skb)->hop_limit <= 1) {
-                        __IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),
-                                        IPSTATS_MIB_INHDRERRORS);
+                        __IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);
                         icmpv6_send(skb, ICMPV6_TIME_EXCEED,
                                     ICMPV6_EXC_HOPLIMIT, 0);
                         kfree_skb(skb);
@@ -481,10 +479,10 @@ looped_back:
 /* called with rcu_read_lock() */
 static int ipv6_rthdr_rcv(struct sk_buff *skb)
 {
+        struct inet6_dev *idev = __in6_dev_get(skb->dev);
         struct inet6_skb_parm *opt = IP6CB(skb);
         struct in6_addr *addr = NULL;
         struct in6_addr daddr;
-        struct inet6_dev *idev;
         int n, i;
         struct ipv6_rt_hdr *hdr;
         struct rt0_hdr *rthdr;
@@ -498,8 +496,7 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb)
         if (!pskb_may_pull(skb, skb_transport_offset(skb) + 8) ||
             !pskb_may_pull(skb, (skb_transport_offset(skb) +
                                  ((skb_transport_header(skb)[1] + 1) << 3)))) {
-                __IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),
-                                IPSTATS_MIB_INHDRERRORS);
+                __IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);
                 kfree_skb(skb);
                 return -1;
         }
@@ -508,8 +505,7 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb)
 
         if (ipv6_addr_is_multicast(&ipv6_hdr(skb)->daddr) ||
             skb->pkt_type != PACKET_HOST) {
-                __IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),
-                                IPSTATS_MIB_INADDRERRORS);
+                __IP6_INC_STATS(net, idev, IPSTATS_MIB_INADDRERRORS);
                 kfree_skb(skb);
                 return -1;
         }
@@ -527,7 +523,7 @@ looped_back:
                          * processed by own
                          */
                         if (!addr) {
-                                __IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),
+                                __IP6_INC_STATS(net, idev,
                                                 IPSTATS_MIB_INADDRERRORS);
                                 kfree_skb(skb);
                                 return -1;
@@ -553,8 +549,7 @@ looped_back:
                         goto unknown_rh;
                 /* Silently discard invalid RTH type 2 */
                 if (hdr->hdrlen != 2 || hdr->segments_left != 1) {
-                        __IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),
-                                        IPSTATS_MIB_INHDRERRORS);
+                        __IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);
                         kfree_skb(skb);
                         return -1;
                 }
@@ -572,8 +567,7 @@ looped_back:
         n = hdr->hdrlen >> 1;
 
         if (hdr->segments_left > n) {
-                __IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),
-                                IPSTATS_MIB_INHDRERRORS);
+                __IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);
                 icmpv6_param_prob(skb, ICMPV6_HDR_FIELD,
                                   ((&hdr->segments_left) -
                                    skb_network_header(skb)));
@@ -609,14 +603,12 @@ looped_back:
                 if (xfrm6_input_addr(skb, (xfrm_address_t *)addr,
                                      (xfrm_address_t *)&ipv6_hdr(skb)->saddr,
                                      IPPROTO_ROUTING) < 0) {
-                        __IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),
-                                        IPSTATS_MIB_INADDRERRORS);
+                        __IP6_INC_STATS(net, idev, IPSTATS_MIB_INADDRERRORS);
                         kfree_skb(skb);
                         return -1;
                 }
                 if (!ipv6_chk_home_addr(dev_net(skb_dst(skb)->dev), addr)) {
-                        __IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),
-                                        IPSTATS_MIB_INADDRERRORS);
+                        __IP6_INC_STATS(net, idev, IPSTATS_MIB_INADDRERRORS);
                         kfree_skb(skb);
                         return -1;
                 }
@@ -627,8 +619,7 @@ looped_back:
         }
 
         if (ipv6_addr_is_multicast(addr)) {
-                __IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),
-                                IPSTATS_MIB_INADDRERRORS);
+                __IP6_INC_STATS(net, idev, IPSTATS_MIB_INADDRERRORS);
                 kfree_skb(skb);
                 return -1;
         }
@@ -647,8 +638,7 @@ looped_back:
 
         if (skb_dst(skb)->dev->flags&IFF_LOOPBACK) {
                 if (ipv6_hdr(skb)->hop_limit <= 1) {
-                        __IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),
-                                        IPSTATS_MIB_INHDRERRORS);
+                        __IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);
                         icmpv6_send(skb, ICMPV6_TIME_EXCEED, ICMPV6_EXC_HOPLIMIT,
                                     0);
                         kfree_skb(skb);
@@ -663,7 +653,7 @@ looped_back:
         return -1;
 
 unknown_rh:
-        __IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)), IPSTATS_MIB_INHDRERRORS);
+        __IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);
         icmpv6_param_prob(skb, ICMPV6_HDR_FIELD,
                           (&hdr->type) - skb_network_header(skb));
         return -1;
@@ -755,34 +745,31 @@ static bool ipv6_hop_ra(struct sk_buff *skb, int optoff)
 static bool ipv6_hop_jumbo(struct sk_buff *skb, int optoff)
 {
         const unsigned char *nh = skb_network_header(skb);
+        struct inet6_dev *idev = __in6_dev_get_safely(skb->dev);
         struct net *net = ipv6_skb_net(skb);
         u32 pkt_len;
 
         if (nh[optoff + 1] != 4 || (optoff & 3) != 2) {
                 net_dbg_ratelimited("ipv6_hop_jumbo: wrong jumbo opt length/alignment %d\n",
                                     nh[optoff+1]);
-                __IP6_INC_STATS(net, ipv6_skb_idev(skb),
-                                IPSTATS_MIB_INHDRERRORS);
+                __IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);
                 goto drop;
         }
 
         pkt_len = ntohl(*(__be32 *)(nh + optoff + 2));
         if (pkt_len <= IPV6_MAXPLEN) {
-                __IP6_INC_STATS(net, ipv6_skb_idev(skb),
-                                IPSTATS_MIB_INHDRERRORS);
+                __IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);
                 icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, optoff+2);
                 return false;
         }
         if (ipv6_hdr(skb)->payload_len) {
-                __IP6_INC_STATS(net, ipv6_skb_idev(skb),
-                                IPSTATS_MIB_INHDRERRORS);
+                __IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);
                 icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, optoff);
                 return false;
         }
 
         if (pkt_len > skb->len - sizeof(struct ipv6hdr)) {
-                __IP6_INC_STATS(net, ipv6_skb_idev(skb),
-                                IPSTATS_MIB_INTRUNCATEDPKTS);
+                __IP6_INC_STATS(net, idev, IPSTATS_MIB_INTRUNCATEDPKTS);
                 goto drop;
         }