Commit f3588909 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ethtool-consolidate-parameter-checking-for-irq-coalescing' 



Jakub Kicinski says:

====================
ethtool: consolidate parameter checking for irq coalescing

This set aims to simplify and unify the unsupported irq
coalescing parameter handling.

First patch adds a bitmask which drivers should fill in
in their ethtool_ops structs to declare which parameters
they support. Core will then ensure that driver callback
won't see any parameter outside of that set.

This allows us to save some LoC and make sure all drivers
respond the same to unsupported parameters.

If any parameter driver does not support is set to a value
other than 0 core will return -EINVAL. In the future we can
reject any present but unsupported netlink attribute, without
assuming 0 means unset. We can also add some prints or extack,
perhaps a'la Intel's current code.

I started converting the drivers alphabetically but then
realized that for the first set it's probably best to
address a representative mix of actively developed drivers.

According to my unreliable math there are roughly 69 drivers
in the tree which support some form of interrupt coalescing
settings via ethtool. Of these roughly 17 reject parameters
they don't support.

I hope drivers which ignore the parameters don't care, and
won't care about the slight change in behavior. Once all
drivers are converted we can make the checking mandatory.

I've only tested the e1000e and virtio patches, the rest builds.

v2: fix up ice and virtio conversions
v3: (patch 1)
    - move the (temporary) check if driver defines types
      earlier (Michal)
    - rename used_types -> nonzero_params, and
      coalesce_types -> supported_coalesce_params (Alex)
    - use EOPNOTSUPP instead of EINVAL (Andrew, Michal)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 56dc0a0e a51e5206

drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c

+2 −24
Original line number Diff line number Diff line
@@ -450,30 +450,6 @@ static int xgbe_set_coalesce(struct net_device *netdev, 
	unsigned int rx_frames, rx_riwt, rx_usecs;

	unsigned int tx_frames;



	/* Check for not supported parameters  */

	if ((ec->rx_coalesce_usecs_irq) ||

	    (ec->rx_max_coalesced_frames_irq) ||

	    (ec->tx_coalesce_usecs) ||

	    (ec->tx_coalesce_usecs_irq) ||

	    (ec->tx_max_coalesced_frames_irq) ||

	    (ec->stats_block_coalesce_usecs) ||

	    (ec->use_adaptive_rx_coalesce) ||

	    (ec->use_adaptive_tx_coalesce) ||

	    (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)) {

		netdev_err(netdev, "unsupported coalescing parameter\n");

		return -EOPNOTSUPP;

	}



	rx_riwt = hw_if->usec_to_riwt(pdata, ec->rx_coalesce_usecs);

	rx_usecs = ec->rx_coalesce_usecs;

	rx_frames = ec->rx_max_coalesced_frames;
@@ -837,6 +813,8 @@ out: 
}



static const struct ethtool_ops xgbe_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS |

				     ETHTOOL_COALESCE_MAX_FRAMES,

	.get_drvinfo = xgbe_get_drvinfo,

	.get_msglevel = xgbe_get_msglevel,

	.set_msglevel = xgbe_set_msglevel,

drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c

+6 −0
Original line number Diff line number Diff line
@@ -3472,6 +3472,12 @@ void bnxt_ethtool_free(struct bnxt *bp) 
}



const struct ethtool_ops bnxt_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_MAX_FRAMES |

				     ETHTOOL_COALESCE_USECS_IRQ |

				     ETHTOOL_COALESCE_MAX_FRAMES_IRQ |

				     ETHTOOL_COALESCE_STATS_BLOCK_USECS |

				     ETHTOOL_COALESCE_USE_ADAPTIVE_RX,

	.get_link_ksettings	= bnxt_get_link_ksettings,

	.set_link_ksettings	= bnxt_set_link_ksettings,

	.get_pauseparam		= bnxt_get_pauseparam,

drivers/net/ethernet/cisco/enic/enic_ethtool.c

