[PATCH net-next 0/5] printk message cleanup's

[PATCH net-next 0/5] printk message cleanup's

[Stephen Hemminger]

To support space and clutter reduction get rid of some useless
messages on boot, and be more precise about message level,
and don't use bare printk in network code.

[PATCH net-next 1/5] net: fix message priorities

[Stephen Hemminger]

[-- Attachment #1: net-dbg-msg.patch --]
[-- Type: text/plain, Size: 1117 bytes --]

Using obsolete socket type should be notice not info level.
Registering is normal and should only be debug level.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

--- a/net/socket.c	2014-08-12 13:07:42.000000000 -0700
+++ b/net/socket.c	2014-08-23 10:44:47.118408989 -0700
@@ -1276,8 +1276,8 @@ int __sock_create(struct net *net, int f
 		static int warned;
 		if (!warned) {
 			warned = 1;
-			pr_info("%s uses obsolete (PF_INET,SOCK_PACKET)\n",
-				current->comm);
+			pr_notice("%s uses obsolete (PF_INET,SOCK_PACKET)\n",
+				  current->comm);
 		}
 		family = PF_PACKET;
 	}
@@ -2624,7 +2624,7 @@ int sock_register(const struct net_proto
 	}
 	spin_unlock(&net_family_lock);
 
-	pr_info("NET: Registered protocol family %d\n", ops->family);
+	pr_debug("NET: Registered protocol family %d\n", ops->family);
 	return err;
 }
 EXPORT_SYMBOL(sock_register);
@@ -2652,7 +2652,7 @@ void sock_unregister(int family)
 
 	synchronize_rcu();
 
-	pr_info("NET: Unregistered protocol family %d\n", family);
+	pr_debug("NET: Unregistered protocol family %d\n", family);
 }
 EXPORT_SYMBOL(sock_unregister);
 

[PATCH net-next 2/5] tcp: silence useless debug message

[Stephen Hemminger]

