net sched: printk message severity

The previous patch encourage me to go look at all the messages in
the network scheduler and fix them. Many messages were missing
any severity level. Some serious ones that should never happen
were turned into WARN(), and the random noise messages that were
handled changed to pr_debug().

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 019045174fc35f0812565c143793ca3fa382a8c7..972378f47f3cfd2ef03b33ac3a3a5ea7801e7afe 100644 (file)
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -153,7 +153,7 @@ int tcf_generic_walker(struct sk_buff *skb, struct netlink_callback *cb,
        } else if (type == RTM_GETACTION) {
                return tcf_dump_walker(skb, cb, a, hinfo);
        } else {
-               printk("tcf_generic_walker: unknown action %d\n", type);
+               WARN(1, "tcf_generic_walker: unknown action %d\n", type);
                return -EINVAL;
        }
 }
@@ -403,8 +403,9 @@ void tcf_action_destroy(struct tc_action *act, int bind)
                                module_put(a->ops->owner);
                        act = act->next;
                        kfree(a);
-               } else { /*FIXME: Remove later - catch insertion bugs*/
-                       printk("tcf_action_destroy: BUG? destroying NULL ops\n");
+               } else {
+                       /*FIXME: Remove later - catch insertion bugs*/
+                       WARN(1, "tcf_action_destroy: BUG? destroying NULL ops\n");
                        act = act->next;
                        kfree(a);
                }
@@ -744,7 +745,7 @@ static struct tc_action *create_a(int i)
 
        act = kzalloc(sizeof(*act), GFP_KERNEL);
        if (act == NULL) {
-               printk("create_a: failed to alloc!\n");
+               pr_debug("create_a: failed to alloc!\n");
                return NULL;
        }
        act->order = i;
