Skip to content

v2.1: Fix reserve minimal compute units for builtins (backport of #3799) #3931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tao-stones merged 3 commits into from
Jan 11, 2025
Merged

v2.1: Fix reserve minimal compute units for builtins (backport of #3799) #3931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32de336
Fix reserve minimal compute units for builtins (#3799)
tao-stones Dec 5, 2024
77467c4
Fix conflicts manually
tao-stones Dec 10, 2024
f144108
avoid getting program_ids that are not used after all
tao-stones Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions builtins-default-costs/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,8 @@ lazy_static! {
temp_table
};
}

#[inline]
pub fn is_builtin_program(program_id: &Pubkey) -> bool {
BUILTIN_INSTRUCTION_COSTS.contains_key(program_id)
}
3 changes: 3 additions & 0 deletions compute-budget/src/compute_budget_limits.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ use {
/// default heap page cost = 0.5 * 15 ~= 8CU/page
pub const DEFAULT_HEAP_COST: u64 = 8;
pub const DEFAULT_INSTRUCTION_COMPUTE_UNIT_LIMIT: u32 = 200_000;
// SIMD-170 defines max CUs to be allocated for any builtin program instructions, that
// have not been migrated to sBPF programs.
pub const MAX_BUILTIN_ALLOCATION_COMPUTE_UNIT_LIMIT: u32 = 3_000;
pub const MAX_COMPUTE_UNIT_LIMIT: u32 = 1_400_000;
pub const MAX_HEAP_FRAME_BYTES: u32 = 256 * 1024;
pub const MIN_HEAP_FRAME_BYTES: u32 = HEAP_LENGTH as u32;
Expand Down
8 changes: 5 additions & 3 deletions core/src/banking_stage/consumer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,9 +574,10 @@ impl Consumer {
.sanitized_transactions()
.iter()
.filter_map(|transaction| {
process_compute_budget_instructions(SVMMessage::program_instructions_iter(
transaction,
))
process_compute_budget_instructions(
SVMMessage::program_instructions_iter(transaction),
&bank.feature_set,
)
.ok()
.map(|limits| limits.compute_unit_price)
})
Expand Down Expand Up @@ -758,6 +759,7 @@ impl Consumer {
let fee_payer = message.fee_payer();
let fee_budget_limits = FeeBudgetLimits::from(process_compute_budget_instructions(
SVMMessage::program_instructions_iter(message),
&bank.feature_set,
)?);
let fee = solana_fee::calculate_fee(
message,
Expand Down
8 changes: 8 additions & 0 deletions core/src/banking_stage/immutable_deserialized_packet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use {
solana_sanitize::SanitizeError,
solana_sdk::{
clock::Slot,
feature_set::FeatureSet,
hash::Hash,
message::{v0::LoadedAddresses, AddressLoaderError, Message, SimpleAddressLoader},
pubkey::Pubkey,
Expand Down Expand Up @@ -40,6 +41,12 @@ pub enum DeserializedPacketError {
FailedFilter(#[from] PacketFilterFailure),
}

lazy_static::lazy_static! {
// Make a dummy feature_set with all features enabled to
Copy link

@t-nelson t-nelson Jan 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why? could have easily resolved the feature set higher in the call stack and passed a bool down instead of introducing an entire sentinel feature set instance

Copy link

@tao-stones tao-stones Jan 11, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Considered that too, since we plan to remove immutable_deserialized_packet soon m(when legacy "scheduler" is removed), adding dummy here is easier for backporting than piping a bool through more files.

// fetch compute_unit_price and compute_unit_limit for legacy leader.
static ref FEATURE_SET: FeatureSet = FeatureSet::all_enabled();
Copy link

@t-nelson t-nelson Jan 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why all and not just the one we care about here? what if someone naively decides to leverage the arg in at an intermediary call site for something unrelated?

Copy link

@tao-stones tao-stones Jan 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea a lazy step for dummy.

}

#[derive(Debug, Eq)]
pub struct ImmutableDeserializedPacket {
original_packet: Packet,
Expand Down Expand Up @@ -68,6 +75,7 @@ impl ImmutableDeserializedPacket {
.get_message()
.program_instructions_iter()
.map(|(pubkey, ix)| (pubkey, SVMInstruction::from(ix))),
&FEATURE_SET,
)
.map_err(|_| DeserializedPacketError::PrioritizationFailure)?;

Expand Down
13 changes: 7 additions & 6 deletions core/src/banking_stage/transaction_scheduler/scheduler_controller.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,11 +544,12 @@ impl<T: LikeClusterInfo> SchedulerController<T> {
.is_ok()
})
.filter_map(|(packet, tx, deactivation_slot)| {
process_compute_budget_instructions(SVMMessage::program_instructions_iter(&tx))
.map(|compute_budget| {
(packet, tx, deactivation_slot, compute_budget.into())
})
.ok()
process_compute_budget_instructions(
SVMMessage::program_instructions_iter(&tx),
&working_bank.feature_set,
)
.map(|compute_budget| (packet, tx, deactivation_slot, compute_budget.into()))
.ok()
})
.for_each(|(packet, tx, deactivation_slot, fee_budget_limits)| {
arc_packets.push(packet);
Expand Down Expand Up @@ -1094,7 +1095,7 @@ mod tests {
&Keypair::new(),
&Pubkey::new_unique(),
1,
i * 10,
i * 10_000,
bank.last_blockhash(),
)
})
Expand Down
1 change: 1 addition & 0 deletions cost-model/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ name = "solana_cost_model"
itertools = { workspace = true }
rand = "0.8.5"
# See order-crates-for-publishing.py for using this unusual `path = "."`
solana-compute-budget-program = { workspace = true }
solana-cost-model = { path = ".", features = ["dev-context-only-utils"] }
solana-logger = { workspace = true }
solana-sdk = { workspace = true, features = ["dev-context-only-utils"] }
Expand Down
Loading
Loading