more tweak memory sizes

Signed-off-by: Reto Achermann <achreto@gmail.com>

Author: achreto

kernel/tests/s11_rackscale_benchmarks.rs

@@ -624,7 +624,10 @@ fn rackscale_memcached_benchmark(transport: RackscaleTransport) {
     test.run_dhcpd_for_baseline = true;
 
     if !is_smoke {
-        test.shmem_size = std::cmp::min(MEMCACHED_MEM_SIZE_MB * 8, testutils::helpers::SHMEM_SIZE);
+        test.shmem_size = std::cmp::min(
+            MEMCACHED_MEM_SIZE_MB * 8,
+            testutils::helpers::SHMEM_SIZE * 4,
+        );
     }
 
     fn cmd_fn(num_cores: usize, arg: Option<MemcachedInternalConfig>) -> String {
@@ -649,7 +652,11 @@ fn rackscale_memcached_benchmark(transport: RackscaleTransport) {
         } else {
             // Memory must also be divisible by number of nodes, which could be 1, 2, 3, or 4
             // memory = result of this function / num_clients  - shmem_size
-            (8192 + std::cmp::min(MEMCACHED_MEM_SIZE_MB * 8, testutils::helpers::SHMEM_SIZE))
+            (8192
+                + std::cmp::min(
+                    MEMCACHED_MEM_SIZE_MB * 8,
+                    testutils::helpers::SHMEM_SIZE * 4,
+                ))
                 * (((((num_cores + 1) / 2) + 3 - 1) / 3) * 3)
         }
     }
@@ -1298,7 +1305,10 @@ fn s11_rackscale_memcached_benchmark_sharded_nros() {
     test.is_multi_node = true;
 
     if !is_smoke {
-        test.shmem_size = std::cmp::min(MEMCACHED_MEM_SIZE_MB * 8, testutils::helpers::SHMEM_SIZE);
+        test.shmem_size = std::cmp::min(
+            MEMCACHED_MEM_SIZE_MB * 8,
+            testutils::helpers::SHMEM_SIZE * 4,
+        );
     }
 
     fn cmd_fn(num_cores: usize, arg: Option<MemcachedShardedConfig>) -> String {
@@ -1322,7 +1332,11 @@ fn s11_rackscale_memcached_benchmark_sharded_nros() {
             8192
         } else {
             // Memory must also be divisible by number of nodes, which could be 1, 2, 3, or 4
-            (8192 + std::cmp::min(MEMCACHED_MEM_SIZE_MB * 8, testutils::helpers::SHMEM_SIZE))
+            (8192
+                + std::cmp::min(
+                    MEMCACHED_MEM_SIZE_MB * 8,
+                    testutils::helpers::SHMEM_SIZE * 4,
+                ))
                 * (((((num_cores + 1) / 2) + 3 - 1) / 3) * 3)
         }
     }