Skip to content

Commit ccae3b5

Browse files
stswidwinskimeta-codesync[bot]
authored andcommitted
Back out "Bump zvariant 5.10.0 -> 5.11.0"
Summary: Original commit changeset: ff6ffa984687 Original Phabricator Diff: D105493286 | thatch_vm package | build revision | zbus | zvariant | zvariant_utils | |---|---|---:|---:|---:| | cb4831ad4c2552b3d74ffe3f148f5aa5 | a3f3bd8ce082... | 5.14.0 | 5.10.0 | 3.3.0 | | 334a70dff51b96d3e05190c3cb07f58b | f4ce8ade3a82... | 5.15.0 | 5.11.0 | 3.3.1 | The dependency move appears to be D105493286 / ff6ffa984687: [3p][rust] Bump zvariant 5.10.0 -> 5.11.0. systemd-zbus stayed at 5.3.2, but it depends on the zbus:5 and zvariant:5 aliases, so it started building against the newer stack. ## Observed failure: - Process: thatch_vm - Signal: SIGSEGV, SEGV_MAPERR, address 0x0 - Dominant path: Thatch systemd D-Bus calls via systemd-zbus -> zbus -> zvariant - Not a panic/unwind issue: almost all cores have no real panic/unwind frames. Concrete LLDB evidence from core b3muvkcl20zi3jkt: siginfo.si_code = SEGV_MAPERR siginfo.si_addr = 0x0 saved RDI = 0x0 <zvariant_utils::signature::Signature>::string_len+16: movq (%rdi), %rcx Source path: - zbus builds its own D-Bus Hello message in fbsource/third-party/rust/vendor/zbus-5.15.0/src/connection/handshake/client.rs:225 - it calls .build(&()) - header serialization serializes string-valued fields as D-Bus variants - Value::Str asks for &Signature::Str - serializing Signature calls fbsource/third-party/rust/vendor/zvariant_utils-3.3.1/src/signature/mod.rs:124 - the self pointer is null Why this points at the dependency stack: - The crashing Hello message is zbus-internal and has no Thatch payload. - &Signature::Str should be a static non-null reference. A null &Signature should be impossible through the safe API. - The exact faulting frame is in the newly selected zvariant_utils-3.3.1. - The prior Thatch package used zbus 5.14.0 / zvariant 5.10.0 / zvariant_utils 3.3.0 and did not show this coredump volume. https://fburl.com/scuba/coredumper/3gssuuxy Reviewed By: Imxset21, cooperlees Differential Revision: D106544871 fbshipit-source-id: a5012e73399f89e7dd217efdcae8a4ba991c0b21
1 parent a79e5ae commit ccae3b5

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

eden/fs/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ warp = { git = "https://github.com/jdthomas/warp.git", rev = "c794232d182abaa3ad
7171
wezterm-color-types = { git = "https://github.com/wezterm/wezterm.git", rev = "05343b387085842b434d267f91b6b0ec157e4331" }
7272
wezterm-dynamic = { git = "https://github.com/wezterm/wezterm.git", rev = "05343b387085842b434d267f91b6b0ec157e4331" }
7373
wezterm-input-types = { git = "https://github.com/wezterm/wezterm.git", rev = "05343b387085842b434d267f91b6b0ec157e4331" }
74-
zbus = { git = "https://github.com/z-galaxy/zbus", rev = "db642298a0567a9c7f3afd735014ae7803fe8615" }
75-
zbus_macros = { git = "https://github.com/z-galaxy/zbus", rev = "db642298a0567a9c7f3afd735014ae7803fe8615" }
76-
zvariant = { git = "https://github.com/z-galaxy/zbus", rev = "db642298a0567a9c7f3afd735014ae7803fe8615" }
77-
zvariant_derive = { git = "https://github.com/z-galaxy/zbus", rev = "db642298a0567a9c7f3afd735014ae7803fe8615" }
74+
zbus = { git = "https://github.com/z-galaxy/zbus", rev = "40d8995fa012652c1b1e1e9bd96e54327024be09" }
75+
zbus_macros = { git = "https://github.com/z-galaxy/zbus", rev = "40d8995fa012652c1b1e1e9bd96e54327024be09" }
76+
zvariant = { git = "https://github.com/z-galaxy/zbus", rev = "40d8995fa012652c1b1e1e9bd96e54327024be09" }
77+
zvariant_derive = { git = "https://github.com/z-galaxy/zbus", rev = "40d8995fa012652c1b1e1e9bd96e54327024be09" }
7878

7979
[patch."https://github.com/milvus-io/rust-stemmers.git"]
8080
rust-stemmers = { git = "https://github.com/fbsource/rust-stemmers", rev = "3b2545218f76e797baecbf91fa1cbd2c0db60726" }

eden/mononoke/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ warp = { git = "https://github.com/jdthomas/warp.git", rev = "c794232d182abaa3ad
5757
wezterm-color-types = { git = "https://github.com/wezterm/wezterm.git", rev = "05343b387085842b434d267f91b6b0ec157e4331" }
5858
wezterm-dynamic = { git = "https://github.com/wezterm/wezterm.git", rev = "05343b387085842b434d267f91b6b0ec157e4331" }
5959
wezterm-input-types = { git = "https://github.com/wezterm/wezterm.git", rev = "05343b387085842b434d267f91b6b0ec157e4331" }
60-
zbus = { git = "https://github.com/z-galaxy/zbus", rev = "db642298a0567a9c7f3afd735014ae7803fe8615" }
61-
zbus_macros = { git = "https://github.com/z-galaxy/zbus", rev = "db642298a0567a9c7f3afd735014ae7803fe8615" }
62-
zvariant = { git = "https://github.com/z-galaxy/zbus", rev = "db642298a0567a9c7f3afd735014ae7803fe8615" }
63-
zvariant_derive = { git = "https://github.com/z-galaxy/zbus", rev = "db642298a0567a9c7f3afd735014ae7803fe8615" }
60+
zbus = { git = "https://github.com/z-galaxy/zbus", rev = "40d8995fa012652c1b1e1e9bd96e54327024be09" }
61+
zbus_macros = { git = "https://github.com/z-galaxy/zbus", rev = "40d8995fa012652c1b1e1e9bd96e54327024be09" }
62+
zvariant = { git = "https://github.com/z-galaxy/zbus", rev = "40d8995fa012652c1b1e1e9bd96e54327024be09" }
63+
zvariant_derive = { git = "https://github.com/z-galaxy/zbus", rev = "40d8995fa012652c1b1e1e9bd96e54327024be09" }
6464

6565
[patch."https://github.com/milvus-io/rust-stemmers.git"]
6666
rust-stemmers = { git = "https://github.com/fbsource/rust-stemmers", rev = "3b2545218f76e797baecbf91fa1cbd2c0db60726" }

0 commit comments

Comments
 (0)