virtio-devices: Fix cap_len for VIRTIO_PCI_CAP_PCI_CFG - #8238
Merged
rbradford merged 4 commits intoMay 18, 2026
Merged
Conversation
VirtioPciCfgCap::new built its inner header via VirtioPciCap::new, which sized cap_len from the bare virtio_pci_cap layout, yielding 16. The emitted capability is VirtioPciCfgCap, which appends a four byte pci_cfg_data window, so the correct value is 20. The virtio 1.2 specification defines this cap as virtio_pci_cap followed by pci_cfg_data[4] and requires cap_len to cover the whole structure. Build the header inline so cap_len reflects the actual emitted size, matching VirtioPciNotifyCap and VirtioPciCap64. Signed-off-by: Anatol Belski <[email protected]>
Regression test for the cap_len fix. The emitted VirtioPciCfgCap must report cap_len 20, covering the trailing pci_cfg_data window per virtio 1.2 section 4.1.4.9. Signed-off-by: Anatol Belski <[email protected]>
Assert the emitted VirtioPciCfgCap carries cfg_type 5, the value assigned to PciCapabilityType::Pci by virtio 1.2 section 4.1.4.1. Signed-off-by: Anatol Belski <[email protected]>
Assert VirtioPciNotifyCap and VirtioPciCap64 size cap_len from their own type. Catches a future regression of the same shape as the VirtioPciCfgCap one in any of the sibling capabilities. Signed-off-by: Anatol Belski <[email protected]>
phip1611
approved these changes
May 18, 2026
phip1611
left a comment
Member
There was a problem hiding this comment.
LGTM, thanks!
General question: How could the old behavior fail with a Linux or Windows guest? What is a typical failure one would see/expect?
rbradford
approved these changes
May 18, 2026
github-merge-queue
Bot
removed this pull request from the merge queue due to no response for status checks
May 18, 2026
Member
Author
I dug into the driver code and no guest actually uses Thanks |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The VIRTIO_PCI_CAP_PCI_CFG capability was emitted with cap_len 16 instead of 20. With this change cap_len reflects the full capability size, including the trailing pci_cfg_data window.
Per virtio 1.2 section 4.1.4.9, the PCI configuration access capability is a 16 byte virtio_pci_cap followed by a 4 byte pci_cfg_data window, so its declared cap_len must be 20.