Skip to content

source/pci: Group identical PCI entries #2031

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.

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
31 changes: 30 additions & 1 deletion source/pci/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ limitations under the License.
package pci

import (
"bytes"
"encoding/json"
"fmt"
"os"
"path/filepath"
Expand Down Expand Up @@ -68,6 +70,11 @@ func readPciDevInfo(devPath string) (*nfdv1alpha1.InstanceFeature, error) {
return nfdv1alpha1.NewInstanceFeature(attrs), nil
}

type DevGroupedEntry struct {
Count int
Bytes []byte
}

// detectPci detects available PCI devices and retrieves their device attributes.
// An error is returned if reading any of the mandatory attributes fails.
func detectPci() ([]nfdv1alpha1.InstanceFeature, error) {
Expand All @@ -80,13 +87,35 @@ func detectPci() ([]nfdv1alpha1.InstanceFeature, error) {

// Iterate over devices
devInfo := make([]nfdv1alpha1.InstanceFeature, 0, len(devices))
devGrouped := make(map[string]map[string]DevGroupedEntry)
for _, device := range devices {
info, err := readPciDevInfo(filepath.Join(sysfsBasePath, device.Name()))
if err != nil {
klog.ErrorS(err, "failed to read PCI device info")
continue
}
devInfo = append(devInfo, *info)

b, err := json.Marshal(info.Attributes)
Copy link
Contributor

Choose a reason for hiding this comment

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

Wondering is there any benefit of having the vendor-device map[string]map[string]? What if just using b (or a hash of it) as a key to map[string]DevGroupedEntry (where DevGroupedEntry would contain the Count plus the nfdv1alpha1.InstanceFeature)?

if err != nil {
return nil, err
}

if entry, ok := devGrouped[info.Attributes["vendor"]][info.Attributes["device"]]; !ok {
devGrouped[info.Attributes["vendor"]] = make(map[string]DevGroupedEntry)
devGrouped[info.Attributes["vendor"]][info.Attributes["device"]] = DevGroupedEntry{Bytes: b, Count: 1}
devInfo = append(devInfo, *info)
} else {
result := bytes.Compare(b, devGrouped[info.Attributes["vendor"]][info.Attributes["device"]].Bytes)
if result == 0 {
entry.Count += 1
devGrouped[info.Attributes["vendor"]][info.Attributes["device"]] = entry
}
}
}

for _, dev := range devInfo {
entry := devGrouped[dev.Attributes["vendor"]][dev.Attributes["device"]]
dev.Attributes["count"] = string(entry.Count)
Copy link
Contributor

Choose a reason for hiding this comment

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

Need to use strconv for this

}

return devInfo, nil
Expand Down