From 1b622e20074834bb8b9c628cefb378c85be466dd Mon Sep 17 00:00:00 2001 From: Mr NeilBrown Date: Sun, 7 Jun 2020 19:24:34 -0400 Subject: [PATCH] LU-12678 o2iblnd: Use ib_mtu_int_to_enum() Rather than bespoke code for converting an MTU into the enum, use ib_mtu_int_to_enum(). This has slightly different behaviour for invalid values, but those are caught when the parameter is set. Test-Parameters: trivial testlist=sanity-lnet Signed-off-by: Mr NeilBrown Change-Id: I9ba4230fd1aad2c6c59233bac9558870cb1ffeda Reviewed-on: https://review.whamcloud.com/39123 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Shaun Tancheff Reviewed-by: Chris Horn Reviewed-by: Oleg Drokin --- lnet/klnds/o2iblnd/o2iblnd.c | 30 +++--------------------------- lnet/klnds/o2iblnd/o2iblnd_modparams.c | 4 +++- 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/lnet/klnds/o2iblnd/o2iblnd.c b/lnet/klnds/o2iblnd/o2iblnd.c index 54968f4..5a57dfcd 100644 --- a/lnet/klnds/o2iblnd/o2iblnd.c +++ b/lnet/klnds/o2iblnd/o2iblnd.c @@ -636,40 +636,16 @@ kiblnd_debug_conn(struct kib_conn *conn) spin_unlock(&conn->ibc_lock); } -int -kiblnd_translate_mtu(int value) -{ - switch (value) { - default: - return -1; - case 0: - return 0; - case 256: - return IB_MTU_256; - case 512: - return IB_MTU_512; - case 1024: - return IB_MTU_1024; - case 2048: - return IB_MTU_2048; - case 4096: - return IB_MTU_4096; - } -} - static void kiblnd_setup_mtu_locked(struct rdma_cm_id *cmid) { - int mtu; - /* XXX There is no path record for iWARP, set by netdev->change_mtu? */ if (cmid->route.path_rec == NULL) return; - mtu = kiblnd_translate_mtu(*kiblnd_tunables.kib_ib_mtu); - LASSERT (mtu >= 0); - if (mtu != 0) - cmid->route.path_rec->mtu = mtu; + if (*kiblnd_tunables.kib_ib_mtu) + cmid->route.path_rec->mtu = + ib_mtu_int_to_enum(*kiblnd_tunables.kib_ib_mtu); } static int diff --git a/lnet/klnds/o2iblnd/o2iblnd_modparams.c b/lnet/klnds/o2iblnd/o2iblnd_modparams.c index a9ac2d8..57a025e 100644 --- a/lnet/klnds/o2iblnd/o2iblnd_modparams.c +++ b/lnet/klnds/o2iblnd/o2iblnd_modparams.c @@ -236,7 +236,9 @@ kiblnd_tunables_setup(struct lnet_ni *ni) /* Current API version */ tunables->lnd_version = CURRENT_LND_VERSION; - if (kiblnd_translate_mtu(*kiblnd_tunables.kib_ib_mtu) < 0) { + if (*kiblnd_tunables.kib_ib_mtu && + ib_mtu_enum_to_int(ib_mtu_int_to_enum(*kiblnd_tunables.kib_ib_mtu)) != + *kiblnd_tunables.kib_ib_mtu) { CERROR("Invalid ib_mtu %d, expected 256/512/1024/2048/4096\n", *kiblnd_tunables.kib_ib_mtu); return -EINVAL; -- 1.8.3.1