chore: RUN-939: Propagate wasm_memory_limit through the execution layer

Author: ulan

rs/canister_sandbox/src/sandbox_server.rs

@@ -181,6 +181,7 @@ mod tests {
                 NumInstructions::new(INSTRUCTION_LIMIT),
             ),
             canister_memory_limit: NumBytes::new(4 << 30),
+            wasm_memory_limit: None,
             memory_allocation: MemoryAllocation::default(),
             compute_allocation: ComputeAllocation::default(),
             subnet_type: SubnetType::Application,

rs/embedders/fuzz/fuzz_targets/execute_with_wasm_executor.rs

@@ -120,6 +120,7 @@ fn setup_wasm_execution_input(func_ref: FuncRef) -> WasmExecutionInput {
             DEFAULT_NUM_INSTRUCTIONS,
         ),
         canister_memory_limit: NumBytes::from(4 << 30),
+        wasm_memory_limit: None,
         memory_allocation: MemoryAllocation::default(),
         compute_allocation: ComputeAllocation::default(),
         subnet_type: SubnetType::Application,

rs/embedders/src/wasmtime_embedder/wasmtime_embedder_tests.rs

@@ -71,6 +71,7 @@ fn test_wasmtime_system_api() {
                 MAX_NUM_INSTRUCTIONS,
             ),
             canister_memory_limit,
+            wasm_memory_limit: None,
             memory_allocation: MemoryAllocation::default(),
             compute_allocation: ComputeAllocation::default(),
             subnet_type: SubnetType::Application,

rs/embedders/tests/wasmtime_random_memory_writes.rs

@@ -93,6 +93,7 @@ fn test_api_for_update(
                 instruction_limit,
             ),
             canister_memory_limit,
+            wasm_memory_limit: None,
             memory_allocation: MemoryAllocation::default(),
             compute_allocation: ComputeAllocation::default(),
             subnet_type: SubnetType::Application,

rs/execution_environment/benches/lib/src/common.rs

@@ -152,6 +152,7 @@ where
             MAX_NUM_INSTRUCTIONS,
         ),
         canister_memory_limit: canister_state.memory_limit(NumBytes::new(std::u64::MAX)),
+        wasm_memory_limit: None,
         memory_allocation: canister_state.memory_allocation(),
         compute_allocation: canister_state.compute_allocation(),
         subnet_type: hypervisor.subnet_type(),

rs/execution_environment/src/canister_manager/tests.rs

@@ -108,6 +108,7 @@ lazy_static! {
             MAX_NUM_INSTRUCTIONS
         ),
         canister_memory_limit: NumBytes::new(u64::MAX / 2),
+        wasm_memory_limit: None,
         memory_allocation: MemoryAllocation::default(),
         compute_allocation: ComputeAllocation::default(),
         subnet_type: SubnetType::Application,

rs/execution_environment/src/execution_environment.rs

@@ -1609,6 +1609,7 @@ impl ExecutionEnvironment {
         ExecutionParameters {
             instruction_limits,
             canister_memory_limit: canister.memory_limit(self.config.max_canister_memory_size),
+            wasm_memory_limit: canister.wasm_memory_limit(),
             memory_allocation: canister.memory_allocation(),
             compute_allocation: canister.compute_allocation(),
             subnet_type: self.own_subnet_type,

rs/execution_environment/src/query_handler/query_context.rs

@@ -1059,6 +1059,7 @@ impl<'a> QueryContext<'a> {
         ExecutionParameters {
             instruction_limits,
             canister_memory_limit: canister.memory_limit(self.max_canister_memory_size),
+            wasm_memory_limit: canister.wasm_memory_limit(),
             memory_allocation: canister.memory_allocation(),
             compute_allocation: canister.compute_allocation(),
             subnet_type: self.own_subnet_type,

rs/replicated_state/src/canister_state.rs

@@ -464,6 +464,11 @@ impl CanisterState {
         }
     }
 
+    /// Returns the Wasm memory limit from the canister settings.
+    pub fn wasm_memory_limit(&self) -> Option<NumBytes> {
+        self.system_state.wasm_memory_limit
+    }
+
     /// Returns the current compute allocation for the canister.
     pub fn compute_allocation(&self) -> ComputeAllocation {
         self.scheduler_state.compute_allocation

rs/system_api/src/lib.rs

@@ -160,6 +160,8 @@ impl InstructionLimits {
 pub struct ExecutionParameters {
     pub instruction_limits: InstructionLimits,
     pub canister_memory_limit: NumBytes,
+    // The limit on the Wasm memory set by the developer in canister settings.
+    pub wasm_memory_limit: Option<NumBytes>,
     pub memory_allocation: MemoryAllocation,
     pub compute_allocation: ComputeAllocation,
     pub subnet_type: SubnetType,
@@ -622,6 +624,11 @@ struct MemoryUsage {
     /// Upper limit on how much the memory the canister could use.
     limit: NumBytes,
 
+    /// The Wasm memory limit set by the developer in canister settings.
+    /// TODO: Enforce this limit in `update_available_memory`.
+    #[allow(dead_code)]
+    wasm_memory_limit: Option<NumBytes>,
+
     /// The current amount of execution memory that the canister is using.
     current_usage: NumBytes,
 
@@ -648,6 +655,7 @@ impl MemoryUsage {
         log: ReplicaLogger,
         canister_id: CanisterId,
         limit: NumBytes,
+        wasm_memory_limit: Option<NumBytes>,
         current_usage: NumBytes,
         current_message_usage: NumBytes,
         subnet_available_memory: SubnetAvailableMemory,
@@ -668,6 +676,7 @@ impl MemoryUsage {
         }
         Self {
             limit,
+            wasm_memory_limit,
             current_usage,
             current_message_usage,
             subnet_available_memory,
@@ -895,6 +904,7 @@ impl SystemApiImpl {
             log.clone(),
             sandbox_safe_system_state.canister_id,
             execution_parameters.canister_memory_limit,
+            execution_parameters.wasm_memory_limit,
             canister_current_memory_usage,
             canister_current_message_memory_usage,
             subnet_available_memory,