Commit 4a80a183 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

ice: let core reject the unsupported coalescing parameters 



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

This driver correctly rejects all unsupported parameters.
As a side effect of these changes the info message about
the bad parameter will no longer be printed. We also
always reject the tx_coalesce_usecs_high param, even
if the target queue pair does not have a TX queue.
Error code changes from EINVAL to EOPNOTSUPP.

v2: allow adaptive TX
v3: adjust commit message for new error code and member name

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Acked-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 60d33964

drivers/net/ethernet/intel/ice/ice_ethtool.c

+3 −56
Original line number Diff line number Diff line
@@ -3452,12 +3452,6 @@ ice_set_rc_coalesce(enum ice_container_type c_type, struct ethtool_coalesce *ec, 


		break;

	case ICE_TX_CONTAINER:

		if (ec->tx_coalesce_usecs_high) {

			netdev_info(vsi->netdev, "setting %s-usecs-high is not supported\n",

				    c_type_str);

			return -EINVAL;

		}



		use_adaptive_coalesce = ec->use_adaptive_tx_coalesce;

		coalesce_usecs = ec->tx_coalesce_usecs;
@@ -3533,53 +3527,6 @@ ice_set_q_coalesce(struct ice_vsi *vsi, struct ethtool_coalesce *ec, int q_num) 
	return 0;

}



/**

 * ice_is_coalesce_param_invalid - check for unsupported coalesce parameters

 * @netdev: pointer to the netdev associated with this query

 * @ec: ethtool structure to fill with driver's coalesce settings

 *

 * Print netdev info if driver doesn't support one of the parameters

 * and return error. When any parameters will be implemented, remove only

 * this parameter from param array.

 */

static int

ice_is_coalesce_param_invalid(struct net_device *netdev,

			      struct ethtool_coalesce *ec)

{

	struct ice_ethtool_not_used {

		u32 value;

		const char *name;

	} param[] = {

		{ec->stats_block_coalesce_usecs, "stats-block-usecs"},

		{ec->rate_sample_interval, "sample-interval"},

		{ec->pkt_rate_low, "pkt-rate-low"},

		{ec->pkt_rate_high, "pkt-rate-high"},

		{ec->rx_max_coalesced_frames, "rx-frames"},

		{ec->rx_coalesce_usecs_irq, "rx-usecs-irq"},

		{ec->rx_max_coalesced_frames_irq, "rx-frames-irq"},

		{ec->tx_max_coalesced_frames, "tx-frames"},

		{ec->tx_coalesce_usecs_irq, "tx-usecs-irq"},

		{ec->tx_max_coalesced_frames_irq, "tx-frames-irq"},

		{ec->rx_coalesce_usecs_low, "rx-usecs-low"},

		{ec->rx_max_coalesced_frames_low, "rx-frames-low"},

		{ec->tx_coalesce_usecs_low, "tx-usecs-low"},

		{ec->tx_max_coalesced_frames_low, "tx-frames-low"},

		{ec->rx_max_coalesced_frames_high, "rx-frames-high"},

		{ec->tx_max_coalesced_frames_high, "tx-frames-high"}

	};

	int i;



	for (i = 0; i < ARRAY_SIZE(param); i++) {

		if (param[i].value) {

			netdev_info(netdev, "Setting %s not supported\n",

				    param[i].name);

			return -EINVAL;

		}

	}



	return 0;

}



/**

 * ice_print_if_odd_usecs - print message if user tries to set odd [tx|rx]-usecs

 * @netdev: netdev used for print
@@ -3620,9 +3567,6 @@ __ice_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *ec, 
	struct ice_netdev_priv *np = netdev_priv(netdev);

	struct ice_vsi *vsi = np->vsi;



	if (ice_is_coalesce_param_invalid(netdev, ec))

		return -EINVAL;



	if (q_num < 0) {

		struct ice_q_vector *q_vector = vsi->q_vectors[0];

		int v_idx;
@@ -3817,6 +3761,9 @@ ice_get_module_eeprom(struct net_device *netdev, 
}



static const struct ethtool_ops ice_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_USE_ADAPTIVE |

				     ETHTOOL_COALESCE_RX_USECS_HIGH,

	.get_link_ksettings	= ice_get_link_ksettings,

	.set_link_ksettings	= ice_set_link_ksettings,

	.get_drvinfo		= ice_get_drvinfo,