diff options
| author | Jérôme Glisse <jglisse@redhat.com> | 2015-04-06 10:40:34 -0400 |
|---|---|---|
| committer | Jérôme Glisse <jglisse@redhat.com> | 2015-05-21 14:00:05 -0400 |
| commit | d6db78f156c1963fdc4cf1ae889fe6c533a79c12 (patch) | |
| tree | 6eba17621dd84138b7aab6661740ab05aceec146 | |
| parent | a95eaa986ece85262fd4e031f8cf7576122ca9c8 (diff) | |
IB/mlx5/hmm: enable ODP using HMM.hmm-y15may21
All pieces are in place for ODP (on demand paging) to work using HMM.
Signed-off-by: Jérôme Glisse <jglisse@redhat.com>
| -rw-r--r-- | drivers/infiniband/core/uverbs_cmd.c | 4 | ||||
| -rw-r--r-- | drivers/infiniband/hw/mlx5/main.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c index 3225ab5211ee..16520bdfa0fe 100644 --- a/drivers/infiniband/core/uverbs_cmd.c +++ b/drivers/infiniband/core/uverbs_cmd.c @@ -3340,9 +3340,6 @@ int ib_uverbs_ex_query_device(struct ib_uverbs_file *file, goto end; #ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING -#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING_HMM -#error "CONFIG_INFINIBAND_ON_DEMAND_PAGING_HMM not supported at this stage !" -#else /* CONFIG_INFINIBAND_ON_DEMAND_PAGING_HMM */ resp.odp_caps.general_caps = attr.odp_caps.general_caps; resp.odp_caps.per_transport_caps.rc_odp_caps = attr.odp_caps.per_transport_caps.rc_odp_caps; @@ -3351,7 +3348,6 @@ int ib_uverbs_ex_query_device(struct ib_uverbs_file *file, resp.odp_caps.per_transport_caps.ud_odp_caps = attr.odp_caps.per_transport_caps.ud_odp_caps; resp.odp_caps.reserved = 0; -#endif /* CONFIG_INFINIBAND_ON_DEMAND_PAGING_HMM */ #else /* CONFIG_INFINIBAND_ON_DEMAND_PAGING */ memset(&resp.odp_caps, 0, sizeof(resp.odp_caps)); #endif /* CONFIG_INFINIBAND_ON_DEMAND_PAGING */ diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index eddabf05a162..cff70a22fa86 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -157,7 +157,11 @@ static int mlx5_ib_query_device(struct ib_device *ibdev, #ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING #ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING_HMM -#error "CONFIG_INFINIBAND_ON_DEMAND_PAGING_HMM not supported at this stage !" + if ((dev->mdev->caps.gen.flags & MLX5_DEV_CAP_FLAG_ON_DMND_PG) && + ibdev->hmm_ready) { + props->device_cap_flags |= IB_DEVICE_ON_DEMAND_PAGING; + props->odp_caps = dev->odp_caps; + } #else /* CONFIG_INFINIBAND_ON_DEMAND_PAGING_HMM */ if (dev->mdev->caps.gen.flags & MLX5_DEV_CAP_FLAG_ON_DMND_PG) props->device_cap_flags |= IB_DEVICE_ON_DEMAND_PAGING; |