Skip to content

fpga: reimplement device discovering #478

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

Merged
merged 1 commit into from
Oct 30, 2020
Merged

fpga: reimplement device discovering #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
70 changes: 5 additions & 65 deletions cmd/fpga_plugin/dfl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,76 +15,19 @@
package main

import (
"fmt"
"os"
"path"
"path/filepath"
"regexp"

"github.com/pkg/errors"
"github.com/intel/intel-device-plugins-for-kubernetes/pkg/fpga"
)

const (
dflDeviceRE = `^region[0-9]+$`
dflPortRE = `^dfl-port\.[0-9]+$`
dflFmeRE = `^dfl-fme\.[0-9]+$`
)

// getDFLRegion reads FME interface id from /sys/fpga/fpga_region/regionX/dfl-fme.k/dfl-fme-region.n/fpga_region/regionN/compat_id.
func (dp *devicePlugin) getDFLRegion(regionFolder string, fme string) (*region, error) {
compatIDPattern := path.Join(regionFolder, fme, "dfl-fme-region.*", "fpga_region", "region*", "compat_id")
matches, err := filepath.Glob(compatIDPattern)
if err != nil {
return nil, err
}
if len(matches) == 0 {
return nil, fmt.Errorf("no compat_id found with pattern '%s'", compatIDPattern)
}
if len(matches) > 1 {
return nil, fmt.Errorf("compat_id path pattern '%s' matches multiple files", compatIDPattern)
}

reg, err := dp.getFME(matches[0], fme)
if err != nil {
return nil, err
}

return reg, nil
}

func getSysFsInfoDFL(dp *devicePlugin, deviceFolder string, deviceFiles []os.FileInfo, fname string) ([]region, []afu, error) {
var regions []region
var afus []afu

for _, deviceFile := range deviceFiles {
name := deviceFile.Name()

if dp.fmeReg.MatchString(name) {
if len(regions) > 0 {
return nil, nil, errors.Errorf("Detected more than one FPGA region for device %s. Only one region per FPGA device is supported", fname)
}

region, err := dp.getDFLRegion(deviceFolder, name)
if err != nil {
return nil, nil, err
}
regions = append(regions, *region)
} else if dp.portReg.MatchString(name) {
afuPath := path.Join(deviceFolder, name, "afu_id")
afu, err := dp.getAFU(afuPath, name)
if err != nil {
return nil, nil, err
}
afus = append(afus, *afu)
}
}

return regions, afus, nil
}

// newDevicePluginDFL returns new instance of devicePlugin.
func newDevicePluginDFL(sysfsDir string, devfsDir string, mode string) (*devicePlugin, error) {
getDevTree, ignoreAfuIDs, annotationValue, err := getPluginParams(mode)
getDevTree, annotationValue, err := getPluginParams(mode)
if err != nil {
return nil, err
}
Expand All @@ -97,13 +40,10 @@ func newDevicePluginDFL(sysfsDir string, devfsDir string, mode string) (*deviceP

deviceReg: regexp.MustCompile(dflDeviceRE),
portReg: regexp.MustCompile(dflPortRE),
fmeReg: regexp.MustCompile(dflFmeRE),

getDevTree: getDevTree,
getSysFsInfo: getSysFsInfoDFL,
getDevTree: getDevTree,
newPort: fpga.NewDflPort,

ignoreEmptyRegions: true,
ignoreAfuIDs: ignoreAfuIDs,
annotationValue: annotationValue,
annotationValue: annotationValue,
}, nil
}
Loading