Skip to content

Commit 94dda3c

Browse files
authored
Update Propolis (#8527)
Changes here are: * update zerocopy to 0.8.25 (Propolis#910) * Rust 1.87.0 clippy lints (Propolis#911) * Support guest memory sizes >=1028 GiB (Propolis#912) * Fix new lints (Propolis#914) * server: build Tokio runtime using `oxide-tokio-rt` (Propolis#913) * Handle CPUID subleaves more precisely when using Bhyve defaults (Propolis#915) Since the Propolis update increases the max viable memory size, I'm bumping that to 1.5 TiB here as well (it's the largest size I've tested on `dublin`) The CPUID changes in #915 are guest-visible and on production racks will have us stop advertising platform QoS features, whose MSRs aren't made available to guests anyway.
1 parent 17b9d55 commit 94dda3c

File tree

4 files changed

+17
-18
lines changed

4 files changed

+17
-18
lines changed

Cargo.lock

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -619,10 +619,10 @@ progenitor-client = "0.10.0"
619619
# NOTE: if you change the pinned revision of the `bhyve_api` and propolis
620620
# dependencies, you must also update the references in package-manifest.toml to
621621
# match the new revision.
622-
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "e3988414bd68ecf806078fb898120e1194451ee9" }
623-
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "e3988414bd68ecf806078fb898120e1194451ee9" }
624-
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "e3988414bd68ecf806078fb898120e1194451ee9" }
625-
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "e3988414bd68ecf806078fb898120e1194451ee9" }
622+
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "c03bd1a29c775acfc65de561b8fc436e2459a633" }
623+
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "c03bd1a29c775acfc65de561b8fc436e2459a633" }
624+
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "c03bd1a29c775acfc65de561b8fc436e2459a633" }
625+
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "c03bd1a29c775acfc65de561b8fc436e2459a633" }
626626
# NOTE: see above!
627627
proptest = "1.7.0"
628628
qorb = "0.4.0"

nexus/src/app/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,8 @@ pub const MIN_MEMORY_BYTES_PER_INSTANCE: u32 = 1 << 30; // 1 GiB
141141
// Before raising or removing this limit, testing has been valuable. See:
142142
// * illumos bug #17403
143143
// * Propolis issue #903
144-
// There are known issues setting this above 1028 GiB. See:
145144
// * Propolis issue #907
146-
pub const MAX_MEMORY_BYTES_PER_INSTANCE: u64 = 1024 * (1 << 30); // 1 TiB
145+
pub const MAX_MEMORY_BYTES_PER_INSTANCE: u64 = 1536 * (1 << 30); // 1.5 TiB
147146

148147
pub const MIN_DISK_SIZE_BYTES: u32 = 1 << 30; // 1 GiB
149148
pub const MAX_DISK_SIZE_BYTES: u64 = 1023 * (1 << 30); // 1023 GiB

package-manifest.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -622,10 +622,10 @@ service_name = "propolis-server"
622622
only_for_targets.image = "standard"
623623
source.type = "prebuilt"
624624
source.repo = "propolis"
625-
source.commit = "e3988414bd68ecf806078fb898120e1194451ee9"
625+
source.commit = "c03bd1a29c775acfc65de561b8fc436e2459a633"
626626
# The SHA256 digest is automatically posted to:
627627
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/<commit>/propolis-server.sha256.txt
628-
source.sha256 = "a858fe9db8db262b402a44598e991c6298f92531421029f7728b3fdd45fe621b"
628+
source.sha256 = "a83979355bd5b7346c3647ad674c1da5a746d7045b992c1edcf8729cc7634e5d"
629629
output.type = "zone"
630630

631631
[package.mg-ddm-gz]

0 commit comments

Comments
 (0)