]>
Commit | Line | Data |
---|---|---|
a9fba688 SL |
1 | From 5f498e77dc7a7c5d2bc11bdbd7ba050d8718876e Mon Sep 17 00:00:00 2001 |
2 | From: Yuval Avnery <yuvalav@mellanox.com> | |
3 | Date: Mon, 11 Mar 2019 06:18:24 +0200 | |
4 | Subject: net/mlx5e: Add a lock on tir list | |
5 | ||
6 | [ Upstream commit 80a2a9026b24c6bd34b8d58256973e22270bedec ] | |
7 | ||
8 | Refresh tirs is looping over a global list of tirs while netdevs are | |
9 | adding and removing tirs from that list. That is why a lock is | |
10 | required. | |
11 | ||
12 | Fixes: 724b2aa15126 ("net/mlx5e: TIRs management refactoring") | |
13 | Signed-off-by: Yuval Avnery <yuvalav@mellanox.com> | |
14 | Signed-off-by: Saeed Mahameed <saeedm@mellanox.com> | |
15 | Signed-off-by: Sasha Levin <sashal@kernel.org> | |
16 | --- | |
17 | drivers/net/ethernet/mellanox/mlx5/core/en_common.c | 7 +++++++ | |
18 | include/linux/mlx5/driver.h | 2 ++ | |
19 | 2 files changed, 9 insertions(+) | |
20 | ||
21 | diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_common.c b/drivers/net/ethernet/mellanox/mlx5/core/en_common.c | |
22 | index 1e28866e3924..124e4567a4ee 100644 | |
23 | --- a/drivers/net/ethernet/mellanox/mlx5/core/en_common.c | |
24 | +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_common.c | |
25 | @@ -45,7 +45,9 @@ int mlx5e_create_tir(struct mlx5_core_dev *mdev, | |
26 | if (err) | |
27 | return err; | |
28 | ||
29 | + mutex_lock(&mdev->mlx5e_res.td.list_lock); | |
30 | list_add(&tir->list, &mdev->mlx5e_res.td.tirs_list); | |
31 | + mutex_unlock(&mdev->mlx5e_res.td.list_lock); | |
32 | ||
33 | return 0; | |
34 | } | |
35 | @@ -53,8 +55,10 @@ int mlx5e_create_tir(struct mlx5_core_dev *mdev, | |
36 | void mlx5e_destroy_tir(struct mlx5_core_dev *mdev, | |
37 | struct mlx5e_tir *tir) | |
38 | { | |
39 | + mutex_lock(&mdev->mlx5e_res.td.list_lock); | |
40 | mlx5_core_destroy_tir(mdev, tir->tirn); | |
41 | list_del(&tir->list); | |
42 | + mutex_unlock(&mdev->mlx5e_res.td.list_lock); | |
43 | } | |
44 | ||
45 | static int mlx5e_create_mkey(struct mlx5_core_dev *mdev, u32 pdn, | |
46 | @@ -114,6 +118,7 @@ int mlx5e_create_mdev_resources(struct mlx5_core_dev *mdev) | |
47 | } | |
48 | ||
49 | INIT_LIST_HEAD(&mdev->mlx5e_res.td.tirs_list); | |
50 | + mutex_init(&mdev->mlx5e_res.td.list_lock); | |
51 | ||
52 | return 0; | |
53 | ||
54 | @@ -159,6 +164,7 @@ int mlx5e_refresh_tirs(struct mlx5e_priv *priv, bool enable_uc_lb) | |
55 | ||
56 | MLX5_SET(modify_tir_in, in, bitmask.self_lb_en, 1); | |
57 | ||
58 | + mutex_lock(&mdev->mlx5e_res.td.list_lock); | |
59 | list_for_each_entry(tir, &mdev->mlx5e_res.td.tirs_list, list) { | |
60 | tirn = tir->tirn; | |
61 | err = mlx5_core_modify_tir(mdev, tirn, in, inlen); | |
62 | @@ -170,6 +176,7 @@ int mlx5e_refresh_tirs(struct mlx5e_priv *priv, bool enable_uc_lb) | |
63 | kvfree(in); | |
64 | if (err) | |
65 | netdev_err(priv->netdev, "refresh tir(0x%x) failed, %d\n", tirn, err); | |
66 | + mutex_unlock(&mdev->mlx5e_res.td.list_lock); | |
67 | ||
68 | return err; | |
69 | } | |
70 | diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h | |
71 | index bbcfe2e5fd91..e8b92dee5a72 100644 | |
72 | --- a/include/linux/mlx5/driver.h | |
73 | +++ b/include/linux/mlx5/driver.h | |
74 | @@ -776,6 +776,8 @@ struct mlx5_pagefault { | |
75 | }; | |
76 | ||
77 | struct mlx5_td { | |
78 | + /* protects tirs list changes while tirs refresh */ | |
79 | + struct mutex list_lock; | |
80 | struct list_head tirs_list; | |
81 | u32 tdn; | |
82 | }; | |
83 | -- | |
84 | 2.19.1 | |
85 |