1 files changed, 41 insertions, 4 deletions

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 1ba6c42e4df8..8a87404e9c76 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -244,6 +244,12 @@ static int mlx5_ib_query_device(struct ib_device *ibdev,
                                            props->max_mcast_grp;
         props->max_map_per_fmr = INT_MAX; /* no limit in ConnectIB */
 
+#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING
+        if (dev->mdev->caps.gen.flags & MLX5_DEV_CAP_FLAG_ON_DMND_PG)
+                props->device_cap_flags |= IB_DEVICE_ON_DEMAND_PAGING;
+        props->odp_caps = dev->odp_caps;
+#endif
+
 out:
         kfree(in_mad);
         kfree(out_mad);
@@ -568,6 +574,10 @@ static struct ib_ucontext *mlx5_ib_alloc_ucontext(struct ib_device *ibdev,
                         goto out_count;
         }
 
+#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING
+        context->ibucontext.invalidate_range = &mlx5_ib_invalidate_range;
+#endif
+
         INIT_LIST_HEAD(&context->db_page_list);
         mutex_init(&context->db_page_mutex);
 
@@ -858,7 +868,7 @@ static ssize_t show_reg_pages(struct device *device,
         struct mlx5_ib_dev *dev =
                 container_of(device, struct mlx5_ib_dev, ib_dev.dev);
 
-        return sprintf(buf, "%d\n", dev->mdev->priv.reg_pages);
+        return sprintf(buf, "%d\n", atomic_read(&dev->mdev->priv.reg_pages));
 }
 
 static ssize_t show_hca(struct device *device, struct device_attribute *attr,
@@ -1321,6 +1331,8 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
                 (1ull << IB_USER_VERBS_CMD_DESTROY_SRQ)         |
                 (1ull << IB_USER_VERBS_CMD_CREATE_XSRQ)         |
                 (1ull << IB_USER_VERBS_CMD_OPEN_QP);
+        dev->ib_dev.uverbs_ex_cmd_mask =
+                (1ull << IB_USER_VERBS_EX_CMD_QUERY_DEVICE);
 
         dev->ib_dev.query_device        = mlx5_ib_query_device;
         dev->ib_dev.query_port          = mlx5_ib_query_port;
@@ -1366,6 +1378,8 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
         dev->ib_dev.free_fast_reg_page_list  = mlx5_ib_free_fast_reg_page_list;
         dev->ib_dev.check_mr_status     = mlx5_ib_check_mr_status;
 
+        mlx5_ib_internal_query_odp_caps(dev);
+
         if (mdev->caps.gen.flags & MLX5_DEV_CAP_FLAG_XRC) {
                 dev->ib_dev.alloc_xrcd = mlx5_ib_alloc_xrcd;
                 dev->ib_dev.dealloc_xrcd = mlx5_ib_dealloc_xrcd;
@@ -1379,16 +1393,19 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
                 goto err_eqs;
 
         mutex_init(&dev->cap_mask_mutex);
-        spin_lock_init(&dev->mr_lock);
 
         err = create_dev_resources(&dev->devr);
         if (err)
                 goto err_eqs;
 
-        err = ib_register_device(&dev->ib_dev, NULL);
+        err = mlx5_ib_odp_init_one(dev);
         if (err)
                 goto err_rsrc;
 
+        err = ib_register_device(&dev->ib_dev, NULL);
+        if (err)
+                goto err_odp;
+
         err = create_umr_res(dev);
         if (err)
                 goto err_dev;
@@ -1410,6 +1427,9 @@ err_umrc:
 err_dev:
         ib_unregister_device(&dev->ib_dev);
 
+err_odp:
+        mlx5_ib_odp_remove_one(dev);
+
 err_rsrc:
         destroy_dev_resources(&dev->devr);
 
@@ -1425,8 +1445,10 @@ err_dealloc:
 static void mlx5_ib_remove(struct mlx5_core_dev *mdev, void *context)
 {
         struct mlx5_ib_dev *dev = context;
+
         ib_unregister_device(&dev->ib_dev);
         destroy_umrc_res(dev);
+        mlx5_ib_odp_remove_one(dev);
         destroy_dev_resources(&dev->devr);
         free_comp_eqs(dev);
         ib_dealloc_device(&dev->ib_dev);
@@ -1440,15 +1462,30 @@ static struct mlx5_interface mlx5_ib_interface = {
 
 static int __init mlx5_ib_init(void)
 {
+        int err;
+
         if (deprecated_prof_sel != 2)
                 pr_warn("prof_sel is deprecated for mlx5_ib, set it for mlx5_core\n");
 
-        return mlx5_register_interface(&mlx5_ib_interface);
+        err = mlx5_ib_odp_init();
+        if (err)
+                return err;
+
+        err = mlx5_register_interface(&mlx5_ib_interface);
+        if (err)
+                goto clean_odp;
+
+        return err;
+
+clean_odp:
+        mlx5_ib_odp_cleanup();
+        return err;
 }
 
 static void __exit mlx5_ib_cleanup(void)
 {
         mlx5_unregister_interface(&mlx5_ib_interface);
+        mlx5_ib_odp_cleanup();
 }
 
 module_init(mlx5_ib_init);