Skip to contentSkip to conversation

ethtool: consolidate irq coalescing - part 5

PATCH In review Jakub Kicinski 4 participants 19 messages Mar 13, 2020 – Mar 15, 2020

Subsystems (15)
lore
Share & tools
lore

Jakub Kicinski

author maintainer
#0 lore raw

cover ethtool: consolidate irq coalescing - part 5

Hi!

Convert more drivers following the groundwork laid in a recent patch set [1] and continued in [2], [3], [4]. The aim of the effort is to consolidate irq coalescing parameter validation in the core.

This set converts further 15 drivers in drivers/net/ethernet. One more conversion sets to come.

[1] https://lore.kernel.org/netdev/[email protected]/
[2] https://lore.kernel.org/netdev/[email protected]/
[3] https://lore.kernel.org/netdev/[email protected]/
[4] https://lore.kernel.org/netdev/[email protected]/

Jakub Kicinski (15):
net: jme: reject unsupported coalescing params
net: mv643xx_eth: reject unsupported coalescing params
net: mvneta: reject unsupported coalescing params
net: mvpp2: reject unsupported coalescing params
net: octeontx2-pf: let core reject the unsupported coalescing
parameters
net: skge: reject unsupported coalescing params
net: sky2: reject unsupported coalescing params
net: myri10ge: reject unsupported coalescing params
net: nixge: let core reject the unsupported coalescing parameters
net: netxen: let core reject the unsupported coalescing parameters
net: qede: reject unsupported coalescing params
net: qlnic: let core reject the unsupported coalescing parameters
net: r8169: reject unsupported coalescing params
net: sxgbe: reject unsupported coalescing params
net: via: reject unsupported coalescing params

 drivers/net/ethernet/jme.c                    |  3 +++
 drivers/net/ethernet/marvell/mv643xx_eth.c    |  1 +
 drivers/net/ethernet/marvell/mvneta.c         |  2 ++
 .../net/ethernet/marvell/mvpp2/mvpp2_main.c   |  2 ++
 .../marvell/octeontx2/nic/otx2_ethtool.c      | 13 ++---------
 drivers/net/ethernet/marvell/skge.c           |  1 +
 drivers/net/ethernet/marvell/sky2.c           |  4 ++++
 .../net/ethernet/myricom/myri10ge/myri10ge.c  |  1 +
 drivers/net/ethernet/ni/nixge.c               | 22 +-----------------
 .../qlogic/netxen/netxen_nic_ethtool.c        | 21 +++--------------
 .../net/ethernet/qlogic/qede/qede_ethtool.c   |  2 ++
 .../ethernet/qlogic/qlcnic/qlcnic_ethtool.c   | 23 ++++---------------
 drivers/net/ethernet/realtek/r8169_main.c     |  2 ++
 .../ethernet/samsung/sxgbe/sxgbe_ethtool.c    |  1 +
 drivers/net/ethernet/via/via-velocity.c       |  2 ++
 15 files changed, 32 insertions(+), 68 deletions(-)
Signature · 1 line
2.24.1
author maintainer
#1 lore raw

PATCH 1/15 net: jme: reject unsupported coalescing params

Set ethtool_ops->supported_coalesce_params to let the core reject unsupported coalescing parameters.

This driver did not previously reject unsupported parameters.

---
 drivers/net/ethernet/jme.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/net/ethernet/jme.c +3 -0
