Disable polkavm logging in pallet-revive

prdoc/pr_10385.prdoc

@@ -0,0 +1,13 @@
+title: Disable polkavm logging in `pallet-revive`
+doc:
+- audience: Runtime Dev
+  description: |-
+    This PR disables logging in `polkavm` in `pallet-revive`.
+    This is to make sure massive `polkavm` logging don't impact the overall perfomance, which might be manifested with eg. long block proposal time.
+
+    details: https://github.com/paritytech/polkadot-sdk/issues/8760#issuecomment-3499548774
+
+    The fix requires bumping `polkavm` to `0.30.0` which includes a method that allows to disable logging.
+crates:
+- name: pallet-revive
+  bump: minor

substrate/frame/revive/Cargo.toml

@@ -34,8 +34,8 @@ num-bigint = { workspace = true }
 num-integer = { workspace = true }
 num-traits = { workspace = true }
 paste = { workspace = true }
-polkavm = { version = "0.29.1", default-features = false }
-polkavm-common = { version = "0.29.0", default-features = false, features = ["alloc"] }
+polkavm = { version = "0.30.0", default-features = false }
+polkavm-common = { version = "0.30.0", default-features = false, features = ["alloc"] }
 rand = { workspace = true, optional = true }
 rand_pcg = { workspace = true, optional = true }
 revm = { workspace = true }

substrate/frame/revive/src/call_builder.rs

@@ -449,7 +449,11 @@ impl VmBinaryModule {
 			}
 		}
 		text.push_str("ret\n");
-		let code = polkavm_common::assembler::assemble(&text).unwrap();
+		let code = polkavm_common::assembler::assemble(
+			Some(polkavm_common::program::InstructionSetKind::ReviveV1),
+			&text,
+		)
+		.unwrap();
 		Self::new(code)
 	}
 
@@ -478,7 +482,11 @@ impl VmBinaryModule {
 		ret
 		"
 		);
-		let code = polkavm_common::assembler::assemble(&text).unwrap();
+		let code = polkavm_common::assembler::assemble(
+			Some(polkavm_common::program::InstructionSetKind::ReviveV1),
+			&text,
+		)
+		.unwrap();
 		Self::new(code)
 	}
 

substrate/frame/revive/src/limits.rs

@@ -138,8 +138,7 @@ pub mod code {
 		pvm_blob: Vec<u8>,
 		available_syscalls: &[&[u8]],
 	) -> Result<Vec<u8>, DispatchError> {
-		use polkavm::program::ISA64_V1 as ISA;
-		use polkavm_common::program::EstimateInterpreterMemoryUsageArgs;
+		use polkavm_common::program::{EstimateInterpreterMemoryUsageArgs, ISA_Latest64 as ISA};
 
 		let len: u64 = pvm_blob.len() as u64;
 		if len > crate::limits::code::BLOB_BYTES.into() {
@@ -190,7 +189,7 @@ pub mod code {
 		let mut block_size: u32 = 0;
 		let mut basic_block_count: u32 = 0;
 		let mut instruction_count: u32 = 0;
-		for inst in program.instructions(ISA) {
+		for inst in program.instructions_with_isa(ISA) {
 			use polkavm::program::Instruction;
 			block_size += 1;
 			instruction_count += 1;

substrate/frame/revive/src/vm/pvm/env.rs

@@ -47,6 +47,11 @@ impl<T: Config> ContractBlob<T> {
 		aux_data_size: u32,
 	) -> Result<PreparedCall<E>, ExecError> {
 		let mut config = polkavm::Config::default();
+		// Log filtering by level with log::enabled! returns always true,
+		// passing all logs through impacting performance \
+		// (more details: https://github.com/paritytech/polkadot-sdk/issues/8760#issuecomment-3499548774)
+		// Let's disable polkavm logging.
+		config.set_imperfect_logger_filtering_workaround(true);
 		config.set_backend(Some(polkavm::BackendKind::Interpreter));
 		config.set_cache_enabled(false);
 		#[cfg(feature = "std")]
@@ -62,7 +67,6 @@ impl<T: Config> ContractBlob<T> {
 		let mut module_config = polkavm::ModuleConfig::new();
 		module_config.set_page_size(limits::PAGE_SIZE);
 		module_config.set_gas_metering(Some(polkavm::GasMeteringKind::Sync));
-		module_config.set_allow_sbrk(false);
 		module_config.set_aux_data_size(aux_data_size);
 		let module =
 			polkavm::Module::new(&engine, &module_config, self.code.into()).map_err(|err| {