Skip to content
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

Fix parsing of PCI domains longer than 4 digits #373

Merged
merged 2 commits into from
Sep 5, 2024
Merged

Fix parsing of PCI domains longer than 4 digits #373

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22ffa03
Fix parsing of PCI domains longer than 4 digits
ianb-mp Sep 4, 2024
1ec8162
Fix parsing of PCI domains longer than 4 digits
ianb-mp Sep 4, 2024
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
11 changes: 5 additions & 6 deletions pkg/pci/address/address.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (

var (
regexAddress *regexp.Regexp = regexp.MustCompile(
`^(([0-9a-f]{0,4}):)?([0-9a-f]{2}):([0-9a-f]{2})\.([0-9a-f]{1})$`,
`^(([0-9a-f]{0,8}):)?([0-9a-f]{2}):([0-9a-f]{2})\.([0-9a-f]{1})$`,
Copy link
Owner

Choose a reason for hiding this comment

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

@ianb-mp OK, so to be fully compliant with the PCI-X spec, I believe this needs to be:

^(1?)(([0-9a-f]{0,4}):)?([0-9a-f]{2}):([0-9a-f]{2})\.([0-9a-f]{1})$

Because, according to my research, the domain part of the PCI address is 4 hexadigits OR a 1 followed by 4 hexadigits (for the cases where the PCI extension configuration space is used)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok, I've pushed another commit with that change however moved the 1? inside the existing capture group. I also added a test.

)
)

Expand All @@ -30,12 +30,11 @@ func (addr *Address) String() string {
return addr.Domain + ":" + addr.Bus + ":" + addr.Device + "." + addr.Function
}

// FromString returns an Address struct from an ddress string in either
// $BUS:$DEVICE.$FUNCTION (BDF) format or it can be a full PCI address that
// includes the 4-digit $DOMAIN information as well:
// $DOMAIN:$BUS:$DEVICE.$FUNCTION.
// FromString returns [Address] from an address string in either
// $BUS:$DEVICE.$FUNCTION (BDF) format or a full PCI address that
// includes the $DOMAIN: $DOMAIN:$BUS:$DEVICE.$FUNCTION.
//
// Returns "" if the address string wasn't a valid PCI address.
// If the address string isn't a valid PCI address, then nil is returned.
func FromString(address string) *Address {
addrLowered := strings.ToLower(address)
matches := regexAddress.FindStringSubmatch(addrLowered)
Expand Down
Loading