Unverified Commit 85096618 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6994 v2 net/mlx5e: Prevent deadlock while disabling aRFS 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/CIQEAYKLLLEBVZURCWXLEPNFXALZLLYZ/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9L5LB 
 
Link:https://gitee.com/openeuler/kernel/pulls/6994

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents ebba0c7c ffe67734

drivers/net/ethernet/mellanox/mlx5/core/en/fs.h

+1 −0
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ struct mlx5e_arfs_tables { 
	struct list_head               rules;

	int                            last_filter_id;

	struct workqueue_struct        *wq;

	unsigned long                  state;

};



int mlx5e_arfs_create_tables(struct mlx5e_priv *priv);

drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c

+15 −11
Original line number Diff line number Diff line
@@ -36,6 +36,10 @@ 
#include <linux/ipv6.h>

#include "en.h"



enum {

	MLX5E_ARFS_STATE_ENABLED,

};



struct arfs_tuple {

	__be16 etype;

	u8     ip_proto;
@@ -132,6 +136,8 @@ int mlx5e_arfs_enable(struct mlx5e_priv *priv) 
			return err;

		}

	}

	set_bit(MLX5E_ARFS_STATE_ENABLED, &priv->fs.arfs.state);



	return 0;

}
@@ -387,6 +393,8 @@ static void arfs_del_rules(struct mlx5e_priv *priv) 
	int j;



	HLIST_HEAD(del_list);

	clear_bit(MLX5E_ARFS_STATE_ENABLED, &priv->fs.arfs.state);



	spin_lock_bh(&priv->fs.arfs.arfs_lock);

	mlx5e_for_each_arfs_rule(rule, htmp, priv->fs.arfs.arfs_tables, i, j) {

		hlist_del_init(&rule->hlist);
@@ -552,17 +560,8 @@ static void arfs_handle_work(struct work_struct *work) 
	struct mlx5e_priv *priv = arfs_rule->priv;

	struct mlx5_flow_handle *rule;



	mutex_lock(&priv->state_lock);

	if (!test_bit(MLX5E_STATE_OPENED, &priv->state)) {

		spin_lock_bh(&priv->fs.arfs.arfs_lock);

		hlist_del(&arfs_rule->hlist);

		spin_unlock_bh(&priv->fs.arfs.arfs_lock);



		mutex_unlock(&priv->state_lock);

		kfree(arfs_rule);

		goto out;

	}

	mutex_unlock(&priv->state_lock);

	if (!test_bit(MLX5E_ARFS_STATE_ENABLED, &priv->fs.arfs.state))

		return;



	if (!arfs_rule->rule) {

		rule = arfs_add_rule(priv, arfs_rule);
@@ -673,6 +672,11 @@ int mlx5e_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb, 
		return -EPROTONOSUPPORT;



	spin_lock_bh(&arfs->arfs_lock);

	if (!test_bit(MLX5E_ARFS_STATE_ENABLED, &arfs->state)) {

		spin_unlock_bh(&arfs->arfs_lock);

		return -EPERM;

	}



	arfs_rule = arfs_find_rule(arfs_t, &fk);

	if (arfs_rule) {

		if (arfs_rule->rxq == rxq_index) {