i40evf: fix panic during MTU change
Subsystems (2)
PATCH v2 1/1 i40evf: fix panic during MTU change
Down was requesting queue disables, but then exited immediately without waiting for the queues to actually disable. This could allow any function called after i40evf_down to run immediately, including i40evf_up, and causes a memory leak.
Removing the whole reinit_locked function is the best way to go about this, and allows for the driver to handle the state changes by requesting reset from the periodic timer.
Also, add a couple WARN_ONs in slow path to help us recognize if we re-introduce this issue or missed any cases.
Signed-off-by Mitch Williams <[email protected]>
Signed-off-by Jesse Brandeburg <[email protected]>
--- drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 4 + drivers/net/ethernet/intel/i40evf/i40evf.h | 1 - drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 6 +- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 109 +++++++++------------ 4 files changed, 54 insertions(+), 66 deletions(-)
drivers/net/ethernet/intel/i40evf/i40e_txrx.c +4 -0
@@ -488,6 +488,8 @@ int i40evf_setup_tx_descriptors(struct i40e_ring *tx_ring)if (!dev)return -ENOMEM ; +/* warn if we are about to overwrite the pointer */ +WARN_ON (tx_ring->tx_bi); bi_size =sizeof (struct i40e_tx_buffer ) * tx_ring->count; tx_ring->tx_bi =kzalloc (bi_size,GFP_KERNEL );if (!tx_ring->tx_bi)
@@ -648,6 +650,8 @@ int i40evf_setup_rx_descriptors(struct i40e_ring *rx_ring)struct device *dev = rx_ring->dev;int bi_size; +/* warn if we are about to overwrite the pointer */ +WARN_ON (rx_ring->rx_bi); bi_size =sizeof (struct i40e_rx_buffer ) * rx_ring->count; rx_ring->rx_bi =kzalloc (bi_size,GFP_KERNEL );if (!rx_ring->rx_bi)
drivers/net/ethernet/intel/i40evf/i40evf.h +0 -1
@@ -264,7 +264,6 @@ extern const char i40evf_driver_version[];int i40evf_up (struct i40evf_adapter *adapter);void i40evf_down (struct i40evf_adapter *adapter); -void i40evf_reinit_locked (struct i40evf_adapter *adapter);void i40evf_reset (struct i40evf_adapter *adapter);void i40evf_set_ethtool_ops (struct net_device *netdev);void i40evf_update_stats (struct i40evf_adapter *adapter);
drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c +4 -2
@@ -267,8 +267,10 @@ static int i40evf_set_ringparam(struct net_device *netdev, adapter->tx_desc_count = new_tx_count; adapter->rx_desc_count = new_rx_count; -if (netif_running (netdev)) -i40evf_reinit_locked (adapter); +if (netif_running (netdev)) { + adapter->flags |=I40EVF_FLAG_RESET_NEEDED ; +schedule_work (&adapter->reset_task); + }return 0 ; }
drivers/net/ethernet/intel/i40evf/i40evf_main.c +46 -63
212 lines not on this page · raw message
Signature · 1 line
2.4.1