瀏覽代碼

net/mlx4_en: Free netdev resources under state lock

Make sure mlx4_en_free_resources is called under the netdev state lock.
This is needed since RCU dereference of XDP prog should be protected.

Fixes: 326fe02d1ed6 ("net/mlx4_en: protect ring->xdp_prog with rcu_read_lock")
Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
Reported-by: Sagi Grimberg <sagi@grimberg.me>
CC: Brenden Blanco <bblanco@plumgrid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Tariq Toukan 8 年之前
父節點
當前提交
b6e01232e2
共有 1 個文件被更改,包括 4 次插入1 次删除
  1. 4 1
      drivers/net/ethernet/mellanox/mlx4/en_netdev.c

+ 4 - 1
drivers/net/ethernet/mellanox/mlx4/en_netdev.c

@@ -129,6 +129,9 @@ static enum mlx4_net_trans_rule_id mlx4_ip_proto_to_trans_rule_id(u8 ip_proto)
 	}
 	}
 };
 };
 
 
+/* Must not acquire state_lock, as its corresponding work_sync
+ * is done under it.
+ */
 static void mlx4_en_filter_work(struct work_struct *work)
 static void mlx4_en_filter_work(struct work_struct *work)
 {
 {
 	struct mlx4_en_filter *filter = container_of(work,
 	struct mlx4_en_filter *filter = container_of(work,
@@ -2189,13 +2192,13 @@ void mlx4_en_destroy_netdev(struct net_device *dev)
 	mutex_lock(&mdev->state_lock);
 	mutex_lock(&mdev->state_lock);
 	mdev->pndev[priv->port] = NULL;
 	mdev->pndev[priv->port] = NULL;
 	mdev->upper[priv->port] = NULL;
 	mdev->upper[priv->port] = NULL;
-	mutex_unlock(&mdev->state_lock);
 
 
 #ifdef CONFIG_RFS_ACCEL
 #ifdef CONFIG_RFS_ACCEL
 	mlx4_en_cleanup_filters(priv);
 	mlx4_en_cleanup_filters(priv);
 #endif
 #endif
 
 
 	mlx4_en_free_resources(priv);
 	mlx4_en_free_resources(priv);
+	mutex_unlock(&mdev->state_lock);
 
 
 	kfree(priv->tx_ring);
 	kfree(priv->tx_ring);
 	kfree(priv->tx_cq);
 	kfree(priv->tx_cq);