lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-07-01 02:24:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11711 from zexi/hotfix/host-gpu-iommu-group

Browse Source 
fix(host): find same vendor iommu_group devices
This commit is contained in:
yunion-ci-robot
2021-07-25 00:13:31 +08:00
committed by GitHub
parent 4d71dc11cf 675fc64fa1
commit f5a0fbc920
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/hostman/isolated_device/isolated_device.go
View File

@@ -531,7 +531,7 @@ func (d *PCIDevice) checkSameIOMMUGroupDevice() error {
if err != nil {
return fmt.Errorf("IOMMUGroup FindSameGroupDevs: %v", err)
}
d.RestIOMMUGroupDevs = group.FindSameGroupDevs(d.Addr)
d.RestIOMMUGroupDevs = group.FindSameGroupDevs(d.Addr, d.VendorId)
return nil
}
@@ -690,7 +690,7 @@ func NewIOMMUGroup() (*IOMMUGroup, error) {
return &IOMMUGroup{group: dict}, nil
}
func (g *IOMMUGroup) ListDevices(groupNum, selfAddr string) []*PCIDevice {
func (g *IOMMUGroup) ListDevices(groupNum, selfAddr, vendorId string) []*PCIDevice {
ret := []string{}
for busId, group := range g.group {
if groupNum == group {
@@ -705,13 +705,17 @@ func (g *IOMMUGroup) ListDevices(groupNum, selfAddr string) []*PCIDevice {
}
dev, _ := detectPCIDevByAddrWithoutIOMMUGroup(addr[5:])
if dev != nil {
devs = append(devs, dev)
if dev.VendorId == vendorId {
devs = append(devs, dev)
} else {
log.Warningf("Skip append %q iommu_group[%s] device %s", selfAddr, groupNum, dev.String())
}
}
}
return devs
}
func (g *IOMMUGroup) FindSameGroupDevs(devAddr string) []*PCIDevice {
func (g *IOMMUGroup) FindSameGroupDevs(devAddr string, vendorId string) []*PCIDevice {
// devAddr: '0000:3f:0f.3' or '3f:0f.3' format
if len(devAddr) == 7 {
devAddr = fmt.Sprintf("0000:%s", devAddr)
@@ -720,7 +724,7 @@ func (g *IOMMUGroup) FindSameGroupDevs(devAddr string) []*PCIDevice {
if !ok {
return nil
}
return g.ListDevices(group, devAddr)
return g.ListDevices(group, devAddr, vendorId)
}
func (g *IOMMUGroup) String() string {