From b63617a3e17f0960f89541656c2f03cd13e993a1 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 18 Nov 2021 23:58:44 +0000 Subject: [PATCH] Spit log data charge into two (#21349) (#21352) (cherry picked from commit e9c00d1e690292597b08016fb83fd972fb3b92f4) Co-authored-by: Jack May --- programs/bpf_loader/src/syscalls.rs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/programs/bpf_loader/src/syscalls.rs b/programs/bpf_loader/src/syscalls.rs index b9aefbb3b1..7448890e08 100644 --- a/programs/bpf_loader/src/syscalls.rs +++ b/programs/bpf_loader/src/syscalls.rs @@ -2725,11 +2725,14 @@ impl<'a> SyscallObject for SyscallLogData<'a> { budget .syscall_base_cost .saturating_mul(untranslated_fields.len() as u64) - .saturating_add( - untranslated_fields - .iter() - .fold(0, |total, e| total.saturating_add(e.len() as u64)) - ) + ), + result + ); + question_mark!( + invoke_context.get_compute_meter().consume( + untranslated_fields + .iter() + .fold(0, |total, e| total.saturating_add(e.len() as u64)) ), result );