Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eece4d2a authored by Sameeh Jubran's avatar Sameeh Jubran Committed by David S. Miller
Browse files

net: ena: add ethtool function for changing io queue sizes 



Implement the set_ringparam() function of the ethtool interface
to enable the changing of io queue sizes.

Signed-off-by: default avatarArthur Kiyanovski <akiyano@amazon.com>
Signed-off-by: default avatarSameeh Jubran <sameehj@amazon.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 13ca32a6

drivers/net/ethernet/amazon/ena/ena_ethtool.c

+22 −0
Original line number Diff line number Diff line
@@ -493,6 +493,27 @@ static void ena_get_ringparam(struct net_device *netdev, 
	ring->rx_pending = adapter->rx_ring[0].ring_size;

}



static int ena_set_ringparam(struct net_device *netdev,

			     struct ethtool_ringparam *ring)

{

	struct ena_adapter *adapter = netdev_priv(netdev);

	u32 new_tx_size, new_rx_size;



	new_tx_size = ring->tx_pending < ENA_MIN_RING_SIZE ?

			ENA_MIN_RING_SIZE : ring->tx_pending;

	new_tx_size = rounddown_pow_of_two(new_tx_size);



	new_rx_size = ring->rx_pending < ENA_MIN_RING_SIZE ?

			ENA_MIN_RING_SIZE : ring->rx_pending;

	new_rx_size = rounddown_pow_of_two(new_rx_size);



	if (new_tx_size == adapter->requested_tx_ring_size &&

	    new_rx_size == adapter->requested_rx_ring_size)

		return 0;



	return ena_update_queue_sizes(adapter, new_tx_size, new_rx_size);

}



static u32 ena_flow_hash_to_flow_type(u16 hash_fields)

{

	u32 data = 0;
@@ -858,6 +879,7 @@ static const struct ethtool_ops ena_ethtool_ops = { 
	.get_coalesce		= ena_get_coalesce,

	.set_coalesce		= ena_set_coalesce,

	.get_ringparam		= ena_get_ringparam,

	.set_ringparam		= ena_set_ringparam,

	.get_sset_count         = ena_get_sset_count,

	.get_strings		= ena_get_strings,

	.get_ethtool_stats      = ena_get_ethtool_stats,

drivers/net/ethernet/amazon/ena/ena_netdev.c

+14 −0
Original line number Diff line number Diff line
@@ -2031,6 +2031,20 @@ static int ena_close(struct net_device *netdev) 
	return 0;

}



int ena_update_queue_sizes(struct ena_adapter *adapter,

			   u32 new_tx_size,

			   u32 new_rx_size)

{

	bool dev_up;



	dev_up = test_bit(ENA_FLAG_DEV_UP, &adapter->flags);

	ena_close(adapter->netdev);

	adapter->requested_tx_ring_size = new_tx_size;

	adapter->requested_rx_ring_size = new_rx_size;

	ena_init_io_rings(adapter);

	return dev_up ? ena_up(adapter) : 0;

}



static void ena_tx_csum(struct ena_com_tx_ctx *ena_tx_ctx, struct sk_buff *skb)

{

	u32 mss = skb_shinfo(skb)->gso_size;

drivers/net/ethernet/amazon/ena/ena_netdev.h

+4 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ 
#define ENA_DEFAULT_RING_SIZE	(1024)

#define ENA_MIN_RING_SIZE	(256)





#define ENA_TX_WAKEUP_THRESH		(MAX_SKB_FRAGS + 2)

#define ENA_DEFAULT_RX_COPYBREAK	(256 - NET_IP_ALIGN)
@@ -389,6 +388,10 @@ void ena_dump_stats_to_dmesg(struct ena_adapter *adapter); 


void ena_dump_stats_to_buf(struct ena_adapter *adapter, u8 *buf);



int ena_update_queue_sizes(struct ena_adapter *adapter,

			   u32 new_tx_size,

			   u32 new_rx_size);



int ena_get_sset_count(struct net_device *netdev, int sset);



#endif /* !(ENA_H) */