iavf: Disallow changing rx/tx-frames and rx/tx-frames-irq

Remove from supported_coalesce_params ETHTOOL_COALESCE_MAX_FRAMES and ETHTOOL_COALESCE_MAX_FRAMES_IRQ. As tx-frames-irq allowed user to change budget for iavf_clean_tx_irq, remove work_limit and use define for budget. Without this patch there would be possibility to change rx/tx-frames and rx/tx-frames-irq, which for rx/tx-frames did nothing, while for rx/tx-frames-irq it changed rx/tx-frames and only changed budget for cleaning NAPI poll.

Przemyslaw Patynowski committed 4 years ago

Commit 4635fd31 parent 968996c4 files · +1 −13Browse files

Unified · Split

4 files

drivers/net/ethernet/intel/iavf/iavf.h +0 −1
drivers/net/ethernet/intel/iavf/iavf_ethtool.c +0 −10
drivers/net/ethernet/intel/iavf/iavf_main.c +0 −1
drivers/net/ethernet/intel/iavf/iavf_txrx.c +1 −1

drivers/net/ethernet/intel/iavf/iavf.h+0−1

@@ -64,7 +64,6 @@ struct iavf_vsi { · 63 unmodified lines
64	u16 id;	64	u16 id;
65	DECLARE_BITMAP(state, __IAVF_VSI_STATE_SIZE__);	65	DECLARE_BITMAP(state, __IAVF_VSI_STATE_SIZE__);
66	int base_vector;	66	int base_vector;
67	u16 work_limit;
68	u16 qs_handle;	67	u16 qs_handle;
69	void priv; / client driver data reference. */	68	void priv; / client driver data reference. */
70	};	69	};

drivers/net/ethernet/intel/iavf/iavf_ethtool.c+0−10

 			       struct ethtool_coalesce *ec, int queue)
 {
 	struct iavf_adapter *adapter = netdev_priv(netdev);
-	struct iavf_vsi *vsi = &adapter->vsi;
 	struct iavf_ring *rx_ring, *tx_ring;
-	ec->tx_max_coalesced_frames = vsi->work_limit;
-	ec->rx_max_coalesced_frames = vsi->work_limit;
 	/* Rx and Tx usecs per queue value. If user doesn't specify the
 	 * queue, return queue 0's value to represent.
 	 */
 			       struct ethtool_coalesce *ec, int queue)
 {
 	struct iavf_adapter *adapter = netdev_priv(netdev);
-	struct iavf_vsi *vsi = &adapter->vsi;
 	int i;
-	if (ec->tx_max_coalesced_frames_irq || ec->rx_max_coalesced_frames_irq)
-		vsi->work_limit = ec->tx_max_coalesced_frames_irq;
 	if (ec->rx_coalesce_usecs == 0) {
 		if (ec->use_adaptive_rx_coalesce)
 			netif_info(adapter, drv, netdev, "rx-usecs=0, need to disable adaptive-rx for a complete disable\n");
 static const struct ethtool_ops iavf_ethtool_ops = {
 	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |
-				     ETHTOOL_COALESCE_MAX_FRAMES |
-				     ETHTOOL_COALESCE_MAX_FRAMES_IRQ |
 				     ETHTOOL_COALESCE_USE_ADAPTIVE,
 	.get_drvinfo		= iavf_get_drvinfo,
 	.get_link		= ethtool_op_get_link,

drivers/net/ethernet/intel/iavf/iavf_main.c+0−1

@@ -2240,7 +2240,6 @@ int iavf_parse_vf_resource_msg(struct iavf_adapter *adapter) · 2239 unmodified lines
2240		2240
2241	adapter->vsi.back = adapter;	2241	adapter->vsi.back = adapter;
2242	adapter->vsi.base_vector = 1;	2242	adapter->vsi.base_vector = 1;
2243	adapter->vsi.work_limit = IAVF_DEFAULT_IRQ_WORK;
2244	vsi->netdev = adapter->netdev;	2243	vsi->netdev = adapter->netdev;
2245	vsi->qs_handle = adapter->vsi_res->qset_handle;	2244	vsi->qs_handle = adapter->vsi_res->qset_handle;
2246	if (adapter->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_RSS_PF) {	2245	if (adapter->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_RSS_PF) {

drivers/net/ethernet/intel/iavf/iavf_txrx.c+1−1

@@ -194,7 +194,7 @@ static bool iavf_clean_tx_irq(struct iavf_vsi *vsi, · 193 unmodified lines
194	struct iavf_tx_buffer *tx_buf;	194	struct iavf_tx_buffer *tx_buf;
195	struct iavf_tx_desc *tx_desc;	195	struct iavf_tx_desc *tx_desc;
196	unsigned int total_bytes = 0, total_packets = 0;	196	unsigned int total_bytes = 0, total_packets = 0;
197	unsigned int budget = vsi->work_limit;	197	unsigned int budget = IAVF_DEFAULT_IRQ_WORK;
198		198
199	tx_buf = &tx_ring->tx_bi[i];	199	tx_buf = &tx_ring->tx_bi[i];
200	tx_desc = IAVF_TX_DESC(tx_ring, i);	200	tx_desc = IAVF_TX_DESC(tx_ring, i);

iavf: Disallow changing rx/tx-frames and rx/tx-frames-irq

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code