History

RDMA/mlx5: Delete struct mlx5_priv->mkey_table

No users are left, delete it.

Jason Gunthorpe committed 7 years ago

Commit 74bddb31 parent 806b1014 files · +1 −44Browse files

Showing the changes to drivers (3 of 4 files). Show all

Unified · Split

3 files
  1. drivers/infiniband/hw/mlx5/mr.c +0 −9
  2. drivers/net/ethernet/mellanox/mlx5/core/main.c +0 −4
  3. drivers/net/ethernet/mellanox/mlx5/core/mr.c +1 −27
drivers/infiniband/hw/mlx5/mr.c+0−9
@@ -90,8 +90,6 @@ static void reg_mr_callback(int status, struct mlx5_async_work *context) · 89 unmodified lines
90 struct mlx5_cache_ent *ent = &cache->ent[c];90 struct mlx5_cache_ent *ent = &cache->ent[c];
91 u8 key;91 u8 key;
92 unsigned long flags;92 unsigned long flags;
93 struct xarray *mkeys = &dev->mdev->priv.mkey_table;
94 int err;
95 93
96 spin_lock_irqsave(&ent->lock, flags);94 spin_lock_irqsave(&ent->lock, flags);
97 ent->pending--;95 ent->pending--;
@@ -118,13 +116,6 @@ static void reg_mr_callback(int status, struct mlx5_async_work *context) · 20 unmodified lines
118 ent->size++;116 ent->size++;
119 spin_unlock_irqrestore(&ent->lock, flags);117 spin_unlock_irqrestore(&ent->lock, flags);
120 118
121 xa_lock_irqsave(mkeys, flags);
122 err = xa_err(__xa_store(mkeys, mlx5_base_mkey(mr->mmkey.key),
123 &mr->mmkey, GFP_ATOMIC));
124 xa_unlock_irqrestore(mkeys, flags);
125 if (err)
126 pr_err("Error inserting to mkey tree. 0x%x\n", -err);
127
128 if (!completion_done(&ent->compl))119 if (!completion_done(&ent->compl))
129 complete(&ent->compl);120 complete(&ent->compl);
130}121}
drivers/net/ethernet/mellanox/mlx5/core/main.c+0−4
@@ -837,8 +837,6 @@ static int mlx5_init_once(struct mlx5_core_dev *dev) · 836 unmodified lines
837 837
838 mlx5_init_qp_table(dev);838 mlx5_init_qp_table(dev);
839 839
840 mlx5_init_mkey_table(dev);
841
842 mlx5_init_reserved_gids(dev);840 mlx5_init_reserved_gids(dev);
843 841
844 mlx5_init_clock(dev);842 mlx5_init_clock(dev);
@@ -896,7 +894,6 @@ err_rl_cleanup: · 51 unmodified lines
896err_tables_cleanup:894err_tables_cleanup:
897 mlx5_geneve_destroy(dev->geneve);895 mlx5_geneve_destroy(dev->geneve);
898 mlx5_vxlan_destroy(dev->vxlan);896 mlx5_vxlan_destroy(dev->vxlan);
899 mlx5_cleanup_mkey_table(dev);
900 mlx5_cleanup_qp_table(dev);897 mlx5_cleanup_qp_table(dev);
901 mlx5_cq_debugfs_cleanup(dev);898 mlx5_cq_debugfs_cleanup(dev);
902 mlx5_events_cleanup(dev);899 mlx5_events_cleanup(dev);
@@ -924,7 +921,6 @@ static void mlx5_cleanup_once(struct mlx5_core_dev *dev) · 21 unmodified lines
924 mlx5_vxlan_destroy(dev->vxlan);921 mlx5_vxlan_destroy(dev->vxlan);
925 mlx5_cleanup_clock(dev);922 mlx5_cleanup_clock(dev);
926 mlx5_cleanup_reserved_gids(dev);923 mlx5_cleanup_reserved_gids(dev);
927 mlx5_cleanup_mkey_table(dev);
928 mlx5_cleanup_qp_table(dev);924 mlx5_cleanup_qp_table(dev);
929 mlx5_cq_debugfs_cleanup(dev);925 mlx5_cq_debugfs_cleanup(dev);
930 mlx5_events_cleanup(dev);926 mlx5_events_cleanup(dev);
drivers/net/ethernet/mellanox/mlx5/core/mr.c+1−27
@@ -36,16 +36,6 @@ · 35 unmodified lines
36#include <linux/mlx5/cmd.h>36#include <linux/mlx5/cmd.h>
37#include "mlx5_core.h"37#include "mlx5_core.h"
38 38
39void mlx5_init_mkey_table(struct mlx5_core_dev *dev)
40{
41 xa_init_flags(&dev->priv.mkey_table, XA_FLAGS_LOCK_IRQ);
42}
43
44void mlx5_cleanup_mkey_table(struct mlx5_core_dev *dev)
45{
46 WARN_ON(!xa_empty(&dev->priv.mkey_table));
47}
48
49int mlx5_core_create_mkey_cb(struct mlx5_core_dev *dev,39int mlx5_core_create_mkey_cb(struct mlx5_core_dev *dev,
50 struct mlx5_core_mkey *mkey,40 struct mlx5_core_mkey *mkey,
51 struct mlx5_async_ctx *async_ctx, u32 *in,41 struct mlx5_async_ctx *async_ctx, u32 *in,
@@ -54,7 +44,6 @@ int mlx5_core_create_mkey_cb(struct mlx5_core_dev *dev, · 2 unmodified lines
54 struct mlx5_async_work *context)44 struct mlx5_async_work *context)
55{45{
56 u32 lout[MLX5_ST_SZ_DW(create_mkey_out)] = {0};46 u32 lout[MLX5_ST_SZ_DW(create_mkey_out)] = {0};
57 struct xarray *mkeys = &dev->priv.mkey_table;
58 u32 mkey_index;47 u32 mkey_index;
59 void *mkc;48 void *mkc;
60 int err;49 int err;
@@ -84,16 +73,7 @@ int mlx5_core_create_mkey_cb(struct mlx5_core_dev *dev, · 23 unmodified lines
84 73
85 mlx5_core_dbg(dev, "out 0x%x, key 0x%x, mkey 0x%x\n",74 mlx5_core_dbg(dev, "out 0x%x, key 0x%x, mkey 0x%x\n",
86 mkey_index, key, mkey->key);75 mkey_index, key, mkey->key);
87 76 return 0;
88 err = xa_err(xa_store_irq(mkeys, mlx5_base_mkey(mkey->key), mkey,
89 GFP_KERNEL));
90 if (err) {
91 mlx5_core_warn(dev, "failed xarray insert of mkey 0x%x, %d\n",
92 mlx5_base_mkey(mkey->key), err);
93 mlx5_core_destroy_mkey(dev, mkey);
94 }
95
96 return err;
97}77}
98EXPORT_SYMBOL(mlx5_core_create_mkey_cb);78EXPORT_SYMBOL(mlx5_core_create_mkey_cb);
99 79
@@ -111,12 +91,6 @@ int mlx5_core_destroy_mkey(struct mlx5_core_dev *dev, · 11 unmodified lines
111{91{
112 u32 out[MLX5_ST_SZ_DW(destroy_mkey_out)] = {0};92 u32 out[MLX5_ST_SZ_DW(destroy_mkey_out)] = {0};
113 u32 in[MLX5_ST_SZ_DW(destroy_mkey_in)] = {0};93 u32 in[MLX5_ST_SZ_DW(destroy_mkey_in)] = {0};
114 struct xarray *mkeys = &dev->priv.mkey_table;
115 unsigned long flags;
116
117 xa_lock_irqsave(mkeys, flags);
118 __xa_erase(mkeys, mlx5_base_mkey(mkey->key));
119 xa_unlock_irqrestore(mkeys, flags);
120 94
121 MLX5_SET(destroy_mkey_in, in, opcode, MLX5_CMD_OP_DESTROY_MKEY);95 MLX5_SET(destroy_mkey_in, in, opcode, MLX5_CMD_OP_DESTROY_MKEY);
122 MLX5_SET(destroy_mkey_in, in, mkey_index, mlx5_mkey_to_idx(mkey->key));96 MLX5_SET(destroy_mkey_in, in, mkey_index, mlx5_mkey_to_idx(mkey->key));

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t