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>

4 files changed, 22 insertions, 34 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index a2be59fe6ab8..3dd853998d38 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1673,10 +1673,9 @@ static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)
 
                         if (skb_network_header(skb2) < skb2->data ||
                             skb2->network_header > skb2->tail) {
-                                if (net_ratelimit())
-                                        pr_crit("protocol %04x is buggy, dev %s\n",
-                                                ntohs(skb2->protocol),
-                                                dev->name);
+                                net_crit_ratelimited("protocol %04x is buggy, dev %s\n",
+                                                     ntohs(skb2->protocol),
+                                                     dev->name);
                                 skb_reset_network_header(skb2);
                         }
 
@@ -2343,11 +2342,9 @@ EXPORT_SYMBOL(__skb_tx_hash);
 static inline u16 dev_cap_txqueue(struct net_device *dev, u16 queue_index)
 {
         if (unlikely(queue_index >= dev->real_num_tx_queues)) {
-                if (net_ratelimit()) {
-                        pr_warn("%s selects TX queue %d, but real number of TX queues is %d\n",
-                                dev->name, queue_index,
-                                dev->real_num_tx_queues);
-                }
+                net_warn_ratelimited("%s selects TX queue %d, but real number of TX queues is %d\n",
+                                     dev->name, queue_index,
+                                     dev->real_num_tx_queues);
                 return 0;
         }
         return queue_index;
@@ -2589,17 +2586,15 @@ int dev_queue_xmit(struct sk_buff *skb)
                                 }
                         }
                         HARD_TX_UNLOCK(dev, txq);
-                        if (net_ratelimit())
-                                pr_crit("Virtual device %s asks to queue packet!\n",
-                                        dev->name);
+                        net_crit_ratelimited("Virtual device %s asks to queue packet!\n",
+                                             dev->name);
                 } else {
                         /* Recursion is detected! It is possible,
                          * unfortunately
                          */
 recursion_alert:
-                        if (net_ratelimit())
-                                pr_crit("Dead loop on virtual device %s, fix it urgently!\n",
-                                        dev->name);
+                        net_crit_ratelimited("Dead loop on virtual device %s, fix it urgently!\n",
+                                             dev->name);
                 }
         }
 
@@ -3080,9 +3075,8 @@ static int ing_filter(struct sk_buff *skb, struct netdev_queue *rxq)
         struct Qdisc *q;
 
         if (unlikely(MAX_RED_LOOP < ttl++)) {
-                if (net_ratelimit())
-                        pr_warn("Redir loop detected Dropping packet (%d->%d)\n",
-                                skb->skb_iif, dev->ifindex);
+                net_warn_ratelimited("Redir loop detected Dropping packet (%d->%d)\n",
+                                     skb->skb_iif, dev->ifindex);
                 return TC_ACT_SHOT;
         }
 
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index ffb5d382f241..33912573959d 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -2934,8 +2934,7 @@ static struct sk_buff *fill_packet_ipv6(struct net_device *odev,
 
         if (datalen < sizeof(struct pktgen_hdr)) {
                 datalen = sizeof(struct pktgen_hdr);
-                if (net_ratelimit())
-                        pr_info("increased datalen to %d\n", datalen);
+                net_info_ratelimited("increased datalen to %d\n", datalen);
         }
 
         udph->source = htons(pkt_dev->cur_udp_src);
@@ -3365,8 +3364,8 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev)
                 pkt_dev->errors++;
                 break;
         default: /* Drivers are not supposed to return other values! */
-                if (net_ratelimit())
-                        pr_info("%s xmit error: %d\n", pkt_dev->odevname, ret);
+                net_info_ratelimited("%s xmit error: %d\n",
+                                     pkt_dev->odevname, ret);
                 pkt_dev->errors++;
                 /* fallthru */
         case NETDEV_TX_LOCKED:
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index b442d35bbc8b..21318d15bbc3 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1524,11 +1524,9 @@ static int do_setlink(struct net_device *dev, struct ifinfomsg *ifm,
         err = 0;
 
 errout:
-        if (err < 0 && modified && net_ratelimit())
-                printk(KERN_WARNING "A link change request failed with "
-                       "some changes committed already. Interface %s may "
-                       "have been left with an inconsistent configuration, "
-                       "please check.\n", dev->name);
+        if (err < 0 && modified)
+                net_warn_ratelimited("A link change request failed with some changes committed already. Interface %s may have been left with an inconsistent configuration, please check.\n",
+                                     dev->name);
 
         if (send_addr_notify)
                 call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 2c35da818ef9..2a1871942317 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -3299,10 +3299,8 @@ bool skb_partial_csum_set(struct sk_buff *skb, u16 start, u16 off)
 {
         if (unlikely(start > skb_headlen(skb)) ||
             unlikely((int)start + off > skb_headlen(skb) - 2)) {
-                if (net_ratelimit())
-                        printk(KERN_WARNING
-                               "bad partial csum: csum=%u/%u len=%u\n",
-                               start, off, skb_headlen(skb));
+                net_warn_ratelimited("bad partial csum: csum=%u/%u len=%u\n",
+                                     start, off, skb_headlen(skb));
                 return false;
         }
         skb->ip_summed = CHECKSUM_PARTIAL;
@@ -3314,8 +3312,7 @@ EXPORT_SYMBOL_GPL(skb_partial_csum_set);
 
 void __skb_warn_lro_forwarding(const struct sk_buff *skb)
 {
-        if (net_ratelimit())
-                pr_warning("%s: received packets cannot be forwarded"
-                           " while LRO is enabled\n", skb->dev->name);
+        net_warn_ratelimited("%s: received packets cannot be forwarded while LRO is enabled\n",
+                             skb->dev->name);
 }
 EXPORT_SYMBOL(__skb_warn_lro_forwarding);