[PATCH net-next 0/2] net: Demote MTU change prints to debug

netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* [PATCH net-next 0/2] net: Demote MTU change prints to debug
@ 2019-11-07 22:35 Florian Fainelli
  2019-11-07 22:35 ` [PATCH net-next 1/2] net: ethernet: intel: " Florian Fainelli
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Florian Fainelli @ 2019-11-07 22:35 UTC (permalink / raw)
  To: netdev
  Cc: Florian Fainelli, Jeff Kirsher, David S. Miller, Timur Tabi,
	moderated list:INTEL ETHERNET DRIVERS, open list

Hi David, Jeff, Timur,

This patch series demotes several drivers that printed MTU change and
could therefore spam the kernel console if one has a test that it's all
about testing the values. Intel drivers were not also particularly
consistent in how they printed the same message, so now they are.

Thanks

Florian Fainelli (2):
  net: ethernet: intel: Demote MTU change prints to debug
  net: qcom/emac: Demote MTU change print to debug

 drivers/net/ethernet/intel/e1000/e1000_main.c | 4 ++--
 drivers/net/ethernet/intel/e1000e/netdev.c    | 3 ++-
 drivers/net/ethernet/intel/i40e/i40e_main.c   | 4 ++--
 drivers/net/ethernet/intel/igb/igb_main.c     | 5 ++---
 drivers/net/ethernet/intel/igbvf/netdev.c     | 4 ++--
 drivers/net/ethernet/intel/igc/igc_main.c     | 5 ++---
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 ++-
 drivers/net/ethernet/qualcomm/emac/emac.c     | 6 +++---
 8 files changed, 17 insertions(+), 17 deletions(-)

-- 
2.17.1


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH net-next 1/2] net: ethernet: intel: Demote MTU change prints to debug
  2019-11-07 22:35 [PATCH net-next 0/2] net: Demote MTU change prints to debug Florian Fainelli
@ 2019-11-07 22:35 ` Florian Fainelli
  2019-11-07 22:52   ` Jeff Kirsher
  2019-11-07 22:35 ` [PATCH net-next 2/2] net: qcom/emac: Demote MTU change print " Florian Fainelli
  2019-11-08  4:01 ` [PATCH net-next 0/2] net: Demote MTU change prints " David Miller
  2 siblings, 1 reply; 6+ messages in thread
From: Florian Fainelli @ 2019-11-07 22:35 UTC (permalink / raw)
  To: netdev
  Cc: Florian Fainelli, Jeff Kirsher, David S. Miller, Timur Tabi,
	moderated list:INTEL ETHERNET DRIVERS, open list

Changing a network device MTU can be a fairly frequent operation, and
failure to change the MTU is reflected to user-space properly, both by
an appropriate message as well as by looking at whether the device's MTU
matches the configuration.

Demote the prints to debug prints by using netdev_dbg(), making all
Intel wired LAN drivers consistent, since they used a mixture of PCI
device and network device prints before.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 drivers/net/ethernet/intel/e1000/e1000_main.c | 4 ++--
 drivers/net/ethernet/intel/e1000e/netdev.c    | 3 ++-
 drivers/net/ethernet/intel/i40e/i40e_main.c   | 4 ++--
 drivers/net/ethernet/intel/igb/igb_main.c     | 5 ++---
 drivers/net/ethernet/intel/igbvf/netdev.c     | 4 ++--
 drivers/net/ethernet/intel/igc/igc_main.c     | 5 ++---
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 ++-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 86493fea56e4..416da9619928 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -3565,8 +3565,8 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
 	     (max_frame == MAXIMUM_ETHERNET_VLAN_SIZE)))
 		adapter->rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE;
 
-	pr_info("%s changing MTU from %d to %d\n",
-		netdev->name, netdev->mtu, new_mtu);
+	netdev_dbg(netdev, "changing MTU from %d to %d\n",
+		   netdev->mtu, new_mtu);
 	netdev->mtu = new_mtu;
 
 	if (netif_running(netdev))
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 032b88619054..fe7997c18a10 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -6031,7 +6031,8 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
 		usleep_range(1000, 1100);
 	/* e1000e_down -> e1000e_reset dependent on max_frame_size & mtu */
 	adapter->max_frame_size = max_frame;
-	e_info("changing MTU from %d to %d\n", netdev->mtu, new_mtu);
+	netdev_dbg(netdev, "changing MTU from %d to %d\n",
+		   netdev->mtu, new_mtu);
 	netdev->mtu = new_mtu;
 
 	pm_runtime_get_sync(netdev->dev.parent);
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 9fac1cea6fa5..1ccabeafa44c 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -2664,8 +2664,8 @@ static int i40e_change_mtu(struct net_device *netdev, int new_mtu)
 			return -EINVAL;
 	}
 
-	netdev_info(netdev, "changing MTU from %d to %d\n",
-		    netdev->mtu, new_mtu);
+	netdev_dbg(netdev, "changing MTU from %d to %d\n",
+		   netdev->mtu, new_mtu);
 	netdev->mtu = new_mtu;
 	if (netif_running(netdev))
 		i40e_vsi_reinit_locked(vsi);
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 48a40e4132f9..7337b3d3d1f6 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -6236,7 +6236,6 @@ static void igb_get_stats64(struct net_device *netdev,
 static int igb_change_mtu(struct net_device *netdev, int new_mtu)
 {
 	struct igb_adapter *adapter = netdev_priv(netdev);
-	struct pci_dev *pdev = adapter->pdev;
 	int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;
 
 	/* adjust max frame to be at least the size of a standard frame */
@@ -6252,8 +6251,8 @@ static int igb_change_mtu(struct net_device *netdev, int new_mtu)
 	if (netif_running(netdev))
 		igb_down(adapter);
 
-	dev_info(&pdev->dev, "changing MTU from %d to %d\n",
-		 netdev->mtu, new_mtu);
+	netdev_dbg(netdev, "changing MTU from %d to %d\n",
+		   netdev->mtu, new_mtu);
 	netdev->mtu = new_mtu;
 
 	if (netif_running(netdev))
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index 0f2b68f4bb0f..6003dc3ff5fd 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -2437,8 +2437,8 @@ static int igbvf_change_mtu(struct net_device *netdev, int new_mtu)
 		adapter->rx_buffer_len = ETH_FRAME_LEN + VLAN_HLEN +
 					 ETH_FCS_LEN;
 
-	dev_info(&adapter->pdev->dev, "changing MTU from %d to %d\n",
-		 netdev->mtu, new_mtu);
+	netdev_dbg(netdev, "changing MTU from %d to %d\n",
+		   netdev->mtu, new_mtu);
 	netdev->mtu = new_mtu;
 
 	if (netif_running(netdev))
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index 6105c6d1f3c9..b9d46cd57b6a 100644
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -2272,7 +2272,6 @@ static int igc_change_mtu(struct net_device *netdev, int new_mtu)
 {
 	int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;
 	struct igc_adapter *adapter = netdev_priv(netdev);
-	struct pci_dev *pdev = adapter->pdev;
 
 	/* adjust max frame to be at least the size of a standard frame */
 	if (max_frame < (ETH_FRAME_LEN + ETH_FCS_LEN))
@@ -2287,8 +2286,8 @@ static int igc_change_mtu(struct net_device *netdev, int new_mtu)
 	if (netif_running(netdev))
 		igc_down(adapter);
 
-	dev_info(&pdev->dev, "changing MTU from %d to %d\n",
-		 netdev->mtu, new_mtu);
+	netdev_dbg(netdev, "changing MTU from %d to %d\n",
+		   netdev->mtu, new_mtu);
 	netdev->mtu = new_mtu;
 
 	if (netif_running(netdev))
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 1129ae70d5fb..25c097cd8100 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -6725,7 +6725,8 @@ static int ixgbe_change_mtu(struct net_device *netdev, int new_mtu)
 	    (new_mtu > ETH_DATA_LEN))
 		e_warn(probe, "Setting MTU > 1500 will disable legacy VFs\n");
 
-	e_info(probe, "changing MTU from %d to %d\n", netdev->mtu, new_mtu);
+	netdev_dbg(netdev, "changing MTU from %d to %d\n",
+		   netdev->mtu, new_mtu);
 
 	/* must set new MTU before calling down or up */
 	netdev->mtu = new_mtu;
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH net-next 1/2] net: ethernet: intel: Demote MTU change prints to debug
  2019-11-07 22:35 ` [PATCH net-next 1/2] net: ethernet: intel: " Florian Fainelli
