net: Convert net_ratelimit uses to net_<level>_ratelimited

Standardize the net core ratelimited logging functions.

Coalesce formats, align arguments.
Change a printk then vprintk sequence to use printf extension %pV.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

14 files changed, 41 insertions, 75 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 8b7f100a4b4..4d1d51a0bd2 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1415,9 +1415,8 @@ void addrconf_dad_failure(struct inet6_ifaddr *ifp)
                 return;
         }
 
-        if (net_ratelimit())
-                printk(KERN_INFO "%s: IPv6 duplicate address %pI6c detected!\n",
-                        ifp->idev->dev->name, &ifp->addr);
+        net_info_ratelimited("%s: IPv6 duplicate address %pI6c detected!\n",
+                             ifp->idev->dev->name, &ifp->addr);
 
         if (idev->cnf.accept_dad > 1 && !idev->cnf.disable_ipv6) {
                 struct in6_addr addr;
@@ -1847,16 +1846,15 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len, bool sllao)
         prefered_lft = ntohl(pinfo->prefered);
 
         if (prefered_lft > valid_lft) {
-                if (net_ratelimit())
-                        printk(KERN_WARNING "addrconf: prefix option has invalid lifetime\n");
+                net_warn_ratelimited("addrconf: prefix option has invalid lifetime\n");
                 return;
         }
 
         in6_dev = in6_dev_get(dev);
 
         if (in6_dev == NULL) {
-                if (net_ratelimit())
-                        printk(KERN_DEBUG "addrconf: device %s not configured\n", dev->name);
+                net_dbg_ratelimited("addrconf: device %s not configured\n",
+                                    dev->name);
                 return;
         }
 
@@ -1931,9 +1929,8 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len, bool sllao)
                         }
                         goto ok;
                 }
-                if (net_ratelimit())
-                        printk(KERN_DEBUG "IPv6 addrconf: prefix with wrong length %d\n",
-                               pinfo->prefix_len);
+                net_dbg_ratelimited("IPv6 addrconf: prefix with wrong length %d\n",
+                                    pinfo->prefix_len);
                 in6_dev_put(in6_dev);
                 return;
 
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
index 2ae79dbeec2..a9f4156f7c3 100644
--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@@ -189,8 +189,8 @@ static void ipv6_rearrange_destopt(struct ipv6hdr *iph, struct ipv6_opt_hdr *des
 
                                 hao = (struct ipv6_destopt_hao *)&opt[off];
                                 if (hao->length != sizeof(hao->addr)) {
-                                        if (net_ratelimit())
-                                                printk(KERN_WARNING "destopt hao: invalid header length: %u\n", hao->length);
+                                        net_warn_ratelimited("destopt hao: invalid header length: %u\n",
+                                                             hao->length);
                                         goto bad;
                                 }
                                 final_addr = hao->addr;
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index d8e05af2c4b..be2264e7dd2 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -252,8 +252,7 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6,
                                dst->dev, dst_output);
         }
 
