some fixes after rebasing on the large-shmem branch

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

Author: achreto

kernel/tests/s10_benchmarks.rs

@@ -901,10 +901,10 @@ fn s10_memcached_benchmark_internal() {
     } else {
         (
             // keep in sync with the s11_ra
-            32 * 1024, /* MB */
+            2* MEMCACHED_MEM_SIZE_MB, /* MB */
             MEMCACHED_MEM_SIZE_MB,
             MEMCACHED_NUM_QUERIES,
-            600_000,
+            std::cmp::max(60_000, MEMCACHED_NUM_QUERIES) as u64,
         )
     };
 

kernel/tests/s11_rackscale_benchmarks.rs

@@ -615,10 +615,10 @@ fn rackscale_memcached_internal_benchmark(transport: RackscaleTransport) {
     }
 
     fn rackscale_timeout_fn(num_cores: usize) -> u64 {
-        if is_smoke {
+        if cfg!(feature = "smoke") {
             60_000 as u64
         } else {
-            MEMCACHED_MEM_SIZE_MB / 10 * 1000 + MEMCACHED_NUM_QUERIES / 1000
+            (MEMCACHED_MEM_SIZE_MB / 10 * 1000 + MEMCACHED_NUM_QUERIES) as u64
         }
     }
 

kernel/testutils/src/rackscale_runner.rs

@@ -882,13 +882,13 @@ impl<T: Clone + Send + 'static> RackscaleBench<T> {
             if is_baseline {
                 test_run.client_timeout = (self.baseline_timeout_fn)(total_cores);
                 // Total client memory in test is: (mem_based_on_cores) + shmem_size * num_clients
-                test_run.memory = (self.mem_fn)(total_cores, is_smoke)
+                test_run.memory = (self.mem_fn)(total_cores, cores_per_client, is_smoke)
                     + test_run.shmem_size * test_run.num_clients;
 
                 test_run.run_baseline();
             } else {
                 test_run.client_timeout = (self.rackscale_timeout_fn)(total_cores);
-                test_run.memory = (self.mem_fn)(total_cores, is_smoke) / test_run.num_clients;
+                test_run.memory = (self.mem_fn)(total_cores, cores_per_client, is_smoke) / test_run.num_clients;
 
                 test_run.run_rackscale();
             }