I tried to set a map_on_demand = 32 (default for OPA) with an upstream Lustre build and run it on an MLX QDR set of system.  When I tried a bulk lnet-selftest test, it failed with this log:

[ 1125.547100] LNetError: 22552:0:(o2iblnd_cb.c:1068:kiblnd_init_rdma()) RDMA is too large for peer 192.168.1.24@o2ib (131072), src size: 1048576 dst size: 1048576

When I went back to a much older upstream build, 4.8rc2, the same test worked.  So, some porting from master to upstream seems to have not worked.  The same test works fine on master.