diff options
| author | Jiri Pirko | 2019-02-24 07:46:30 +0100 |
|---|---|---|
| committer | David S. Miller | 2019-02-25 05:25:29 +0100 |
| commit | c70b13275b8a826e561f4ac6a6940a044e65a809 (patch) | |
| tree | cd8edb50f6c1749d3dcd8b7d36b6e2f318501802 | |
| parent | mlxsw: spectrum_acl: Don't take rtnl lock during vregion_rehash_intrvl_set() (diff) | |
| download | kernel-qcow2-linux-c70b13275b8a826e561f4ac6a6940a044e65a809.tar.gz kernel-qcow2-linux-c70b13275b8a826e561f4ac6a6940a044e65a809.tar.xz kernel-qcow2-linux-c70b13275b8a826e561f4ac6a6940a044e65a809.zip | |
mlxsw: spectrum_acl: Remove RTNL lock assertions from ERP code
No longer require RTNL lock in this code. Newly introduced mutexes take
care of guarding objagg and bloom filter. There is no need to guard
gen_pool_alloc()/gen_pool_free() as they are fine to be called lockless.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c index d6961dd0c556..c1a9cc9a3292 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c @@ -1007,11 +1007,6 @@ mlxsw_sp_acl_erp_mask_get(struct mlxsw_sp_acl_atcam_region *aregion, struct mlxsw_sp_acl_erp_key key; struct objagg_obj *objagg_obj; - /* eRPs are allocated from a shared resource, but currently all - * allocations are done under RTNL. - */ - ASSERT_RTNL(); - memcpy(key.mask, mask, MLXSW_REG_PTCEX_FLEX_KEY_BLOCKS_LEN); key.ctcam = ctcam; mutex_lock(&erp_table->objagg_lock); @@ -1042,7 +1037,6 @@ int mlxsw_sp_acl_erp_bf_insert(struct mlxsw_sp *mlxsw_sp, const struct mlxsw_sp_acl_erp *erp = objagg_obj_root_priv(objagg_obj); unsigned int erp_bank; - ASSERT_RTNL(); if (!mlxsw_sp_acl_erp_table_is_used(erp->erp_table)) return 0; |