Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bcdb17a authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Roland Dreier
Browse files

IB/mlx5: Keep mlx5 MRs in a radix tree under device 



This will be useful when processing signature errors on a specific
key.  The mlx5 driver will lookup the matching mlx5 memory region
structure and mark it as dirty (contains signature errors).

Signed-off-by: default avatarSagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 2ac45934

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

+1 −0
Original line number Diff line number Diff line
@@ -446,6 +446,7 @@ int mlx5_dev_init(struct mlx5_core_dev *dev, struct pci_dev *pdev) 
	mlx5_init_cq_table(dev);

	mlx5_init_qp_table(dev);

	mlx5_init_srq_table(dev);

	mlx5_init_mr_table(dev);



	return 0;

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

+24 −0
Original line number Diff line number Diff line
@@ -36,11 +36,24 @@ 
#include <linux/mlx5/cmd.h>

#include "mlx5_core.h"



void mlx5_init_mr_table(struct mlx5_core_dev *dev)

{

	struct mlx5_mr_table *table = &dev->priv.mr_table;



	rwlock_init(&table->lock);

	INIT_RADIX_TREE(&table->tree, GFP_ATOMIC);

}



void mlx5_cleanup_mr_table(struct mlx5_core_dev *dev)

{

}



int mlx5_core_create_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr,

			  struct mlx5_create_mkey_mbox_in *in, int inlen,

			  mlx5_cmd_cbk_t callback, void *context,

			  struct mlx5_create_mkey_mbox_out *out)

{

	struct mlx5_mr_table *table = &dev->priv.mr_table;

	struct mlx5_create_mkey_mbox_out lout;

	int err;

	u8 key;
@@ -73,14 +86,21 @@ int mlx5_core_create_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr, 
	mlx5_core_dbg(dev, "out 0x%x, key 0x%x, mkey 0x%x\n",

		      be32_to_cpu(lout.mkey), key, mr->key);



	/* connect to MR tree */

	write_lock_irq(&table->lock);

	err = radix_tree_insert(&table->tree, mlx5_base_mkey(mr->key), mr);

	write_unlock_irq(&table->lock);



	return err;

}

EXPORT_SYMBOL(mlx5_core_create_mkey);



int mlx5_core_destroy_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr)

{

	struct mlx5_mr_table *table = &dev->priv.mr_table;

	struct mlx5_destroy_mkey_mbox_in in;

	struct mlx5_destroy_mkey_mbox_out out;

	unsigned long flags;

	int err;



	memset(&in, 0, sizeof(in));
@@ -95,6 +115,10 @@ int mlx5_core_destroy_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr) 
	if (out.hdr.status)

		return mlx5_cmd_status_to_err(&out.hdr);



	write_lock_irqsave(&table->lock, flags);

	radix_tree_delete(&table->tree, mlx5_base_mkey(mr->key));

	write_unlock_irqrestore(&table->lock, flags);



	return err;

}

EXPORT_SYMBOL(mlx5_core_destroy_mkey);

include/linux/mlx5/driver.h

+18 −0
Original line number Diff line number Diff line
@@ -491,6 +491,13 @@ struct mlx5_srq_table { 
	struct radix_tree_root	tree;

};



struct mlx5_mr_table {

	/* protect radix tree

	 */

	rwlock_t		lock;

	struct radix_tree_root	tree;

};



struct mlx5_priv {

	char			name[MLX5_MAX_NAME_LEN];

	struct mlx5_eq_table	eq_table;
@@ -520,6 +527,10 @@ struct mlx5_priv { 
	struct mlx5_cq_table	cq_table;

	/* end: cq staff */



	/* start: mr staff */

	struct mlx5_mr_table	mr_table;

	/* end: mr staff */



	/* start: alloc staff */

	struct mutex            pgdir_mutex;

	struct list_head        pgdir_list;
@@ -667,6 +678,11 @@ static inline void mlx5_vfree(const void *addr) 
		kfree(addr);

}



static inline u32 mlx5_base_mkey(const u32 key)

{

	return key & 0xffffff00u;

}



int mlx5_dev_init(struct mlx5_core_dev *dev, struct pci_dev *pdev);

void mlx5_dev_cleanup(struct mlx5_core_dev *dev);

int mlx5_cmd_init(struct mlx5_core_dev *dev);
@@ -701,6 +717,8 @@ int mlx5_core_query_srq(struct mlx5_core_dev *dev, struct mlx5_core_srq *srq, 
			struct mlx5_query_srq_mbox_out *out);

int mlx5_core_arm_srq(struct mlx5_core_dev *dev, struct mlx5_core_srq *srq,

		      u16 lwm, int is_srq);

void mlx5_init_mr_table(struct mlx5_core_dev *dev);

void mlx5_cleanup_mr_table(struct mlx5_core_dev *dev);

int mlx5_core_create_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr,

			  struct mlx5_create_mkey_mbox_in *in, int inlen,

			  mlx5_cmd_cbk_t callback, void *context,