X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fmlx5%2Fmlx5_mr.h;h=4a7fab6df2b85df0670c2cdfa3aacf80ab71f879;hb=cb99500de915040339f294b6ad2fc8edb4085b19;hp=89e89b7967593eb83a3a981098948f52524c0fa2;hpb=ab3cffcfc2b6d7612daa2e7048459e25650f56fc;p=dpdk.git

diff --git a/drivers/net/mlx5/mlx5_mr.h b/drivers/net/mlx5/mlx5_mr.h
index 89e89b7967..4a7fab6df2 100644
--- a/drivers/net/mlx5/mlx5_mr.h
+++ b/drivers/net/mlx5/mlx5_mr.h
@@ -10,114 +10,19 @@
 #include <stdint.h>
 #include <sys/queue.h>
 
-/* Verbs header. */
-/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */
-#ifdef PEDANTIC
-#pragma GCC diagnostic ignored "-Wpedantic"
-#endif
-#include <infiniband/verbs.h>
-#include <infiniband/mlx5dv.h>
-#ifdef PEDANTIC
-#pragma GCC diagnostic error "-Wpedantic"
-#endif
-
-#include <rte_eal_memconfig.h>
 #include <rte_ethdev.h>
 #include <rte_rwlock.h>
 #include <rte_bitmap.h>
+#include <rte_memory.h>
 
-/* Memory Region object. */
-struct mlx5_mr {
-	LIST_ENTRY(mlx5_mr) mr; /**< Pointer to the prev/next entry. */
-	struct ibv_mr *ibv_mr; /* Verbs Memory Region. */
-	const struct rte_memseg_list *msl;
-	int ms_base_idx; /* Start index of msl->memseg_arr[]. */
-	int ms_n; /* Number of memsegs in use. */
-	uint32_t ms_bmp_n; /* Number of bits in memsegs bit-mask. */
-	struct rte_bitmap *ms_bmp; /* Bit-mask of memsegs belonged to MR. */
-};
-
-/* Cache entry for Memory Region. */
-struct mlx5_mr_cache {
-	uintptr_t start; /* Start address of MR. */
-	uintptr_t end; /* End address of MR. */
-	uint32_t lkey; /* rte_cpu_to_be_32(ibv_mr->lkey). */
-} __rte_packed;
-
-/* MR Cache table for Binary search. */
-struct mlx5_mr_btree {
-	uint16_t len; /* Number of entries. */
-	uint16_t size; /* Total number of entries. */
-	int overflow; /* Mark failure of table expansion. */
-	struct mlx5_mr_cache (*table)[];
-} __rte_packed;
-
-/* Per-queue MR control descriptor. */
-struct mlx5_mr_ctrl {
-	uint32_t *dev_gen_ptr; /* Generation number of device to poll. */
-	uint32_t cur_gen; /* Generation number saved to flush caches. */
-	uint16_t mru; /* Index of last hit entry in top-half cache. */
-	uint16_t head; /* Index of the oldest entry in top-half cache. */
-	struct mlx5_mr_cache cache[MLX5_MR_CACHE_N]; /* Cache for top-half. */
-	struct mlx5_mr_btree cache_bh; /* Cache for bottom-half. */
-} __rte_packed;
-
-struct mlx5_ibv_shared;
-extern struct mlx5_dev_list  mlx5_mem_event_cb_list;
-extern rte_rwlock_t mlx5_mem_event_rwlock;
+#include <mlx5_common_mr.h>
 
 /* First entry must be NULL for comparison. */
 #define mlx5_mr_btree_len(bt) ((bt)->len - 1)
 
-int mlx5_mr_btree_init(struct mlx5_mr_btree *bt, int n, int socket);
-void mlx5_mr_btree_free(struct mlx5_mr_btree *bt);
-uint32_t mlx5_mr_create_primary(struct rte_eth_dev *dev,
-				struct mlx5_mr_cache *entry, uintptr_t addr);
 void mlx5_mr_mem_event_cb(enum rte_mem_event event_type, const void *addr,
 			  size_t len, void *arg);
 int mlx5_mr_update_mp(struct rte_eth_dev *dev, struct mlx5_mr_ctrl *mr_ctrl,
 		      struct rte_mempool *mp);
-void mlx5_mr_release(struct mlx5_ibv_shared *sh);
-
-/* Debug purpose functions. */
-void mlx5_mr_btree_dump(struct mlx5_mr_btree *bt);
-void mlx5_mr_dump_dev(struct mlx5_ibv_shared *sh);
-
-/**
- * Look up LKey from given lookup table by linear search. Firstly look up the
- * last-hit entry. If miss, the entire array is searched. If found, update the
- * last-hit index and return LKey.
- *
- * @param lkp_tbl
- *   Pointer to lookup table.
- * @param[in,out] cached_idx
- *   Pointer to last-hit index.
- * @param n
- *   Size of lookup table.
- * @param addr
- *   Search key.
- *
- * @return
- *   Searched LKey on success, UINT32_MAX on no match.
- */
-static __rte_always_inline uint32_t
-mlx5_mr_lookup_cache(struct mlx5_mr_cache *lkp_tbl, uint16_t *cached_idx,
-		     uint16_t n, uintptr_t addr)
-{
-	uint16_t idx;
-
-	if (likely(addr >= lkp_tbl[*cached_idx].start &&
-		   addr < lkp_tbl[*cached_idx].end))
-		return lkp_tbl[*cached_idx].lkey;
-	for (idx = 0; idx < n && lkp_tbl[idx].start != 0; ++idx) {
-		if (addr >= lkp_tbl[idx].start &&
-		    addr < lkp_tbl[idx].end) {
-			/* Found. */
-			*cached_idx = idx;
-			return lkp_tbl[idx].lkey;
-		}
-	}
-	return UINT32_MAX;
-}
 
 #endif /* RTE_PMD_MLX5_MR_H_ */