@ 2019-11-07 22:52   ` Jeff Kirsher
  0 siblings, 0 replies; 6+ messages in thread
From: Jeff Kirsher @ 2019-11-07 22:52 UTC (permalink / raw)
  To: Florian Fainelli, netdev
  Cc: David S. Miller, Timur Tabi,
	moderated list:INTEL ETHERNET DRIVERS, open list

[-- Attachment #1: Type: text/plain, Size: 1101 bytes --]

On Thu, 2019-11-07 at 14:35 -0800, Florian Fainelli wrote:
> Changing a network device MTU can be a fairly frequent operation, and
> failure to change the MTU is reflected to user-space properly, both by
> an appropriate message as well as by looking at whether the device's MTU
> matches the configuration.
> 
> Demote the prints to debug prints by using netdev_dbg(), making all
> Intel wired LAN drivers consistent, since they used a mixture of PCI
> device and network device prints before.
> 
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

> ---
>  drivers/net/ethernet/intel/e1000/e1000_main.c | 4 ++--
>  drivers/net/ethernet/intel/e1000e/netdev.c    | 3 ++-
>  drivers/net/ethernet/intel/i40e/i40e_main.c   | 4 ++--
>  drivers/net/ethernet/intel/igb/igb_main.c     | 5 ++---
>  drivers/net/ethernet/intel/igbvf/netdev.c     | 4 ++--
>  drivers/net/ethernet/intel/igc/igc_main.c     | 5 ++---
>  drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 ++-
>  7 files changed, 14 insertions(+), 14 deletions(-)


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH net-next 2/2] net: qcom/emac: Demote MTU change print to debug
  2019-11-07 22:35 [PATCH net-next 0/2] net: Demote MTU change prints to debug Florian Fainelli
  2019-11-07 22:35 ` [PATCH net-next 1/2] net: ethernet: intel: " Florian Fainelli