-        if (net_ratelimit())
-                printk(KERN_DEBUG "IPv6: sending pkt_too_big to self\n");
+        net_dbg_ratelimited("IPv6: sending pkt_too_big to self\n");
         skb->dev = dst->dev;
         icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);
         IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)), IPSTATS_MIB_FRAGFAILS);
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 5df487c81ed..27fec272d39 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -460,19 +460,14 @@ ip6_tnl_err(struct sk_buff *skb, __u8 ipproto, struct inet6_skb_parm *opt,
                 struct ipv6_tlv_tnl_enc_lim *tel;
                 __u32 mtu;
         case ICMPV6_DEST_UNREACH:
-                if (net_ratelimit())
-                        printk(KERN_WARNING
-                               "%s: Path to destination invalid "
-                               "or inactive!\n", t->parms.name);
+                net_warn_ratelimited("%s: Path to destination invalid or inactive!\n",
+                                     t->parms.name);
                 rel_msg = 1;
                 break;
         case ICMPV6_TIME_EXCEED:
                 if ((*code) == ICMPV6_EXC_HOPLIMIT) {
-                        if (net_ratelimit())
-                                printk(KERN_WARNING
-                                       "%s: Too small hop limit or "
-                                       "routing loop in tunnel!\n",
-                                       t->parms.name);
+                        net_warn_ratelimited("%s: Too small hop limit or routing loop in tunnel!\n",
+                                             t->parms.name);
                         rel_msg = 1;
                 }
                 break;
@@ -484,17 +479,13 @@ ip6_tnl_err(struct sk_buff *skb, __u8 ipproto, struct inet6_skb_parm *opt,
                 if (teli && teli == *info - 2) {
                         tel = (struct ipv6_tlv_tnl_enc_lim *) &skb->data[teli];
                         if (tel->encap_limit == 0) {
-                                if (net_ratelimit())
-                                        printk(KERN_WARNING
-                                               "%s: Too small encapsulation "
-                                               "limit or routing loop in "
-                                               "tunnel!\n", t->parms.name);
+                                net_warn_ratelimited("%s: Too small encapsulation limit or routing loop in tunnel!\n",
+                                                     t->parms.name);
                                 rel_msg = 1;
                         }
-                } else if (net_ratelimit()) {
-                        printk(KERN_WARNING
-                               "%s: Recipient unable to parse tunneled "
-                               "packet!\n ", t->parms.name);
+                } else {
+                        net_warn_ratelimited("%s: Recipient unable to parse tunneled packet!\n",
+                                             t->parms.name);
                 }
                 break;
         case ICMPV6_PKT_TOOBIG:
@@ -919,10 +910,8 @@ static int ip6_tnl_xmit2(struct sk_buff *skb,
 
         if (tdev == dev) {
                 stats->collisions++;
-                if (net_ratelimit())
-                        printk(KERN_WARNING
-                               "%s: Local routing loop detected!\n",
-                               t->parms.name);
+                net_warn_ratelimited("%s: Local routing loop detected!\n",
+                                     t->parms.name);
                 goto tx_err_dst_release;
         }
         mtu = dst_mtu(dst) - sizeof (*ipv6h);
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index efc0098b59d..ba936e18b61 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -1147,8 +1147,7 @@ static int ip6mr_cache_report(struct mr6_table *mrt, struct sk_buff *pkt,
          */
         ret = sock_queue_rcv_skb(mrt->mroute6_sk, skb);
         if (ret < 0) {
-                if (net_ratelimit())
-                        printk(KERN_WARNING "mroute6: pending queue full, dropping entries.\n");
+                net_warn_ratelimited("mroute6: pending queue full, dropping entries\n");
                 kfree_skb(skb);
         }
 
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index 308bdd65123..d7cb04506c3 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -181,8 +181,7 @@ ip6_checkentry(const struct ip6t_ip6 *ipv6)
 static unsigned int
 ip6t_error(struct sk_buff *skb, const struct xt_action_param *par)
 {
-        if (net_ratelimit())
-                pr_info("error: `%s'\n", (const char *)par->targinfo);
+        net_info_ratelimited("error: `%s'\n", (const char *)par->targinfo);
 
         return NF_DROP;
 }
diff --git a/net/ipv6/netfilter/ip6t_REJECT.c b/net/ipv6/netfilter/ip6t_REJECT.c
index aad2fa41cf4..fd4fb34c51c 100644
--- a/net/ipv6/netfilter/ip6t_REJECT.c
+++ b/net/ipv6/netfilter/ip6t_REJECT.c
@@ -114,8 +114,7 @@ static void send_reset(struct net *net, struct sk_buff *oldskb)
                          GFP_ATOMIC);
 
         if (!nskb) {
-                if (net_ratelimit())
-                        pr_debug("cannot alloc skb\n");
+                net_dbg_ratelimited("cannot alloc skb\n");
                 dst_release(dst);
                 return;
         }
@@ -210,8 +209,7 @@ reject_tg6(struct sk_buff *skb, const struct xt_action_param *par)
                 send_reset(net, skb);
                 break;
         default:
-                if (net_ratelimit())
-                        pr_info("case %u not handled yet\n", reject->with);
+                net_info_ratelimited("case %u not handled yet\n", reject->with);
                 break;
         }
 
diff --git a/net/ipv6/netfilter/ip6table_mangle.c b/net/ipv6/netfilter/ip6table_mangle.c
index 00d19173db7..4d782405f12 100644
--- a/net/ipv6/netfilter/ip6table_mangle.c
+++ b/net/ipv6/netfilter/ip6table_mangle.c
@@ -42,8 +42,7 @@ ip6t_mangle_out(struct sk_buff *skb, const struct net_device *out)
         /* root is playing with raw sockets. */
         if (skb->len < sizeof(struct iphdr) ||
             ip_hdrlen(skb) < sizeof(struct iphdr)) {
-                if (net_ratelimit())
-                        pr_warning("ip6t_hook: happy cracking.\n");
+                net_warn_ratelimited("ip6t_hook: happy cracking\n");
                 return NF_ACCEPT;
         }
 #endif
diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
index fe925e49252..3224ef90a21 100644
--- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
@@ -232,8 +232,7 @@ static unsigned int ipv6_conntrack_local(unsigned int hooknum,
 {
         /* root is playing with raw sockets. */
         if (skb->len < sizeof(struct ipv6hdr)) {
-                if (net_ratelimit())
-                        pr_notice("ipv6_conntrack_local: packet too short\n");
+                net_notice_ratelimited("ipv6_conntrack_local: packet too short\n");
                 return NF_ACCEPT;
         }
         return __ipv6_conntrack_in(dev_net(out), hooknum, skb, okfn);
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index 48a2be1b7c7..c9c78c2e666 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -444,12 +444,11 @@ nf_ct_frag6_reasm(struct nf_ct_frag6_queue *fq, struct net_device *dev)
         return head;
 
 out_oversize:
-        if (net_ratelimit())
-                printk(KERN_DEBUG "nf_ct_frag6_reasm: payload len = %d\n", payload_len);
+        net_dbg_ratelimited("nf_ct_frag6_reasm: payload len = %d\n",
+                            payload_len);
         goto out_fail;
 out_oom:
-        if (net_ratelimit())
-                printk(KERN_DEBUG "nf_ct_frag6_reasm: no memory for reassembly\n");
+        net_dbg_ratelimited("nf_ct_frag6_reasm: no memory for reassembly\n");
 out_fail:
         return NULL;
 }
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index 54c5d2b704d..f1b86fdc06a 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -518,12 +518,10 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,
         return 1;
 
 out_oversize:
-        if (net_ratelimit())
-                printk(KERN_DEBUG "ip6_frag_reasm: payload len = %d\n", payload_len);
+        net_dbg_ratelimited("ip6_frag_reasm: payload len = %d\n", payload_len);
         goto out_fail;
 out_oom:
-        if (net_ratelimit())
-                printk(KERN_DEBUG "ip6_frag_reasm: no memory for reassembly\n");
+        net_dbg_ratelimited("ip6_frag_reasm: no memory for reassembly\n");
 out_fail:
         rcu_read_lock();
         IP6_INC_STATS_BH(net, __in6_dev_get(dev), IPSTATS_MIB_REASMFAILS);
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 0aefc36f74c..e20e3206902 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -794,9 +794,7 @@ static struct rt6_info *rt6_alloc_cow(struct rt6_info *ort,
                                 goto retry;
                         }
 
-                        if (net_ratelimit())
-                                printk(KERN_WARNING
-                                       "ipv6: Neighbour table overflow.\n");
+                        net_warn_ratelimited("ipv6: Neighbour table overflow\n");
                         dst_free(&rt->dst);
                         return NULL;
                 }
@@ -1643,9 +1641,7 @@ void rt6_redirect(const struct in6_addr *dest, const struct in6_addr *src,
         rt = ip6_route_redirect(dest, src, saddr, neigh->dev);
 
         if (rt == net->ipv6.ip6_null_entry) {
-                if (net_ratelimit())
-                        printk(KERN_DEBUG "rt6_redirect: source isn't a valid nexthop "
-                               "for redirect target\n");
+                net_dbg_ratelimited("rt6_redirect: source isn't a valid nexthop for redirect target\n");
                 goto out;
         }
 
@@ -2106,9 +2102,7 @@ struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
         int err;
 
         if (!rt) {
-                if (net_ratelimit())
-                        pr_warning("IPv6:  Maximum number of routes reached,"
-                                   " consider increasing route/max_size.\n");
+                net_warn_ratelimited("IPv6:  Maximum number of routes reached, consider increasing route/max_size\n");
                 return ERR_PTR(-ENOMEM);
         }
 
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index e5fef943e30..a36a09701bf 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -702,8 +702,7 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,
                         neigh = dst_neigh_lookup(skb_dst(skb), &iph6->daddr);
 
                 if (neigh == NULL) {
-                        if (net_ratelimit())
-                                printk(KERN_DEBUG "sit: nexthop == NULL\n");
+                        net_dbg_ratelimited("sit: nexthop == NULL\n");
                         goto tx_error;
                 }
 
@@ -732,8 +731,7 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,
                         neigh = dst_neigh_lookup(skb_dst(skb), &iph6->daddr);
 
                 if (neigh == NULL) {
-                        if (net_ratelimit())
-                                printk(KERN_DEBUG "sit: nexthop == NULL\n");
+                        net_dbg_ratelimited("sit: nexthop == NULL\n");
                         goto tx_error;
                 }
 
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 078d039e8fd..4cf55ae7bf8 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -723,12 +723,10 @@ static int tcp_v6_inbound_md5_hash(struct sock *sk, const struct sk_buff *skb)
                                       NULL, NULL, skb);
 
         if (genhash || memcmp(hash_location, newhash, 16) != 0) {
-                if (net_ratelimit()) {
-                        printk(KERN_INFO "MD5 Hash %s for [%pI6c]:%u->[%pI6c]:%u\n",
-                               genhash ? "failed" : "mismatch",
-                               &ip6h->saddr, ntohs(th->source),
-                               &ip6h->daddr, ntohs(th->dest));
-                }
+                net_info_ratelimited("MD5 Hash %s for [%pI6c]:%u->[%pI6c]:%u\n",
+                                     genhash ? "failed" : "mismatch",
+                                     &ip6h->saddr, ntohs(th->source),
+                                     &ip6h->daddr, ntohs(th->dest));
                 return 1;
         }
         return 0;