+4 −19
Original line number Diff line number Diff line
@@ -323,25 +323,6 @@ static int enic_coalesce_valid(struct enic *enic, 
	u32 rx_coalesce_usecs_low = min_t(u32, coalesce_usecs_max,

					  ec->rx_coalesce_usecs_low);



	if (ec->rx_max_coalesced_frames		||

	    ec->rx_coalesce_usecs_irq		||

	    ec->rx_max_coalesced_frames_irq	||

	    ec->tx_max_coalesced_frames		||

	    ec->tx_coalesce_usecs_irq		||

	    ec->tx_max_coalesced_frames_irq	||

	    ec->stats_block_coalesce_usecs	||

	    ec->use_adaptive_tx_coalesce	||

	    ec->pkt_rate_low			||

	    ec->rx_max_coalesced_frames_low	||

	    ec->tx_coalesce_usecs_low		||

	    ec->tx_max_coalesced_frames_low	||

	    ec->pkt_rate_high			||

	    ec->rx_max_coalesced_frames_high	||

	    ec->tx_coalesce_usecs_high		||

	    ec->tx_max_coalesced_frames_high	||

	    ec->rate_sample_interval)

		return -EINVAL;



	if ((vnic_dev_get_intr_mode(enic->vdev) != VNIC_DEV_INTR_MODE_MSIX) &&

	    ec->tx_coalesce_usecs)

		return -EINVAL;
@@ -635,6 +616,10 @@ static int enic_get_ts_info(struct net_device *netdev, 
}



static const struct ethtool_ops enic_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_USE_ADAPTIVE_RX |

				     ETHTOOL_COALESCE_RX_USECS_LOW |

				     ETHTOOL_COALESCE_RX_USECS_HIGH,

	.get_drvinfo = enic_get_drvinfo,

	.get_msglevel = enic_get_msglevel,

	.set_msglevel = enic_set_msglevel,

drivers/net/ethernet/hisilicon/hip04_eth.c

+2 −14
Original line number Diff line number Diff line
@@ -811,20 +811,6 @@ static int hip04_set_coalesce(struct net_device *netdev, 
{

	struct hip04_priv *priv = netdev_priv(netdev);



	/* Check not supported parameters  */

	if ((ec->rx_max_coalesced_frames) || (ec->rx_coalesce_usecs_irq) ||

	    (ec->rx_max_coalesced_frames_irq) || (ec->tx_coalesce_usecs_irq) ||

	    (ec->use_adaptive_rx_coalesce) || (ec->use_adaptive_tx_coalesce) ||

	    (ec->pkt_rate_low) || (ec->rx_coalesce_usecs_low) ||

	    (ec->rx_max_coalesced_frames_low) || (ec->tx_coalesce_usecs_high) ||

	    (ec->tx_max_coalesced_frames_low) || (ec->pkt_rate_high) ||

	    (ec->tx_coalesce_usecs_low) || (ec->rx_coalesce_usecs_high) ||

	    (ec->rx_max_coalesced_frames_high) || (ec->rx_coalesce_usecs) ||

	    (ec->tx_max_coalesced_frames_irq) ||

	    (ec->stats_block_coalesce_usecs) ||

	    (ec->tx_max_coalesced_frames_high) || (ec->rate_sample_interval))

		return -EOPNOTSUPP;



	if ((ec->tx_coalesce_usecs > HIP04_MAX_TX_COALESCE_USECS ||

	     ec->tx_coalesce_usecs < HIP04_MIN_TX_COALESCE_USECS) ||

	    (ec->tx_max_coalesced_frames > HIP04_MAX_TX_COALESCE_FRAMES ||
@@ -845,6 +831,8 @@ static void hip04_get_drvinfo(struct net_device *netdev, 
}



static const struct ethtool_ops hip04_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_TX_USECS |

				     ETHTOOL_COALESCE_TX_MAX_FRAMES,

	.get_coalesce		= hip04_get_coalesce,

	.set_coalesce		= hip04_set_coalesce,

	.get_drvinfo		= hip04_get_drvinfo,

drivers/net/ethernet/intel/e1000e/ethtool.c

+1 −0
Original line number Diff line number Diff line
@@ -2307,6 +2307,7 @@ static int e1000e_get_ts_info(struct net_device *netdev, 
}



static const struct ethtool_ops e1000_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS,

	.get_drvinfo		= e1000_get_drvinfo,

	.get_regs_len		= e1000_get_regs_len,

	.get_regs		= e1000_get_regs,

CRA Git | Maintained and supported by SUSTech CRA and CCSE