@ 2019-11-07 22:35 ` Florian Fainelli
  2019-11-08  2:57   ` Timur Tabi
  2019-11-08  4:01 ` [PATCH net-next 0/2] net: Demote MTU change prints " David Miller
  2 siblings, 1 reply; 6+ messages in thread
From: Florian Fainelli @ 2019-11-07 22:35 UTC (permalink / raw)
  To: netdev
  Cc: Florian Fainelli, Jeff Kirsher, David S. Miller, Timur Tabi,
	moderated list:INTEL ETHERNET DRIVERS, open list

Changing the MTU can be a frequent operation and it is already clear
when (or not) a MTU change is successful, demote prints to debug prints.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 drivers/net/ethernet/qualcomm/emac/emac.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/qualcomm/emac/emac.c b/drivers/net/ethernet/qualcomm/emac/emac.c
index c84ab052ef26..98f92268cbaa 100644
--- a/drivers/net/ethernet/qualcomm/emac/emac.c
+++ b/drivers/net/ethernet/qualcomm/emac/emac.c
@@ -213,9 +213,9 @@ static int emac_change_mtu(struct net_device *netdev, int new_mtu)
 {
 	struct emac_adapter *adpt = netdev_priv(netdev);
 
-	netif_info(adpt, hw, adpt->netdev,
-		   "changing MTU from %d to %d\n", netdev->mtu,
-		   new_mtu);
+	netif_dbg(adpt, hw, adpt->netdev,
+		  "changing MTU from %d to %d\n", netdev->mtu,
+		  new_mtu);
 	netdev->mtu = new_mtu;
 
 	if (netif_running(netdev))
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH net-next 2/2] net: qcom/emac: Demote MTU change print to debug
  2019-11-07 22:35 ` [PATCH net-next 2/2] net: qcom/emac: Demote MTU change print " Florian Fainelli
@ 2019-11-08  2:57   ` Timur Tabi
  0 siblings, 0 replies; 6+ messages in thread
From: Timur Tabi @ 2019-11-08  2:57 UTC (permalink / raw)
  To: Florian Fainelli, netdev
  Cc: Jeff Kirsher, David S. Miller,
	moderated list:INTEL ETHERNET DRIVERS, open list

On 11/7/19 4:35 PM, Florian Fainelli wrote:
> Changing the MTU can be a frequent operation and it is already clear
> when (or not) a MTU change is successful, demote prints to debug prints.
> 
> Signed-off-by: Florian Fainelli<f.fainelli@gmail.com>

Acked-by: Timur Tabi <timur@kernel.org>


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH net-next 0/2] net: Demote MTU change prints to debug
  2019-11-07 22:35 [PATCH net-next 0/2] net: Demote MTU change prints to debug Florian Fainelli
  2019-11-07 22:35 ` [PATCH net-next 1/2] net: ethernet: intel: " Florian Fainelli
  2019-11-07 22:35 ` [PATCH net-next 2/2] net: qcom/emac: Demote MTU change print " Florian Fainelli
@ 2019-11-08  4:01 ` David Miller
  2 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2019-11-08  4:01 UTC (permalink / raw)
  To: f.fainelli
  Cc: netdev, jeffrey.t.kirsher, timur, intel-wired-lan, linux-kernel

From: Florian Fainelli <f.fainelli@gmail.com>
Date: Thu,  7 Nov 2019 14:35:35 -0800

> This patch series demotes several drivers that printed MTU change and
> could therefore spam the kernel console if one has a test that it's all
> about testing the values. Intel drivers were not also particularly
> consistent in how they printed the same message, so now they are.

Series applied, thanks Florian.

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2019-11-08  4:01 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-07 22:35 [PATCH net-next 0/2] net: Demote MTU change prints to debug Florian Fainelli
2019-11-07 22:35 ` [PATCH net-next 1/2] net: ethernet: intel: " Florian Fainelli
2019-11-07 22:52   ` Jeff Kirsher
2019-11-07 22:35 ` [PATCH net-next 2/2] net: qcom/emac: Demote MTU change print " Florian Fainelli
2019-11-08  2:57   ` Timur Tabi
2019-11-08  4:01 ` [PATCH net-next 0/2] net: Demote MTU change prints " David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).