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>

7 files changed, 20 insertions, 32 deletions

diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c
index 0beba0e5312e..60e281ad0f07 100644
--- a/net/sched/act_ipt.c
+++ b/net/sched/act_ipt.c
@@ -1,5 +1,5 @@
 /*
- * net/sched/ipt.c      iptables target interface
+ * net/sched/ipt.c     iptables target interface
  *
  *TODO: Add other tables. For now we only support the ipv4 table targets
  *
@@ -235,9 +235,8 @@ static int tcf_ipt(struct sk_buff *skb, const struct tc_action *a,
                 result = TC_ACT_PIPE;
                 break;
         default:
-                if (net_ratelimit())
-                        pr_notice("tc filter: Bogus netfilter code"
-                                  " %d assume ACCEPT\n", ret);
+                net_notice_ratelimited("tc filter: Bogus netfilter code %d assume ACCEPT\n",
+                                       ret);
                 result = TC_POLICE_OK;
                 break;
         }
diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index d583aea3b3df..fe81cc18e9e0 100644
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -174,9 +174,8 @@ static int tcf_mirred(struct sk_buff *skb, const struct tc_action *a,
         }
 
         if (!(dev->flags & IFF_UP)) {
-                if (net_ratelimit())
-                        pr_notice("tc mirred to Houston: device %s is down\n",
-                                  dev->name);
+                net_notice_ratelimited("tc mirred to Houston: device %s is down\n",
+                                       dev->name);
                 goto out;
         }
 
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index 591b006a8c5a..d45373fb00b9 100644
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -234,8 +234,7 @@ out:
         return -1;
 
 deadloop:
-        if (net_ratelimit())
-                pr_warning("cls_u32: dead loop\n");
+        net_warn_ratelimited("cls_u32: dead loop\n");
         return -1;
 }
 
diff --git a/net/sched/ematch.c b/net/sched/ematch.c
index aca233c2b848..3a633debb6df 100644
--- a/net/sched/ematch.c
+++ b/net/sched/ematch.c
@@ -537,9 +537,7 @@ pop_stack:
         return res;
 
 stack_overflow:
-        if (net_ratelimit())
-                pr_warning("tc ematch: local stack overflow,"
-                           " increase NET_EMATCH_STACK\n");
+        net_warn_ratelimited("tc ematch: local stack overflow, increase NET_EMATCH_STACK\n");
         return -1;
 }
 EXPORT_SYMBOL(__tcf_em_tree_match);
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index d2daefcc205f..085ce53d570a 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -1691,12 +1691,10 @@ reclassify:
                 tp = otp;
 
                 if (verd++ >= MAX_REC_LOOP) {
-                        if (net_ratelimit())
-                                pr_notice("%s: packet reclassify loop"
-                                          " rule prio %u protocol %02x\n",
-                                          tp->q->ops->id,
-                                          tp->prio & 0xffff,
-                                          ntohs(tp->protocol));
+                        net_notice_ratelimited("%s: packet reclassify loop rule prio %u protocol %02x\n",
+                                               tp->q->ops->id,
+                                               tp->prio & 0xffff,
+                                               ntohs(tp->protocol));
                         return TC_ACT_SHOT;
                 }
                 skb->tc_verd = SET_TC_VERD(skb->tc_verd, verd);
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 0eb1202c22a6..511323e89cec 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -86,9 +86,8 @@ static inline int handle_dev_cpu_collision(struct sk_buff *skb,
                  * deadloop is detected. Return OK to try the next skb.
                  */
                 kfree_skb(skb);
-                if (net_ratelimit())
-                        pr_warning("Dead loop on netdevice %s, fix it urgently!\n",
-                                   dev_queue->dev->name);
+                net_warn_ratelimited("Dead loop on netdevice %s, fix it urgently!\n",
+                                     dev_queue->dev->name);
                 ret = qdisc_qlen(q);
         } else {
                 /*
@@ -136,9 +135,9 @@ int sch_direct_xmit(struct sk_buff *skb, struct Qdisc *q,
                 ret = handle_dev_cpu_collision(skb, txq, q);
         } else {
                 /* Driver returned NETDEV_TX_BUSY - requeue skb */
-                if (unlikely (ret != NETDEV_TX_BUSY && net_ratelimit()))
-                        pr_warning("BUG %s code %d qlen %d\n",
-                                   dev->name, ret, q->q.qlen);
+                if (unlikely(ret != NETDEV_TX_BUSY))
+                        net_warn_ratelimited("BUG %s code %d qlen %d\n",
+                                             dev->name, ret, q->q.qlen);
 
                 ret = dev_requeue_skb(skb, q);
         }
diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c
index ab620bf90785..e901583e4ea5 100644
--- a/net/sched/sch_gred.c
+++ b/net/sched/sch_gred.c
@@ -255,10 +255,8 @@ static struct sk_buff *gred_dequeue(struct Qdisc *sch)
                 u16 dp = tc_index_to_dp(skb);
 
                 if (dp >= t->DPs || (q = t->tab[dp]) == NULL) {
-                        if (net_ratelimit())
-                                pr_warning("GRED: Unable to relocate VQ 0x%x "
-                                           "after dequeue, screwing up "
-                                           "backlog.\n", tc_index_to_dp(skb));
+                        net_warn_ratelimited("GRED: Unable to relocate VQ 0x%x after dequeue, screwing up backlog\n",
+                                             tc_index_to_dp(skb));
                 } else {
                         q->backlog -= qdisc_pkt_len(skb);
 
@@ -287,10 +285,8 @@ static unsigned int gred_drop(struct Qdisc *sch)
                 u16 dp = tc_index_to_dp(skb);
 
                 if (dp >= t->DPs || (q = t->tab[dp]) == NULL) {
-                        if (net_ratelimit())
-                                pr_warning("GRED: Unable to relocate VQ 0x%x "
-                                           "while dropping, screwing up "
-                                           "backlog.\n", tc_index_to_dp(skb));
+                        net_warn_ratelimited("GRED: Unable to relocate VQ 0x%x while dropping, screwing up backlog\n",
+                                             tc_index_to_dp(skb));
                 } else {
                         q->backlog -= len;
                         q->stats.other++;