[-- Attachment #1: tcp-nomsg.patch --]
[-- Type: text/plain, Size: 485 bytes --]

This message isn't really needed.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>


--- a/net/ipv4/tcp_cong.c	2014-05-05 23:44:19.000000000 -0700
+++ b/net/ipv4/tcp_cong.c	2014-08-22 06:33:06.067542809 -0700
@@ -51,7 +51,7 @@ int tcp_register_congestion_control(stru
 		ret = -EEXIST;
 	} else {
 		list_add_tail_rcu(&ca->list, &tcp_cong_list);
-		pr_info("%s registered\n", ca->name);
+		pr_debug("%s registered\n", ca->name);
 	}
 	spin_unlock(&tcp_cong_list_lock);
 

[PATCH net-next 3/5] ipv6: silence tunnel loading messages

[Stephen Hemminger]

[-- Attachment #1: ipv6-dbg-msg.patch --]
[-- Type: text/plain, Size: 1219 bytes --]

Chatter on boot is not necessary, change it to debug.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>


--- a/net/ipv6/ip6_gre.c	2014-08-25 15:06:29.711056058 -0700
+++ b/net/ipv6/ip6_gre.c	2014-08-25 15:06:29.707056037 -0700
@@ -1678,7 +1678,7 @@ static int __init ip6gre_init(void)
 {
 	int err;
 
-	pr_info("GRE over IPv6 tunneling driver\n");
+	pr_debug("GRE over IPv6 tunneling driver\n");
 
 	err = register_pernet_device(&ip6gre_net_ops);
 	if (err < 0)
--- a/net/ipv6/mip6.c	2014-08-25 15:06:29.711056058 -0700
+++ b/net/ipv6/mip6.c	2014-08-25 15:06:29.707056037 -0700
@@ -482,7 +482,7 @@ static const struct xfrm_type mip6_rthdr
 
 static int __init mip6_init(void)
 {
-	pr_info("Mobile IPv6\n");
+	pr_debug("Mobile IPv6\n");
 
 	if (xfrm_register_type(&mip6_destopt_type, AF_INET6) < 0) {
 		pr_info("%s: can't add xfrm type(destopt)\n", __func__);
--- a/net/ipv6/sit.c	2014-08-25 15:06:29.711056058 -0700
+++ b/net/ipv6/sit.c	2014-08-25 15:06:29.707056037 -0700
@@ -1796,7 +1796,7 @@ static int __init sit_init(void)
 {
 	int err;
 
-	pr_info("IPv6 over IPv4 tunneling driver\n");
+	pr_debug("IPv6 over IPv4 tunneling driver\n");
 
 	err = register_pernet_device(&sit_net_ops);
 	if (err < 0)

[PATCH net-next 4/5] xfrm: replace printk with pr_ macro

[Stephen Hemminger]

[-- Attachment #1: xfrm-msg.patch --]
[-- Type: text/plain, Size: 1123 bytes --]

Use standard macro's for notices.
Silence useless debug message on module load.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>


--- a/net/xfrm/xfrm_user.c	2014-08-12 13:07:42.000000000 -0700
+++ b/net/xfrm/xfrm_user.c	2014-08-22 16:51:45.060027772 -0700
@@ -2582,8 +2582,7 @@ static int xfrm_send_state_notify(struct
 	case XFRM_MSG_FLUSHSA:
 		return xfrm_notify_sa_flush(c);
 	default:
-		printk(KERN_NOTICE "xfrm_user: Unknown SA event %d\n",
-		       c->event);
+		pr_notice("xfrm_user: Unknown SA event %d\n", c->event);
 		break;
 	}
 
@@ -2875,8 +2874,7 @@ static int xfrm_send_policy_notify(struc
 	case XFRM_MSG_POLEXPIRE:
 		return xfrm_exp_policy_notify(xp, dir, c);
 	default:
-		printk(KERN_NOTICE "xfrm_user: Unknown Policy event %d\n",
-		       c->event);
+		pr_notice("xfrm_user: Unknown Policy event %d\n", c->event);
 	}
 
 	return 0;
@@ -3031,7 +3029,7 @@ static int __init xfrm_user_init(void)
 {
 	int rv;
 
-	printk(KERN_INFO "Initializing XFRM netlink socket\n");
+	pr_debug("Initializing XFRM netlink socket\n");
 
 	rv = register_pernet_subsys(&xfrm_user_net_ops);
 	if (rv < 0)

[PATCH net-next 5/5] sched: replace bare printks

[Stephen Hemminger]

[-- Attachment #1: act-msg.patch --]
[-- Type: text/plain, Size: 1636 bytes --]

Don't use bare printk for error messages.
Make GRED error an info level message rather than debug which
is likely to be suppressed.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>


--- a/net/sched/act_ipt.c	2014-03-28 11:40:43.000000000 -0700
+++ b/net/sched/act_ipt.c	2014-08-22 16:53:33.676030680 -0700
@@ -290,10 +290,10 @@ static int __init ipt_init_module(void)
 
 	ret1 = tcf_register_action(&act_xt_ops, IPT_TAB_MASK);
 	if (ret1 < 0)
-		printk("Failed to load xt action\n");
+		pr_err("Failed to load xt action\n");
 	ret2 = tcf_register_action(&act_ipt_ops, IPT_TAB_MASK);
 	if (ret2 < 0)
-		printk("Failed to load ipt action\n");
+		pr_err("Failed to load ipt action\n");
 
 	if (ret1 < 0 && ret2 < 0) {
 		return ret1;
--- a/net/sched/act_mirred.c	2014-08-12 13:07:42.000000000 -0700
+++ b/net/sched/act_mirred.c	2014-08-22 16:54:07.244031579 -0700
@@ -140,7 +140,7 @@ static int tcf_mirred(struct sk_buff *sk
 
 	dev = m->tcfm_dev;
 	if (!dev) {
-		printk_once(KERN_NOTICE "tc mirred: target device is gone\n");
+		netdev_notice(dev, "tc mirred: target device is gone\n");
 		goto out;
 	}
 
--- a/net/sched/sch_gred.c	2014-03-28 11:40:43.000000000 -0700
+++ b/net/sched/sch_gred.c	2014-08-22 16:54:47.720032663 -0700
@@ -456,8 +456,8 @@ static int gred_change(struct Qdisc *sch
 			if (table->tab[table->def])
 				def_prio = table->tab[table->def]->prio;
 
-			printk(KERN_DEBUG "GRED: DP %u does not have a prio "
-			       "setting default to %d\n", ctl->DP, def_prio);
+			pr_info("GRED: DP %u does not have a prio "
+				"setting default to %d\n", ctl->DP, def_prio);
 
 			prio = def_prio;
 		} else

Re: [PATCH net-next 5/5] sched: replace bare printks

[Michael Heimpold]

Am Freitag, 29. August 2014, 00:09:23 schrieb Stephen Hemminger:
> Don't use bare printk for error messages.
> Make GRED error an info level message rather than debug which
> is likely to be suppressed.
> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> 
> 
> --- a/net/sched/act_ipt.c	2014-03-28 11:40:43.000000000 -0700
> +++ b/net/sched/act_ipt.c	2014-08-22 16:53:33.676030680 -0700
> @@ -290,10 +290,10 @@ static int __init ipt_init_module(void)
>  
>  	ret1 = tcf_register_action(&act_xt_ops, IPT_TAB_MASK);
>  	if (ret1 < 0)
> -		printk("Failed to load xt action\n");
> +		pr_err("Failed to load xt action\n");
>  	ret2 = tcf_register_action(&act_ipt_ops, IPT_TAB_MASK);
>  	if (ret2 < 0)
> -		printk("Failed to load ipt action\n");
> +		pr_err("Failed to load ipt action\n");
>  
>  	if (ret1 < 0 && ret2 < 0) {
>  		return ret1;
> --- a/net/sched/act_mirred.c	2014-08-12 13:07:42.000000000 -0700
> +++ b/net/sched/act_mirred.c	2014-08-22 16:54:07.244031579 -0700
> @@ -140,7 +140,7 @@ static int tcf_mirred(struct sk_buff *sk
>  
>  	dev = m->tcfm_dev;
>  	if (!dev) {
> -		printk_once(KERN_NOTICE "tc mirred: target device is gone\n");
> +		netdev_notice(dev, "tc mirred: target device is gone\n");
>  		goto out;
>  	}

At my first look, I was wondering whether this could work as 'dev' is not
a valid pointer inside the if statement body. But after trying to trace to call
down, I found that it ends up as
printk("%s(NULL net_device): %pV" ... 
within __netdev_printk.
Is this the desired output in this case?
Or did I miss anything?

>  
> --- a/net/sched/sch_gred.c	2014-03-28 11:40:43.000000000 -0700
> +++ b/net/sched/sch_gred.c	2014-08-22 16:54:47.720032663 -0700
> @@ -456,8 +456,8 @@ static int gred_change(struct Qdisc *sch
>  			if (table->tab[table->def])
>  				def_prio = table->tab[table->def]->prio;
>  
> -			printk(KERN_DEBUG "GRED: DP %u does not have a prio "
> -			       "setting default to %d\n", ctl->DP, def_prio);
> +			pr_info("GRED: DP %u does not have a prio "
> +				"setting default to %d\n", ctl->DP, def_prio);
>  
>  			prio = def_prio;
>  		} else
> 

Best regards,
Michael

Re: [PATCH net-next 5/5] sched: replace bare printks

[David Miller]

From: Stephen Hemminger <stephen@networkplumber.org>
Date: Fri, 29 Aug 2014 00:09:23 -0700

> @@ -140,7 +140,7 @@ static int tcf_mirred(struct sk_buff *sk
>  
>  	dev = m->tcfm_dev;
>  	if (!dev) {
> -		printk_once(KERN_NOTICE "tc mirred: target device is gone\n");
> +		netdev_notice(dev, "tc mirred: target device is gone\n");
>  		goto out;

As pointed out by others, doing netdev_*() in a path where we know
'dev' is NULL doesn't make much sense.

Please respin this series with this adjusted.

Thanks.