Commit d613bd64 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

Merge branch 'mlx5_mr_cache' into rdma.git for-next 

Leon Romanovsky says:

====================
This series fixes various corner cases in the mlx5_ib MR cache
implementation, see specific commit messages for more information.
====================

Based on the mlx5-next branch at
 git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
Due to dependencies

* branch 'mlx5_mr-cache':
  RDMA/mlx5: Allow MRs to be created in the cache synchronously
  RDMA/mlx5: Revise how the hysteresis scheme works for cache filling
  RDMA/mlx5: Fix locking in MR cache work queue
  RDMA/mlx5: Lock access to ent->available_mrs/limit when doing queue_work
  RDMA/mlx5: Fix MR cache size and limit debugfs
  RDMA/mlx5: Always remove MRs from the cache before destroying them
  RDMA/mlx5: Simplify how the MR cache bucket is located
  RDMA/mlx5: Rename the tracking variables for the MR cache
  RDMA/mlx5: Replace spinlock protected write with atomic var
  {IB,net}/mlx5: Move asynchronous mkey creation to mlx5_ib
  {IB,net}/mlx5: Assign mkey variant in mlx5_ib only
  {IB,net}/mlx5: Setup mkey variant before mr create command invocation
parents a4f994a0 aad719dc

drivers/infiniband/hw/mlx5/main.c

+1 −0
Original line number Diff line number Diff line
@@ -6389,6 +6389,7 @@ static int mlx5_ib_stage_init_init(struct mlx5_ib_dev *dev) 
	spin_lock_init(&dev->reset_flow_resource_lock);

	xa_init(&dev->odp_mkeys);

	xa_init(&dev->sig_mrs);

	atomic_set(&dev->mkey_var, 0);



	spin_lock_init(&dev->dm.lock);

	dev->dm.dev = mdev;

drivers/infiniband/hw/mlx5/mlx5_ib.h

+25 −10
Original line number Diff line number Diff line
@@ -616,8 +616,8 @@ struct mlx5_ib_mr { 
	struct ib_umem	       *umem;

	struct mlx5_shared_mr_info	*smr_info;

	struct list_head	list;

	int			order;

	bool			allocated_from_cache;

	unsigned int		order;

	struct mlx5_cache_ent  *cache_ent;

	int			npages;

	struct mlx5_ib_dev     *dev;

	u32 out[MLX5_ST_SZ_DW(create_mkey_out)];
@@ -699,22 +699,34 @@ struct mlx5_cache_ent { 
	u32			access_mode;

	u32			page;



	u32			size;

	u32                     cur;

	u32                     miss;

	u8 disabled:1;

	u8 fill_to_high_water:1;



	/*

	 * - available_mrs is the length of list head, ie the number of MRs

	 *   available for immediate allocation.

	 * - total_mrs is available_mrs plus all in use MRs that could be

	 *   returned to the cache.

	 * - limit is the low water mark for available_mrs, 2* limit is the

	 *   upper water mark.

	 * - pending is the number of MRs currently being created

	 */

	u32 total_mrs;

	u32 available_mrs;

	u32 limit;

	u32 pending;



	/* Statistics */

	u32                     miss;



	struct mlx5_ib_dev     *dev;

	struct work_struct	work;

	struct delayed_work	dwork;

	int			pending;

	struct completion	compl;

};



struct mlx5_mr_cache {

	struct workqueue_struct *wq;

	struct mlx5_cache_ent	ent[MAX_MR_CACHE_ENTRIES];

	int			stopped;

	struct dentry		*root;

	unsigned long		last_add;

};
@@ -986,14 +998,16 @@ struct mlx5_ib_dev { 
	 */

	struct mutex			cap_mask_mutex;

	u8				ib_active:1;

	u8				fill_delay:1;

	u8				is_rep:1;

	u8				lag_active:1;

	u8				wc_support:1;

	u8				fill_delay;

	struct umr_common		umrc;

	/* sync used page count stats

	 */

	struct mlx5_ib_resources	devr;



	atomic_t			mkey_var;

	struct mlx5_mr_cache		cache;

	struct timer_list		delay_timer;

	/* Prevents soft lock on massive reg MRs */
@@ -1263,7 +1277,8 @@ int mlx5_ib_get_cqe_size(struct ib_cq *ibcq); 
int mlx5_mr_cache_init(struct mlx5_ib_dev *dev);

int mlx5_mr_cache_cleanup(struct mlx5_ib_dev *dev);



struct mlx5_ib_mr *mlx5_mr_cache_alloc(struct mlx5_ib_dev *dev, int entry);

struct mlx5_ib_mr *mlx5_mr_cache_alloc(struct mlx5_ib_dev *dev,

				       unsigned int entry);

void mlx5_mr_cache_free(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr);

int mlx5_mr_cache_invalidate(struct mlx5_ib_mr *mr);

drivers/infiniband/hw/mlx5/mr.c

+387 −272

File changed.

Preview size limit exceeded, changes collapsed.

drivers/infiniband/hw/mlx5/odp.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static void dma_fence_odp_mr(struct mlx5_ib_mr *mr) 
	odp->private = NULL;

	mutex_unlock(&odp->umem_mutex);



	if (!mr->allocated_from_cache) {

	if (!mr->cache_ent) {

		mlx5_core_destroy_mkey(mr->dev->mdev, &mr->mmkey);

		WARN_ON(mr->descs);

	}

drivers/net/ethernet/mellanox/mlx5/core/lib/crypto.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ int mlx5_create_encryption_key(struct mlx5_core_dev *mdev, 


	MLX5_SET(encryption_key_obj, obj, key_size, general_obj_key_size);

	MLX5_SET(encryption_key_obj, obj, key_type,

		 MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_TYPE_DEK);

		 MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_TYPE_TLS);

	MLX5_SET(general_obj_in_cmd_hdr, in, opcode,

		 MLX5_CMD_OP_CREATE_GENERAL_OBJECT);

	MLX5_SET(general_obj_in_cmd_hdr, in, obj_type,

CRA Git | Maintained and supported by SUSTech CRA and CCSE