index de3c7ce9353c..c97c74164c73 100644
@@ -2839,6 +2839,9 @@ jme_set_eeprom(struct net_device *netdev,
 }
 
 static const struct ethtool_ops jme_ethtool_ops = {
+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |
+				     ETHTOOL_COALESCE_MAX_FRAMES |
+				     ETHTOOL_COALESCE_USE_ADAPTIVE_RX,
 	.get_drvinfo            = jme_get_drvinfo,
 	.get_regs_len		= jme_get_regs_len,
 	.get_regs		= jme_get_regs,
Signature · 1 line
2.24.1
author maintainer
#2 lore raw

PATCH 2/15 net: mv643xx_eth: reject unsupported coalescing params

In reply to Jakub Kicinski

Set ethtool_ops->supported_coalesce_params to let the core reject unsupported coalescing parameters.

This driver did not previously reject unsupported parameters.

---
 drivers/net/ethernet/marvell/mv643xx_eth.c | 1 +
 1 file changed, 1 insertion(+)
drivers/net/ethernet/marvell/mv643xx_eth.c +1 -0
index 3c8125cbc84d..81d24481b22c 100644
@@ -1737,6 +1737,7 @@ static int mv643xx_eth_get_sset_count(struct net_device *dev, int sset)
 }
 
 static const struct ethtool_ops mv643xx_eth_ethtool_ops = {
+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS,
 	.get_drvinfo		= mv643xx_eth_get_drvinfo,
 	.nway_reset		= phy_ethtool_nway_reset,
 	.get_link		= ethtool_op_get_link,
Signature · 1 line
2.24.1
author maintainer
#3 lore raw

PATCH 3/15 net: mvneta: reject unsupported coalescing params

In reply to Jakub Kicinski

Set ethtool_ops->supported_coalesce_params to let the core reject unsupported coalescing parameters.

This driver did not previously reject unsupported parameters.

---
 drivers/net/ethernet/marvell/mvneta.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/net/ethernet/marvell/mvneta.c +2 -0
index bc488e8b8e45..16f8b1f7b04f 100644
@@ -4838,6 +4838,8 @@ static const struct net_device_ops mvneta_netdev_ops = {
 };
 
 static const struct ethtool_ops mvneta_eth_tool_ops = {
+	.supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS |
+				     ETHTOOL_COALESCE_MAX_FRAMES,
 	.nway_reset	= mvneta_ethtool_nway_reset,
 	.get_link       = ethtool_op_get_link,
 	.set_coalesce   = mvneta_ethtool_set_coalesce,
Signature · 1 line
2.24.1
author maintainer
#4 lore raw

PATCH 4/15 net: mvpp2: reject unsupported coalescing params

In reply to Jakub Kicinski

Set ethtool_ops->supported_coalesce_params to let the core reject unsupported coalescing parameters.

This driver did not previously reject unsupported parameters.

---
 drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +2 -0
index 6b9c7ed2547e..1fa60e985b43 100644
@@ -4384,6 +4384,8 @@ static const struct net_device_ops mvpp2_netdev_ops = {
 };
 
 static const struct ethtool_ops mvpp2_eth_tool_ops = {
+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |
+				     ETHTOOL_COALESCE_MAX_FRAMES,
 	.nway_reset		= mvpp2_ethtool_nway_reset,
 	.get_link		= ethtool_op_get_link,
 	.set_coalesce		= mvpp2_ethtool_set_coalesce,
Signature · 1 line
2.24.1
Acked-by on v1 4/15
#5 lore raw

Re: [PATCH net-next 04/15] net: mvpp2: reject unsupported coalescing params

Quoted 25 lines · Jakub Kicinski

Set ethtool_ops->supported_coalesce_params to let the core reject unsupported coalescing parameters.

This driver did not previously reject unsupported parameters.

---
 drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +2 -1
index 6b9c7ed2547e..1fa60e985b43 100644
@@ -4384,6 +4384,8 @@ static const struct net_device_ops mvpp2_netdev_ops = {
 };
 
 static const struct ethtool_ops mvpp2_eth_tool_ops = {
+       .supported_coalesce_params = ETHTOOL_COALESCE_USECS |
+                                    ETHTOOL_COALESCE_MAX_FRAMES,
        .nway_reset             = mvpp2_ethtool_nway_reset,
        .get_link               = ethtool_op_get_link,
        .set_coalesce           = mvpp2_ethtool_set_coalesce,
--
Quoted 2 lines

2.24.1

Signature · 2 lines
Matteo Croce
per aspera ad upstream
author maintainer
#6 lore raw

PATCH 5/15 net: octeontx2-pf: let core reject the unsupported coalescing parameters

In reply to Jakub Kicinski

Set ethtool_ops->supported_coalesce_params to let the core reject unsupported coalescing parameters.

This driver correctly rejects all unsupported
parameters, no functional changes.

---
 .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c   | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c +2 -11
index f450111423a8..017a295f568f 100644
@@ -368,17 +368,6 @@ static int otx2_set_coalesce(struct net_device *netdev,
 	struct otx2_hw *hw = &pfvf->hw;
 	int qidx;
 
-	if (ec->use_adaptive_rx_coalesce || ec->use_adaptive_tx_coalesce ||
-	    ec->rx_coalesce_usecs_irq || ec->rx_max_coalesced_frames_irq ||
-	    ec->tx_coalesce_usecs_irq || ec->tx_max_coalesced_frames_irq ||
-	    ec->stats_block_coalesce_usecs || ec->pkt_rate_low ||
-	    ec->rx_coalesce_usecs_low || ec->rx_max_coalesced_frames_low ||
-	    ec->tx_coalesce_usecs_low || ec->tx_max_coalesced_frames_low ||
-	    ec->pkt_rate_high || ec->rx_coalesce_usecs_high ||
-	    ec->rx_max_coalesced_frames_high || ec->tx_coalesce_usecs_high ||
-	    ec->tx_max_coalesced_frames_high || ec->rate_sample_interval)
-		return -EOPNOTSUPP;
-
 	if (!ec->rx_max_coalesced_frames || !ec->tx_max_coalesced_frames)
 		return 0;
 
@@ -674,6 +663,8 @@ static u32 otx2_get_link(struct net_device *netdev)
 }
 
 static const struct ethtool_ops otx2_ethtool_ops = {
+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |
+				     ETHTOOL_COALESCE_MAX_FRAMES,
 	.get_link		= otx2_get_link,
 	.get_drvinfo		= otx2_get_drvinfo,
 	.get_strings		= otx2_get_strings,
Signature · 1 line
2.24.1
author maintainer
#7 lore raw

PATCH 6/15 net: skge: reject unsupported coalescing params

In reply to Jakub Kicinski

Set ethtool_ops->supported_coalesce_params to let the core reject unsupported coalescing parameters.

This driver did not previously reject unsupported parameters.

---
 drivers/net/ethernet/marvell/skge.c | 1 +
 1 file changed, 1 insertion(+)
drivers/net/ethernet/marvell/skge.c +1 -0
index 97f270d30cce..3c89206f18a7 100644
@@ -876,6 +876,7 @@ static int skge_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom
 }
 
 static const struct ethtool_ops skge_ethtool_ops = {
+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS,
 	.get_drvinfo	= skge_get_drvinfo,
 	.get_regs_len	= skge_get_regs_len,
 	.get_regs	= skge_get_regs,
Signature · 1 line
2.24.1
author maintainer
#8 lore raw

PATCH 7/15 net: sky2: reject unsupported coalescing params

In reply to Jakub Kicinski

Set ethtool_ops->supported_coalesce_params to let the core reject unsupported coalescing parameters.

This driver did not previously reject unsupported parameters.

---
 drivers/net/ethernet/marvell/sky2.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/net/ethernet/marvell/sky2.c +4 -0
index ebfd0ceac884..241f00716979 100644
@@ -4400,6 +4400,10 @@ static int sky2_set_features(struct net_device *dev, netdev_features_t features)
 }
 
 static const struct ethtool_ops sky2_ethtool_ops = {
+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |
+				     ETHTOOL_COALESCE_MAX_FRAMES |
+				     ETHTOOL_COALESCE_RX_USECS_IRQ |
+				     ETHTOOL_COALESCE_RX_MAX_FRAMES_IRQ,
 	.get_drvinfo	= sky2_get_drvinfo,
 	.get_wol	= sky2_get_wol,
 	.set_wol	= sky2_set_wol,
Signature · 1 line
2.24.1
author maintainer
#9 lore raw

PATCH 8/15 net: myri10ge: reject unsupported coalescing params

In reply to Jakub Kicinski

Set ethtool_ops->supported_coalesce_params to let the core reject unsupported coalescing parameters.

This driver did not previously reject unsupported parameters.

---
 drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 1 +
 1 file changed, 1 insertion(+)
drivers/net/ethernet/myricom/myri10ge/myri10ge.c +1 -0
index 2ee0d0be113a..2616fd735aab 100644
@@ -1920,6 +1920,7 @@ myri10ge_phys_id(struct net_device *netdev, enum ethtool_phys_id_state state)
 }
 
 static const struct ethtool_ops myri10ge_ethtool_ops = {
+	.supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS,
 	.get_drvinfo = myri10ge_get_drvinfo,
 	.get_coalesce = myri10ge_get_coalesce,
 	.set_coalesce = myri10ge_set_coalesce,
Signature · 1 line
2.24.1
author maintainer
#10 lore raw

PATCH 9/15 net: nixge: let core reject the unsupported coalescing parameters

In reply to Jakub Kicinski

Set ethtool_ops->supported_coalesce_params to let the core reject unsupported coalescing parameters.

This driver correctly rejects all unsupported
parameters, no functional changes.

---
 drivers/net/ethernet/ni/nixge.c | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)
drivers/net/ethernet/ni/nixge.c +1 -21
index 49c7987c2abd..2fdd0753b3af 100644
@@ -1019,27 +1019,6 @@ static int nixge_ethtools_set_coalesce(struct net_device *ndev,
 		return -EBUSY;
 	}
 
-	if (ecoalesce->rx_coalesce_usecs ||
-	    ecoalesce->rx_coalesce_usecs_irq ||
-	    ecoalesce->rx_max_coalesced_frames_irq ||
-	    ecoalesce->tx_coalesce_usecs ||
-	    ecoalesce->tx_coalesce_usecs_irq ||
-	    ecoalesce->tx_max_coalesced_frames_irq ||
-	    ecoalesce->stats_block_coalesce_usecs ||
-	    ecoalesce->use_adaptive_rx_coalesce ||
-	    ecoalesce->use_adaptive_tx_coalesce ||
-	    ecoalesce->pkt_rate_low ||
-	    ecoalesce->rx_coalesce_usecs_low ||
-	    ecoalesce->rx_max_coalesced_frames_low ||
-	    ecoalesce->tx_coalesce_usecs_low ||
-	    ecoalesce->tx_max_coalesced_frames_low ||
-	    ecoalesce->pkt_rate_high ||
-	    ecoalesce->rx_coalesce_usecs_high ||
-	    ecoalesce->rx_max_coalesced_frames_high ||
-	    ecoalesce->tx_coalesce_usecs_high ||
-	    ecoalesce->tx_max_coalesced_frames_high ||
-	    ecoalesce->rate_sample_interval)
-		return -EOPNOTSUPP;
 	if (ecoalesce->rx_max_coalesced_frames)
 		priv->coalesce_count_rx = ecoalesce->rx_max_coalesced_frames;
 	if (ecoalesce->tx_max_coalesced_frames)
@@ -1083,6 +1062,7 @@ static int nixge_ethtools_set_phys_id(struct net_device *ndev,
 }
 
 static const struct ethtool_ops nixge_ethtool_ops = {
+	.supported_coalesce_params = ETHTOOL_COALESCE_MAX_FRAMES,
 	.get_drvinfo    = nixge_ethtools_get_drvinfo,
 	.get_coalesce   = nixge_ethtools_get_coalesce,
 	.set_coalesce   = nixge_ethtools_set_coalesce,
Signature · 1 line
2.24.1
author maintainer
#11 lore raw

PATCH 10/15 net: netxen: let core reject the unsupported coalescing parameters

In reply to Jakub Kicinski

Set ethtool_ops->supported_coalesce_params to let the core reject unsupported coalescing parameters.

As a side effect of these changes the error code for unsupported params changes from EINVAL to EOPNOTSUPP.

The driver was missing a check for rate_sample_interval.

---
 .../qlogic/netxen/netxen_nic_ethtool.c        | 21 +++----------------
 1 file changed, 3 insertions(+), 18 deletions(-)
drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c +3 -18
index 6a2d91d58968..66f45fce90fa 100644
@@ -748,24 +748,7 @@ static int netxen_set_intr_coalesce(struct net_device *netdev,
 	if (ethcoal->rx_coalesce_usecs > 0xffff ||
 		ethcoal->rx_max_coalesced_frames > 0xffff ||
 		ethcoal->tx_coalesce_usecs > 0xffff ||
-		ethcoal->tx_max_coalesced_frames > 0xffff ||
-		ethcoal->rx_coalesce_usecs_irq ||
-		ethcoal->rx_max_coalesced_frames_irq ||
-		ethcoal->tx_coalesce_usecs_irq ||
-		ethcoal->tx_max_coalesced_frames_irq ||
-		ethcoal->stats_block_coalesce_usecs ||
-		ethcoal->use_adaptive_rx_coalesce ||
-		ethcoal->use_adaptive_tx_coalesce ||
-		ethcoal->pkt_rate_low ||
-		ethcoal->rx_coalesce_usecs_low ||
-		ethcoal->rx_max_coalesced_frames_low ||
-		ethcoal->tx_coalesce_usecs_low ||
-		ethcoal->tx_max_coalesced_frames_low ||
-		ethcoal->pkt_rate_high ||
-		ethcoal->rx_coalesce_usecs_high ||
-		ethcoal->rx_max_coalesced_frames_high ||
-		ethcoal->tx_coalesce_usecs_high ||
-		ethcoal->tx_max_coalesced_frames_high)
+		ethcoal->tx_max_coalesced_frames > 0xffff)
 		return -EINVAL;
 
 	if (!ethcoal->rx_coalesce_usecs ||
@@ -923,6 +906,8 @@ netxen_get_dump_data(struct net_device *netdev, struct ethtool_dump *dump,
 }
 
 const struct ethtool_ops netxen_nic_ethtool_ops = {
+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |
+				     ETHTOOL_COALESCE_MAX_FRAMES,
 	.get_drvinfo = netxen_nic_get_drvinfo,
 	.get_regs_len = netxen_nic_get_regs_len,
 	.get_regs = netxen_nic_get_regs,
Signature · 1 line
2.24.1
author maintainer
#12 lore raw

PATCH 11/15 net: qede: reject unsupported coalescing params

In reply to Jakub Kicinski

Set ethtool_ops->supported_coalesce_params to let the core reject unsupported coalescing parameters.

This driver did not previously reject unsupported parameters.

---
 drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/net/ethernet/qlogic/qede/qede_ethtool.c +2 -0
index 8a426afb6a55..4f7676f4e624 100644
@@ -2087,6 +2087,7 @@ static int qede_get_dump_data(struct net_device *dev,
 }
 
 static const struct ethtool_ops qede_ethtool_ops = {
+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS,
 	.get_link_ksettings = qede_get_link_ksettings,
 	.set_link_ksettings = qede_set_link_ksettings,
 	.get_drvinfo = qede_get_drvinfo,
@@ -2133,6 +2134,7 @@ static const struct ethtool_ops qede_ethtool_ops = {
 };
 
 static const struct ethtool_ops qede_vf_ethtool_ops = {
+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS,
 	.get_link_ksettings = qede_get_link_ksettings,
 	.get_drvinfo = qede_get_drvinfo,
 	.get_msglevel = qede_get_msglevel,
Signature · 1 line
2.24.1
author maintainer
#13 lore raw

PATCH 12/15 net: qlnic: let core reject the unsupported coalescing parameters

In reply to Jakub Kicinski

Set ethtool_ops->supported_coalesce_params to let the core reject unsupported coalescing parameters.

This driver already correctly rejected almost all unsupported parameters (missing sample_rate_interval).

As a side effect of these changes the error code for unsupported params changes from EINVAL to EOPNOTSUPP.

---
 .../ethernet/qlogic/qlcnic/qlcnic_ethtool.c   | 23 ++++---------------
 1 file changed, 5 insertions(+), 18 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c +5 -18
index 75d83c3cbf27..5c2a3acf1e89 100644
@@ -1542,24 +1542,7 @@ static int qlcnic_set_intr_coalesce(struct net_device *netdev,
 	if (ethcoal->rx_coalesce_usecs > 0xffff ||
 	    ethcoal->rx_max_coalesced_frames > 0xffff ||
 	    ethcoal->tx_coalesce_usecs > 0xffff ||
-	    ethcoal->tx_max_coalesced_frames > 0xffff ||
-	    ethcoal->rx_coalesce_usecs_irq ||
-	    ethcoal->rx_max_coalesced_frames_irq ||
-	    ethcoal->tx_coalesce_usecs_irq ||
-	    ethcoal->tx_max_coalesced_frames_irq ||
-	    ethcoal->stats_block_coalesce_usecs ||
-	    ethcoal->use_adaptive_rx_coalesce ||
-	    ethcoal->use_adaptive_tx_coalesce ||
-	    ethcoal->pkt_rate_low ||
-	    ethcoal->rx_coalesce_usecs_low ||
-	    ethcoal->rx_max_coalesced_frames_low ||
-	    ethcoal->tx_coalesce_usecs_low ||
-	    ethcoal->tx_max_coalesced_frames_low ||
-	    ethcoal->pkt_rate_high ||
-	    ethcoal->rx_coalesce_usecs_high ||
-	    ethcoal->rx_max_coalesced_frames_high ||
-	    ethcoal->tx_coalesce_usecs_high ||
-	    ethcoal->tx_max_coalesced_frames_high)
+	    ethcoal->tx_max_coalesced_frames > 0xffff)
 		return -EINVAL;
 
 	err = qlcnic_config_intr_coalesce(adapter, ethcoal);
@@ -1834,6 +1817,8 @@ qlcnic_set_dump(struct net_device *netdev, struct ethtool_dump *val)
 }
 
 const struct ethtool_ops qlcnic_ethtool_ops = {
+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |
+				     ETHTOOL_COALESCE_MAX_FRAMES,
 	.get_drvinfo = qlcnic_get_drvinfo,
 	.get_regs_len = qlcnic_get_regs_len,
 	.get_regs = qlcnic_get_regs,
@@ -1865,6 +1850,8 @@ const struct ethtool_ops qlcnic_ethtool_ops = {
 };
 
 const struct ethtool_ops qlcnic_sriov_vf_ethtool_ops = {
+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |
+				     ETHTOOL_COALESCE_MAX_FRAMES,
 	.get_drvinfo		= qlcnic_get_drvinfo,
 	.get_regs_len		= qlcnic_get_regs_len,
 	.get_regs		= qlcnic_get_regs,
Signature · 1 line
2.24.1
author maintainer
#14 lore raw

PATCH 13/15 net: r8169: reject unsupported coalescing params

In reply to Jakub Kicinski

Set ethtool_ops->supported_coalesce_params to let the core reject unsupported coalescing parameters.

This driver did not previously reject unsupported parameters.

---
 drivers/net/ethernet/realtek/r8169_main.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/net/ethernet/realtek/r8169_main.c +2 -0
index ce030e093485..d2eef3754b33 100644
@@ -2006,6 +2006,8 @@ static int rtl8169_set_eee(struct net_device *dev, struct ethtool_eee *data)
 }
 
 static const struct ethtool_ops rtl8169_ethtool_ops = {
+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |
+				     ETHTOOL_COALESCE_MAX_FRAMES,
 	.get_drvinfo		= rtl8169_get_drvinfo,
 	.get_regs_len		= rtl8169_get_regs_len,
 	.get_link		= ethtool_op_get_link,
Signature · 1 line
2.24.1
maintainer Acked-by on v1 13/15
#15 lore raw

Re: [PATCH net-next 13/15] net: r8169: reject unsupported coalescing params

Quoted 10 lines · Jakub Kicinski

Set ethtool_ops->supported_coalesce_params to let the core reject unsupported coalescing parameters.

This driver did not previously reject unsupported parameters.

---
 drivers/net/ethernet/realtek/r8169_main.c | 2 ++
 1 file changed, 2 insertions(+)
author maintainer
#16 lore raw

PATCH 14/15 net: sxgbe: reject unsupported coalescing params

In reply to Jakub Kicinski

Set ethtool_ops->supported_coalesce_params to let the core reject unsupported coalescing parameters.

This driver did not previously reject unsupported parameters.

---
 drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c | 1 +
 1 file changed, 1 insertion(+)
drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c +1 -0
index 466483c4ac67..21465cb3d60a 100644
@@ -476,6 +476,7 @@ static int sxgbe_get_regs_len(struct net_device *dev)
 }
 
 static const struct ethtool_ops sxgbe_ethtool_ops = {
+	.supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS,
 	.get_drvinfo = sxgbe_getdrvinfo,
 	.get_msglevel = sxgbe_getmsglevel,
 	.set_msglevel = sxgbe_setmsglevel,
Signature · 1 line
2.24.1
author maintainer
#17 lore raw

PATCH 15/15 net: via: reject unsupported coalescing params

In reply to Jakub Kicinski

Set ethtool_ops->supported_coalesce_params to let the core reject unsupported coalescing parameters.

This driver did not previously reject unsupported parameters.

---
 drivers/net/ethernet/via/via-velocity.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/net/ethernet/via/via-velocity.c +2 -0
index 4b556b74541a..713dbc04b25b 100644
@@ -3648,6 +3648,8 @@ static void velocity_get_ethtool_stats(struct net_device *dev,
 }
 
 static const struct ethtool_ops velocity_ethtool_ops = {
+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |
+				     ETHTOOL_COALESCE_MAX_FRAMES,
 	.get_drvinfo		= velocity_get_drvinfo,
 	.get_wol		= velocity_ethtool_get_wol,
 	.set_wol		= velocity_ethtool_set_wol,
Signature · 1 line
2.24.1
maintainer
#18 lore raw
In reply to Jakub Kicinski

From: Jakub Kicinski <[email protected]>
Date: Thu, 12 Mar 2020 21:07:48 -0700

Quoted 11 lines

Convert more drivers following the groundwork laid in a recent patch set [1] and continued in [2], [3], [4]. The aim of the effort is to consolidate irq coalescing parameter validation in the core.

This set converts further 15 drivers in drivers/net/ethernet. One more conversion sets to come.

[1] https://lore.kernel.org/netdev/[email protected]/
[2] https://lore.kernel.org/netdev/[email protected]/
[3] https://lore.kernel.org/netdev/[email protected]/
[4] https://lore.kernel.org/netdev/[email protected]/

Series applied, thanks Jakub.