Skip to content

Commit 4aaec0d

Browse files
authored
Update Propolis (again) (#9621)
Last of the stuff we need in for 18: * avoid excessive Arc<Mapping> contention (propolis#1012) * VirtIO 1.0 and multi-queue support * Add non-Arc-clone'ing variant of access() (propolis#1003) * viona: FFI out of bounds fix The first and third are to get more overhead out of the way in heavy disk I/O paths. The second gets us more network performance, and the fourth ... fixes a bug introduced by the second, an hour after it landed, unfortunately. @jmpesp had asked if the Propolis update earlier requires any specific host OS bits and I'd mangled the multi-queue support here with the viona fastpath there. The answer I gave James there actually applies here: > it does, and those are integrated as of 20d447a and 9415077 > Angela had seen the panic you get with a NIC without those, though I'm not sure how clear the panic message is. (almost certainly something about an "inappropriate ioctl on device ...")
1 parent 357a09e commit 4aaec0d

3 files changed

Lines changed: 23 additions & 23 deletions

File tree

Cargo.lock

Lines changed: 17 additions & 17 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
@@ -678,10 +678,10 @@ progenitor-client = "0.10.0"
678678
# NOTE: if you change the pinned revision of the `bhyve_api` and propolis
679679
# dependencies, you must also update the references in package-manifest.toml to
680680
# match the new revision.
681-
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "2dc643742f82d2e072a1281dab23ba2bfdcee440" }
682-
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "2dc643742f82d2e072a1281dab23ba2bfdcee440" }
683-
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "2dc643742f82d2e072a1281dab23ba2bfdcee440" }
684-
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "2dc643742f82d2e072a1281dab23ba2bfdcee440" }
681+
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "ff31c527515d65886e599fc07eb41240aeb767c6" }
682+
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "ff31c527515d65886e599fc07eb41240aeb767c6" }
683+
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "ff31c527515d65886e599fc07eb41240aeb767c6" }
684+
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "ff31c527515d65886e599fc07eb41240aeb767c6" }
685685
# NOTE: see above!
686686
proptest = "1.7.0"
687687
qorb = "0.4.1"

package-manifest.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -638,10 +638,10 @@ service_name = "propolis-server"
638638
only_for_targets.image = "standard"
639639
source.type = "prebuilt"
640640
source.repo = "propolis"
641-
source.commit = "2dc643742f82d2e072a1281dab23ba2bfdcee440"
641+
source.commit = "ff31c527515d65886e599fc07eb41240aeb767c6"
642642
# The SHA256 digest is automatically posted to:
643643
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/<commit>/propolis-server.sha256.txt
644-
source.sha256 = "fcdea02123f396e7532726a8ab2534165d68b48b66ba215ab9fe945555daaa6f"
644+
source.sha256 = "8e361311d7f53aaa34c0bd5ee868274703dcbb7380e8dcc06d56c271e1748f41"
645645
output.type = "zone"
646646

647647
[package.mg-ddm-gz]

0 commit comments

Comments
 (0)