Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba7a46f1 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

net: Convert LIMIT_NETDEBUG to net_dbg_ratelimited 



Use the more common dynamic_debug capable net_dbg_ratelimited
and remove the LIMIT_NETDEBUG macro.

All messages are still ratelimited.

Some KERN_<LEVEL> uses are changed to KERN_DEBUG.

This may have some negative impact on messages that were
emitted at KERN_INFO that are not not enabled at all unless
DEBUG is defined or dynamic_debug is enabled.  Even so,
these messages are now _not_ emitted by default.

This also eliminates the use of the net_msg_warn sysctl
"/proc/sys/net/core/warnings".  For backward compatibility,
the sysctl is not removed, but it has no function.  The extern
declaration of net_msg_warn is removed from sock.h and made
static in net/core/sysctl_net_core.c

Miscellanea:

o Update the sysctl documentation
o Remove the embedded uses of pr_fmt
o Coalesce format fragments
o Realign arguments

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5b61c4db

Documentation/sysctl/net.txt

+8 −4
Original line number Diff line number Diff line
@@ -120,10 +120,14 @@ seconds. 
warnings

--------



This controls console messages from the networking stack that can occur because

of problems on the network like duplicate address or bad checksums. Normally,

this should be enabled, but if the problem persists the messages can be

disabled.

This sysctl is now unused.



This was used to control console messages from the networking stack that

occur because of problems on the network like duplicate address or bad

checksums.



These messages are now emitted at KERN_DEBUG and can generally be enabled

and controlled by the dynamic_debug facility.



netdev_budget

-------------

include/net/sock.h

+0 −7
Original line number Diff line number Diff line
@@ -2288,13 +2288,6 @@ bool sk_ns_capable(const struct sock *sk, 
bool sk_capable(const struct sock *sk, int cap);

bool sk_net_capable(const struct sock *sk, int cap);



/*

 *	Enable debug/info messages

 */

extern int net_msg_warn;

#define LIMIT_NETDEBUG(fmt, args...) \

	do { if (net_msg_warn && net_ratelimit()) printk(fmt,##args); } while(0)



extern __u32 sysctl_wmem_max;

extern __u32 sysctl_rmem_max;

include/net/udplite.h

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static inline int udplite_checksum_init(struct sk_buff *skb, struct udphdr *uh) 
         * checksum. UDP-Lite (like IPv6) mandates checksums, hence packets

         * with a zero checksum field are illegal.                            */

	if (uh->check == 0) {

		LIMIT_NETDEBUG(KERN_DEBUG "UDPLite: zeroed checksum field\n");

		net_dbg_ratelimited("UDPLite: zeroed checksum field\n");

		return 1;

	}
@@ -52,7 +52,7 @@ static inline int udplite_checksum_init(struct sk_buff *skb, struct udphdr *uh) 
		/*

		 * Coverage length violates RFC 3828: log and discard silently.

		 */

		LIMIT_NETDEBUG(KERN_DEBUG "UDPLite: bad csum coverage %d/%d\n",

		net_dbg_ratelimited("UDPLite: bad csum coverage %d/%d\n",

				    cscov, skb->len);

		return 1;

net/core/sysctl_net_core.c

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ static int zero = 0; 
static int one = 1;

static int ushort_max = USHRT_MAX;



static int net_msg_warn;	/* Unused, but still a sysctl */



#ifdef CONFIG_RPS

static int rps_sock_flow_sysctl(struct ctl_table *table, int write,

				void __user *buffer, size_t *lenp, loff_t *ppos)

net/core/utils.c

+0 −3
Original line number Diff line number Diff line
@@ -33,9 +33,6 @@ 
#include <asm/byteorder.h>

#include <asm/uaccess.h>



int net_msg_warn __read_mostly = 1;

EXPORT_SYMBOL(net_msg_warn);



DEFINE_RATELIMIT_STATE(net_ratelimit_state, 5 * HZ, 10);

/*

 * All net warning printk()s should be guarded by this function.