From cb9a584275bc32cf9e51efb6c54ea4c8adf2ea90 Mon Sep 17 00:00:00 2001 From: Oleg Drokin Date: Thu, 12 Oct 2017 01:27:15 -0400 Subject: [PATCH] Revert "LU-9810 lnet: prefer Fast Reg" This patch seems to be breaking local mounts as documented in LU-10068. While this might me mlx5 problem and not this patch per se, we need to have the repo in working order. This reverts commit 8f0d0f052a516a5dd3e588ced6b49c840584855c. Change-Id: Ib54a958018875b368410e98863a5199bf1b89604 Signed-off-by: Oleg Drokin --- lnet/klnds/o2iblnd/o2iblnd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lnet/klnds/o2iblnd/o2iblnd.c b/lnet/klnds/o2iblnd/o2iblnd.c index 98d3578..493e73c 100644 --- a/lnet/klnds/o2iblnd/o2iblnd.c +++ b/lnet/klnds/o2iblnd/o2iblnd.c @@ -1656,14 +1656,14 @@ kiblnd_create_fmr_pool(kib_fmr_poolset_t *fps, kib_fmr_pool_t **pp_fpo) /* Check for FMR or FastReg support */ fpo->fpo_is_fmr = 0; - if (dev_attr->device_cap_flags & IB_DEVICE_MEM_MGT_EXTENSIONS) { - LCONSOLE_INFO("Using FastReg for registration\n"); - } else if (fpo->fpo_hdev->ibh_ibdev->alloc_fmr && + if (fpo->fpo_hdev->ibh_ibdev->alloc_fmr && fpo->fpo_hdev->ibh_ibdev->dealloc_fmr && fpo->fpo_hdev->ibh_ibdev->map_phys_fmr && fpo->fpo_hdev->ibh_ibdev->unmap_fmr) { LCONSOLE_INFO("Using FMR for registration\n"); fpo->fpo_is_fmr = 1; + } else if (dev_attr->device_cap_flags & IB_DEVICE_MEM_MGT_EXTENSIONS) { + LCONSOLE_INFO("Using FastReg for registration\n"); } else { rc = -ENOSYS; LCONSOLE_ERROR_MSG(rc, "IB device does not support FMRs nor FastRegs, can't register memory\n"); -- 1.8.3.1