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

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

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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3a3bfb61

net/atm/ioctl.c

+3 −5
Original line number Diff line number Diff line
@@ -97,8 +97,7 @@ static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, 
			error = sock_get_timestampns(sk, argp);

		goto done;

	case ATM_SETSC:

		if (net_ratelimit())

			pr_warning("ATM_SETSC is obsolete; used by %s:%d\n",

		net_warn_ratelimited("ATM_SETSC is obsolete; used by %s:%d\n",

				     current->comm, task_pid_nr(current));

		error = 0;

		goto done;
@@ -123,8 +122,7 @@ static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, 
		   work for 32-bit userspace. TBH I don't really want

		   to think about it at all. dwmw2. */

		if (compat) {

			if (net_ratelimit())

				pr_warning("32-bit task cannot be atmsigd\n");

			net_warn_ratelimited("32-bit task cannot be atmsigd\n");

			error = -EINVAL;

			goto done;

		}

net/caif/caif_socket.c

+4 −6
Original line number Diff line number Diff line
@@ -131,8 +131,7 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) 


	if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=

		(unsigned int)sk->sk_rcvbuf && rx_flow_is_on(cf_sk)) {

		if (net_ratelimit())

			pr_debug("sending flow OFF (queue len = %d %d)\n",

		net_dbg_ratelimited("sending flow OFF (queue len = %d %d)\n",

				    atomic_read(&cf_sk->sk.sk_rmem_alloc),

				    sk_rcvbuf_lowwater(cf_sk));

		set_rx_flow_off(cf_sk);
@@ -144,8 +143,7 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) 
		return err;

	if (!sk_rmem_schedule(sk, skb->truesize) && rx_flow_is_on(cf_sk)) {

		set_rx_flow_off(cf_sk);

		if (net_ratelimit())

			pr_debug("sending flow OFF due to rmem_schedule\n");

		net_dbg_ratelimited("sending flow OFF due to rmem_schedule\n");

		caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_OFF_REQ);

	}

	skb->dev = NULL;

net/core/dev.c

+12 −18
Original line number Diff line number Diff line
@@ -1673,8 +1673,7 @@ 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",

				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",

		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,16 +2586,14 @@ 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",

			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",

			net_crit_ratelimited("Dead loop on virtual device %s, fix it urgently!\n",

					     dev->name);

		}

	}
@@ -3080,8 +3075,7 @@ 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",

		net_warn_ratelimited("Redir loop detected Dropping packet (%d->%d)\n",

				     skb->skb_iif, dev->ifindex);

		return TC_ACT_SHOT;

	}

net/core/pktgen.c

+3 −4
Original line number Diff line number Diff line
@@ -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:

net/core/rtnetlink.c

+3 −5
Original line number Diff line number Diff line
@@ -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);