@@ -766,13 +767,13 @@ static int tca_action_flush(struct net *net, struct nlattr *nla,
        int err = -ENOMEM;
 
        if (a == NULL) {
-               printk("tca_action_flush: couldnt create tc_action\n");
+               pr_debug("tca_action_flush: couldnt create tc_action\n");
                return err;
        }
 
        skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
        if (!skb) {
-               printk("tca_action_flush: failed skb alloc\n");
+               pr_debug("tca_action_flush: failed skb alloc\n");
                kfree(a);
                return err;
        }
@@ -979,7 +980,7 @@ static int tc_ctl_action(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
                return ret;
 
        if (tca[TCA_ACT_TAB] == NULL) {
-               printk("tc_ctl_action: received NO action attribs\n");
+               pr_notice("tc_ctl_action: received NO action attribs\n");
                return -EINVAL;
        }
 
@@ -1056,7 +1057,7 @@ tc_dump_action(struct sk_buff *skb, struct netlink_callback *cb)
        struct nlattr *kind = find_dump_kind(cb->nlh);
 
        if (kind == NULL) {
-               printk("tc_dump_action: action bad kind\n");
+               pr_info("tc_dump_action: action bad kind\n");
                return 0;
        }
 
@@ -1069,7 +1070,8 @@ tc_dump_action(struct sk_buff *skb, struct netlink_callback *cb)
        a.ops = a_o;
 
        if (a_o->walk == NULL) {
-               printk("tc_dump_action: %s !capable of dumping table\n", a_o->kind);
+               WARN(1, "tc_dump_action: %s !capable of dumping table\n",
+                    a_o->kind);
                goto nla_put_failure;
        }
 

diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c
index e7f796aec657f90089a4872ab79c831b62bde467..8406c66549909c763a6b2ae3d7594ea5aeceb361 100644 (file)
--- a/net/sched/act_gact.c
+++ b/net/sched/act_gact.c
@@ -202,9 +202,9 @@ MODULE_LICENSE("GPL");
 static int __init gact_init_module(void)
 {
 #ifdef CONFIG_GACT_PROB
-       printk("GACT probability on\n");
+       printk(KERN_INFO "GACT probability on\n");
 #else
-       printk("GACT probability NOT on\n");
+       printk(KERN_INFO "GACT probability NOT on\n");
 #endif
        return tcf_register_action(&act_gact_ops);
 }

diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c
index 1f9595467c17ed02f26981c390aa59400428efdd..c7e59e6ec34938a3762fead555fc6748ab5d0e09 100644 (file)
--- a/net/sched/act_ipt.c
+++ b/net/sched/act_ipt.c
@@ -235,7 +235,8 @@ static int tcf_ipt(struct sk_buff *skb, struct tc_action *a,
                break;
        default:
                if (net_ratelimit())
-                       printk("Bogus netfilter code %d assume ACCEPT\n", ret);
+                       pr_notice("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 c046682054ebdffbba3f71e439d140ac5c3155c1..c0b6863e3b87dbe91679638b83a169f099ab887f 100644 (file)
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -164,8 +164,8 @@ static int tcf_mirred(struct sk_buff *skb, struct tc_action *a,
        dev = m->tcfm_dev;
        if (!(dev->flags & IFF_UP)) {
                if (net_ratelimit())
-                       printk("mirred to Houston: device %s is gone!\n",
-                              dev->name);
+                       pr_notice("tc mirred to Houston: device %s is gone!\n",
+                                 dev->name);
                goto out;
        }
 
@@ -252,7 +252,7 @@ MODULE_LICENSE("GPL");
 
 static int __init mirred_init_module(void)
 {
-       printk("Mirror/redirect action on\n");
+       pr_info("Mirror/redirect action on\n");
        return tcf_register_action(&act_mirred_ops);
 }
 

diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index b7dcfedc802ea5c54a096efe3921f1fe4dd30aa5..fdbd0b7bd840715c41626abfa74831ddcd9ef2fb 100644 (file)
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -158,11 +158,13 @@ static int tcf_pedit(struct sk_buff *skb, struct tc_action *a,
                        }
 
                        if (offset % 4) {
-                               printk("offset must be on 32 bit boundaries\n");
+                               pr_info("tc filter pedit"
+                                       " offset must be on 32 bit boundaries\n");
                                goto bad;
                        }
                        if (offset > 0 && offset > skb->len) {
-                               printk("offset %d cant exceed pkt length %d\n",
+                               pr_info("tc filter pedit"
+                                       " offset %d cant exceed pkt length %d\n",
                                       offset, skb->len);
                                goto bad;
                        }
@@ -176,9 +178,8 @@ static int tcf_pedit(struct sk_buff *skb, struct tc_action *a,
                if (munged)
                        skb->tc_verd = SET_TC_MUNGED(skb->tc_verd);
                goto done;
-       } else {
-               printk("pedit BUG: index %d\n", p->tcf_index);
-       }
+       } else
+               WARN(1, "pedit BUG: index %d\n", p->tcf_index);
 
 bad:
        p->tcf_qstats.overlimits++;

diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c
index 622ca809c15ca3cf595e0d721e1d70171c3c2fbe..1b4bc691d7d1d0b5d716ddc681f319e23c19c98c 100644 (file)
--- a/net/sched/act_simple.c
+++ b/net/sched/act_simple.c
@@ -49,7 +49,7 @@ static int tcf_simp(struct sk_buff *skb, struct tc_action *a, struct tcf_result
         * Example if this was the 3rd packet and the string was "hello"
         * then it would look like "hello_3" (without quotes)
         **/
-       printk("simple: %s_%d\n",
+       pr_info("simple: %s_%d\n",
               (char *)d->tcfd_defdata, d->tcf_bstats.packets);
        spin_unlock(&d->tcf_lock);
        return d->tcf_action;
@@ -205,7 +205,7 @@ static int __init simp_init_module(void)
 {
        int ret = tcf_register_action(&act_simp_ops);
        if (!ret)
-               printk("Simple TC action Loaded\n");
+               pr_info("Simple TC action Loaded\n");
        return ret;
 }
 

diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index 593eac056e8d7ce7e1e648b1a1140f754c6d50ac..96275422c619e9d2a4e5eecd4fa8b433a526c8ab 100644 (file)
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -211,7 +211,7 @@ check_terminal:
 
 deadloop:
        if (net_ratelimit())
-               printk("cls_u32: dead loop\n");
+               printk(KERN_WARNING "cls_u32: dead loop\n");
        return -1;
 }
 
@@ -768,15 +768,15 @@ static struct tcf_proto_ops cls_u32_ops __read_mostly = {
 
 static int __init init_u32(void)
 {
-       printk("u32 classifier\n");
+       pr_info("u32 classifier\n");
 #ifdef CONFIG_CLS_U32_PERF
-       printk("    Performance counters on\n");
+       pr_info("    Performance counters on\n");
 #endif
 #ifdef CONFIG_NET_CLS_IND
-       printk("    input device check on\n");
+       pr_info("    input device check on\n");
 #endif
 #ifdef CONFIG_NET_CLS_ACT
-       printk("    Actions configured\n");
+       pr_info("    Actions configured\n");
 #endif
        return register_tcf_proto_ops(&cls_u32_ops);
 }

diff --git a/net/sched/ematch.c b/net/sched/ematch.c
index e782bdeedc584254ecf8b544d85a449039016a92..5e37da961f804cfdf17fa30d6434332e32dc1332 100644 (file)
--- a/net/sched/ematch.c
+++ b/net/sched/ematch.c
@@ -527,7 +527,8 @@ pop_stack:
 
 stack_overflow:
        if (net_ratelimit())
-               printk("Local stack overflow, increase NET_EMATCH_STACK\n");
+               printk(KERN_WARNING "tc ematch: local stack overflow,"
+                       " increase NET_EMATCH_STACK\n");
        return -1;
 }
 EXPORT_SYMBOL(__tcf_em_tree_match);