opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 02:37:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18644 from swordqiu/hotfix/qj-gpu-class-codes

Browse Source 
fix: extend gpu pci class codes
This commit is contained in:
Zexi Li
2023-11-13 19:19:26 +08:00
committed by GitHub
parent 7ddcafd0fa 66f53fa89e
commit d57764edac
2 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/baremetal/tasks/baseprepare.go
+3 -3
View File
@@ -735,9 +735,9 @@ func getIsolatedDevicesInfo(cli *ssh.Client, ip net.IP) ([]*isolated_device.PCID
bootVgaPath = append(bootVgaPath, strings.TrimSpace(lines[i]))
}
cmd := "lspci -nnmm | egrep '3D|VGA'"
cmd := "lspci -nnmm"
if updatedPciids {
cmd = "lspci -i /pci.ids -nnmm | egrep '3D|VGA'"
cmd = "lspci -i /pci.ids -nnmm"
}
lines, err = cli.Run(cmd)
@@ -748,7 +748,7 @@ func getIsolatedDevicesInfo(cli *ssh.Client, ip net.IP) ([]*isolated_device.PCID
for _, line := range lines {
if len(line) > 0 {
dev := isolated_device.NewPCIDevice2(line)
if len(dev.Addr) > 0 && !isBootVga(cli, dev, bootVgaPath) {
if len(dev.Addr) > 0 && utils.IsInArray(dev.ClassCode, isolated_device.GpuClassCodes) && !isBootVga(cli, dev, bootVgaPath) {
devs = append(devs, dev)
}
}
pkg/hostman/isolated_device/gpu.go
+15 -28
View File
@@ -39,6 +39,16 @@ import (
const (
CLASS_CODE_VGA = "0300"
CLASS_CODE_3D = "0302"
CLASS_CODE_DISP = "0380"
)
var (
GpuClassCodes = []string{
CLASS_CODE_VGA,
CLASS_CODE_3D,
CLASS_CODE_DISP,
}
)
const (
@@ -69,6 +79,9 @@ func getPassthroughGPUS(filteredAddrs []string) ([]*PCIDevice, error, []error) {
if utils.IsInStringArray(dev.Addr, filteredAddrs) {
continue
}
if !utils.IsInArray(dev.ClassCode, GpuClassCodes) {
continue
}
if err := dev.checkSameIOMMUGroupDevice(); err != nil {
warns = append(warns, errors.Wrapf(err, "get dev %s iommu group devices", dev.Addr))
continue
@@ -96,7 +109,7 @@ func getPassthroughGPUS(filteredAddrs []string) ([]*PCIDevice, error, []error) {
}
func getGPUPCIStr() ([]string, error) {
cmd := "lspci -nnmm | egrep '3D|VGA'"
cmd := "lspci -nnmm"
ret, err := bashOutput(cmd)
if err != nil {
return nil, err
@@ -236,32 +249,6 @@ func (gpu *sGPUHPCDevice) GetPassthroughCmd(index int) string {
return fmt.Sprintf(" -device vfio-pci,host=%s,multifunction=on", gpu.GetAddr())
}
func gpuPCIString() ([]string, error) {
lines, err := bashOutput("lspci -nnmm | egrep '3D|VGA'")
if err != nil {
return nil, fmt.Errorf("Get GPU PCI: %v", err)
}
ret := []string{}
for _, line := range lines {
if len(line) != 0 {
ret = append(ret, line)
}
}
return ret, nil
}
func gpuPCIAddr() ([]string, error) {
lines, err := gpuPCIString()
if err != nil {
return nil, err
}
addrs := []string{}
for _, line := range lines {
addrs = append(addrs, strings.Split(line, " ")[0])
}
return addrs, nil
}
// parseLspci parse one line output of `lspci -nnmm`
func parseLspci(line string) *PCIDevice {
itemRegex := `(?P<bus_id>(` + BUSID_REGEX + `))` +
@@ -329,7 +316,7 @@ func (d *PCIDevice) IsBootVGA() (bool, error) {
}
func (d *PCIDevice) forceBindVFIOPCIDriver(useBootVGA bool) error {
if !utils.IsInStringArray(d.ClassCode, []string{CLASS_CODE_VGA, CLASS_CODE_3D}) {
if !utils.IsInArray(d.ClassCode, GpuClassCodes) {
return nil
}
isBootVGA, err := d.IsBootVGA()