LU-15595 tests: Router test interop check and aarch fix

[fs/lustre-release.git] / lnet / lnet / router.c

diff --git a/lnet/lnet/router.c b/lnet/lnet/router.c
index 3960785..23c901b 100644 (file)
--- a/lnet/lnet/router.c
+++ b/lnet/lnet/router.c
@@ -1404,7 +1404,7 @@ lnet_rtrpools_free(int keep_pools)
 static int
 lnet_nrb_tiny_calculate(void)
 {
-       int     nrbs = LNET_NRB_TINY;
+       int nrbs = LNET_NRB_TINY;
 
        if (tiny_router_buffers < 0) {
                LCONSOLE_ERROR_MSG(0x10c,
@@ -1413,17 +1413,21 @@ lnet_nrb_tiny_calculate(void)
                return -EINVAL;
        }
 
-       if (tiny_router_buffers > 0)
+       if (tiny_router_buffers > 0) {
+               if (tiny_router_buffers < LNET_NRB_TINY_MIN)
+                       CWARN("tiny_router_buffers=%d less than recommended minimum %d\n",
+                             tiny_router_buffers, LNET_NRB_TINY_MIN);
                nrbs = tiny_router_buffers;
+       }
 
        nrbs /= LNET_CPT_NUMBER;
-       return max(nrbs, LNET_NRB_TINY_MIN);
+       return max(nrbs, 1);
 }
 
 static int
 lnet_nrb_small_calculate(void)
 {
-       int     nrbs = LNET_NRB_SMALL;
+       int nrbs = LNET_NRB_SMALL;
 
        if (small_router_buffers < 0) {
                LCONSOLE_ERROR_MSG(0x10c,
@@ -1432,17 +1436,21 @@ lnet_nrb_small_calculate(void)
                return -EINVAL;
        }
 
-       if (small_router_buffers > 0)
+       if (small_router_buffers > 0) {
+               if (small_router_buffers < LNET_NRB_SMALL_MIN)
+                       CWARN("small_router_buffers=%d less than recommended minimum %d\n",
+                             small_router_buffers, LNET_NRB_SMALL_MIN);
                nrbs = small_router_buffers;
+       }
 
        nrbs /= LNET_CPT_NUMBER;
-       return max(nrbs, LNET_NRB_SMALL_MIN);
+       return max(nrbs, 1);
 }
 
 static int
 lnet_nrb_large_calculate(void)
 {
-       int     nrbs = LNET_NRB_LARGE;
+       int nrbs = LNET_NRB_LARGE;
 
        if (large_router_buffers < 0) {
                LCONSOLE_ERROR_MSG(0x10c,
@@ -1451,11 +1459,15 @@ lnet_nrb_large_calculate(void)
                return -EINVAL;
        }
 
-       if (large_router_buffers > 0)
+       if (large_router_buffers > 0) {
+               if (large_router_buffers < LNET_NRB_LARGE_MIN)
+                       CWARN("large_router_buffers=%d less than recommended minimum %d\n",
+                             large_router_buffers, LNET_NRB_LARGE_MIN);
                nrbs = large_router_buffers;
+       }
 
        nrbs /= LNET_CPT_NUMBER;
-       return max(nrbs, LNET_NRB_LARGE_MIN);
+       return max(nrbs, 1);
 }
 
 int