Commit 96f87ee1 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Jason Gunthorpe

RDMA: Clean structures from CONFIG_INFINIBAND_ON_DEMAND_PAGING

CONFIG_INFINIBAND_ON_DEMAND_PAGING is used in general structures to
micro-optimize the memory footprint. Remove it, so it will allow us to
simplify various ODP device flows.
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 7a7b0fea
...@@ -911,7 +911,6 @@ struct mlx5_ib_dev { ...@@ -911,7 +911,6 @@ struct mlx5_ib_dev {
/* Prevents soft lock on massive reg MRs */ /* Prevents soft lock on massive reg MRs */
struct mutex slow_path_mutex; struct mutex slow_path_mutex;
int fill_delay; int fill_delay;
#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING
struct ib_odp_caps odp_caps; struct ib_odp_caps odp_caps;
u64 odp_max_size; u64 odp_max_size;
struct mlx5_ib_pf_eq odp_pf_eq; struct mlx5_ib_pf_eq odp_pf_eq;
...@@ -923,7 +922,6 @@ struct mlx5_ib_dev { ...@@ -923,7 +922,6 @@ struct mlx5_ib_dev {
struct srcu_struct mr_srcu; struct srcu_struct mr_srcu;
u32 null_mkey; u32 null_mkey;
struct workqueue_struct *advise_mr_wq; struct workqueue_struct *advise_mr_wq;
#endif
struct mlx5_ib_flow_db *flow_db; struct mlx5_ib_flow_db *flow_db;
/* protect resources needed as part of reset flow */ /* protect resources needed as part of reset flow */
spinlock_t reset_flow_resource_lock; spinlock_t reset_flow_resource_lock;
......
...@@ -1504,12 +1504,10 @@ struct ib_ucontext { ...@@ -1504,12 +1504,10 @@ struct ib_ucontext {
bool cleanup_retryable; bool cleanup_retryable;
#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING
void (*invalidate_range)(struct ib_umem_odp *umem_odp, void (*invalidate_range)(struct ib_umem_odp *umem_odp,
unsigned long start, unsigned long end); unsigned long start, unsigned long end);
struct mutex per_mm_list_lock; struct mutex per_mm_list_lock;
struct list_head per_mm_list; struct list_head per_mm_list;
#endif
struct ib_rdmacg_object cg_obj; struct ib_rdmacg_object cg_obj;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment