From 4e61a4aacdbc2376069d52d0f803a9f05315080f Mon Sep 17 00:00:00 2001 From: Chris Horn Date: Wed, 29 Sep 2021 12:42:26 -0500 Subject: [PATCH] LU-15094 o2iblnd: map_on_demand not needed for frag interop The map_on_demand tunable is not used for setting max frags so don't require that it be set in order to negotiate max frags. HPE-bug-id: LUS-10488 Test-Parameters: trivial Signed-off-by: Chris Horn Change-Id: Ie89f1f035f4b05244feffb848c14582a8c7cf0e6 Reviewed-on: https://review.whamcloud.com/45215 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Serguei Smirnov Reviewed-by: Andriy Skulysh Reviewed-by: Alexey Lyashkov Reviewed-by: Oleg Drokin --- lnet/klnds/o2iblnd/o2iblnd_cb.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/lnet/klnds/o2iblnd/o2iblnd_cb.c b/lnet/klnds/o2iblnd/o2iblnd_cb.c index d7571f4..07c2efa 100644 --- a/lnet/klnds/o2iblnd/o2iblnd_cb.c +++ b/lnet/klnds/o2iblnd/o2iblnd_cb.c @@ -2757,23 +2757,11 @@ kiblnd_check_reconnect(struct kib_conn *conn, int version, break; case IBLND_REJECT_RDMA_FRAGS: { - struct lnet_ioctl_config_o2iblnd_tunables *tunables; - if (!cp) { reason = "can't negotiate max frags"; goto out; } - tunables = &peer_ni->ibp_ni->ni_lnd_tunables.lnd_tun_u.lnd_o2ib; -#ifdef HAVE_IB_GET_DMA_MR - /* - * This check only makes sense if the kernel supports global - * memory registration. Otherwise, map_on_demand will never == 0 - */ - if (!tunables->lnd_map_on_demand) { - reason = "map_on_demand must be enabled"; - goto out; - } -#endif + if (conn->ibc_max_frags <= frag_num) { reason = "unsupported max frags"; goto out; -- 1.8.3.1