qat: 4xxx: split generic resource to compression and crypto

Signed-off-by: Mikko Ylinen <[email protected]>

Author: mythi

cmd/qat_plugin/dpdkdrv/dpdkdrv.go

@@ -24,6 +24,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/go-ini/ini"
 	"github.com/pkg/errors"
 
 	"k8s.io/klog/v2"
@@ -49,6 +50,9 @@ const (
 
 	// Period of device scans.
 	scanPeriod = 5 * time.Second
+
+	// Resource name to use when device capabilities are not available.
+	defaultCapabilities = "generic"
 )
 
 // QAT PCI VF Device ID -> kernel QAT VF device driver mappings.
@@ -249,6 +253,57 @@ func (dp *DevicePlugin) getDpdkMounts(dpdkDeviceName string) []pluginapi.Mount {
 	}
 }
 
+func getDeviceCapabilities(device string) string {
+	devID, err := getDeviceID(device)
+	if err != nil {
+		return defaultCapabilities
+	}
+
+	devicesWithCapabilities := map[string]struct{}{
+		"4941": {},
+	}
+
+	if _, ok := devicesWithCapabilities[devID]; !ok {
+		return defaultCapabilities
+	}
+
+	pfDev, err := filepath.EvalSymlinks(filepath.Join(device, "physfn"))
+	if err != nil {
+		klog.Warningf("failed to get PF device ID for %s: %q", filepath.Base(device), err)
+		return defaultCapabilities
+	}
+
+	// TODO: check the sysfs state entry first when it lands.
+
+	lOpts := ini.LoadOptions{
+		IgnoreInlineComment: true,
+	}
+
+	devCfgPath := filepath.Join(filepath.Dir(filepath.Join(pfDev, "../../../")), "kernel/debug",
+		fmt.Sprintf("qat_4xxx_%s/dev_cfg", filepath.Base(pfDev)))
+
+	devCfg, err := ini.LoadSources(lOpts, devCfgPath)
+	if err != nil {
+		klog.Warningf("failed to read dev_cfg for %s: %q", filepath.Base(pfDev), err)
+		return defaultCapabilities
+	}
+
+	switch devCfg.Section("GENERAL").Key("ServicesEnabled").String() {
+	case "sym;asym":
+		return "cy"
+	case "asym;sym":
+		return "cy"
+	case "dc":
+		return "dc"
+	case "sym":
+		return "sym"
+	case "asym":
+		return "asym"
+	default:
+		return defaultCapabilities
+	}
+}
+
 func getDeviceID(device string) (string, error) {
 	devID, err := os.ReadFile(filepath.Join(device, "device"))
 	if err != nil {
@@ -423,16 +478,18 @@ func (dp *DevicePlugin) scan() (dpapi.DeviceTree, error) {
 			return nil, err
 		}
 
-		klog.V(1).Infof("Device %s found", vfBdf)
-
 		n = n + 1
 		envs := map[string]string{
 			fmt.Sprintf("%s%d", envVarPrefix, n): vfBdf,
 		}
 
+		cap := getDeviceCapabilities(vfDevice)
+
+		klog.V(1).Infof("Device %s with capabilities %s found", vfBdf, cap)
+
 		devinfo := dpapi.NewDeviceInfo(pluginapi.Healthy, dp.getDpdkDeviceSpecs(dpdkDeviceName), dp.getDpdkMounts(dpdkDeviceName), envs, nil)
 
-		devTree.AddDevice("generic", vfBdf, devinfo)
+		devTree.AddDevice(cap, vfBdf, devinfo)
 	}
 
 	return devTree, nil

cmd/qat_plugin/dpdkdrv/dpdkdrv_test.go

@@ -387,6 +387,66 @@ func TestScan(t *testing.T) {
 			maxDevNum:      1,
 			expectedDevNum: 1,
 		},
+		{
+			name:            "vfio-pci DPDKdriver with no kernel bound driver and where vfdevID is equal to qatDevId (4941), PF with dc capabilities",
+			dpdkDriver:      "vfio-pci",
+			kernelVfDrivers: []string{"4xxxvf"},
+			dirs: []string{
+				"sys/bus/pci/drivers/4xxx",
+				"sys/bus/pci/drivers/vfio-pci",
+				"sys/bus/pci/devices/0000:02:00.0",
+				"sys/kernel/debug/qat_4xxx_0000:02:00.0",
+				"sys/bus/pci/devices/0000:02:01.0",
+			},
+			files: map[string][]byte{
+				"sys/bus/pci/devices/0000:02:00.0/device":        []byte("0x4940"),
+				"sys/kernel/debug/qat_4xxx_0000:02:00.0/dev_cfg": []byte("[GENERAL]\nServicesEnabled = dc"),
+				"sys/bus/pci/devices/0000:02:01.0/device":        []byte("0x4941"),
+			},
+			symlinks: map[string]string{
+				"sys/bus/pci/devices/0000:02:01.0/iommu_group": "sys/kernel/iommu_groups/vfiotestfile",
+				"sys/bus/pci/devices/0000:02:01.0/physfn":      "sys/bus/pci/devices/0000:02:00.0",
+				"sys/bus/pci/drivers/4xxx/0000:02:00.0":        "sys/bus/pci/devices/0000:02:00.0",
+				"sys/bus/pci/devices/0000:02:00.0/virtfn0":     "sys/bus/pci/devices/0000:02:01.0",
+			},
+			maxDevNum:      1,
+			expectedDevNum: 1,
+		},
+		{
+			name:            "vfio-pci DPDKdriver with no kernel bound driver and where vfdevID is equal to qatDevId (4941), two PFs with dc and cy capabilities",
+			dpdkDriver:      "vfio-pci",
+			kernelVfDrivers: []string{"4xxxvf"},
+			dirs: []string{
+				"sys/bus/pci/drivers/4xxx",
+				"sys/bus/pci/drivers/vfio-pci",
+				"sys/bus/pci/devices/0000:02:00.0",
+				"sys/bus/pci/devices/0000:03:00.0",
+				"sys/kernel/debug/qat_4xxx_0000:02:00.0",
+				"sys/kernel/debug/qat_4xxx_0000:03:00.0",
+				"sys/bus/pci/devices/0000:02:01.0",
+				"sys/bus/pci/devices/0000:03:01.0",
+			},
+			files: map[string][]byte{
+				"sys/bus/pci/devices/0000:02:00.0/device":        []byte("0x4940"),
+				"sys/bus/pci/devices/0000:03:00.0/device":        []byte("0x4940"),
+				"sys/kernel/debug/qat_4xxx_0000:02:00.0/dev_cfg": []byte("[GENERAL]\nServicesEnabled = dc"),
+				"sys/kernel/debug/qat_4xxx_0000:03:00.0/dev_cfg": []byte("[GENERAL]\nServicesEnabled = sym;asym"),
+				"sys/bus/pci/devices/0000:02:01.0/device":        []byte("0x4941"),
+				"sys/bus/pci/devices/0000:03:01.0/device":        []byte("0x4941"),
+			},
+			symlinks: map[string]string{
+				"sys/bus/pci/devices/0000:02:01.0/iommu_group": "sys/kernel/iommu_groups/vfiotestfile",
+				"sys/bus/pci/devices/0000:03:01.0/iommu_group": "sys/kernel/iommu_groups/vfiotestfile2",
+				"sys/bus/pci/devices/0000:02:01.0/physfn":      "sys/bus/pci/devices/0000:02:00.0",
+				"sys/bus/pci/devices/0000:03:01.0/physfn":      "sys/bus/pci/devices/0000:03:00.0",
+				"sys/bus/pci/drivers/4xxx/0000:02:00.0":        "sys/bus/pci/devices/0000:02:00.0",
+				"sys/bus/pci/drivers/4xxx/0000:03:00.0":        "sys/bus/pci/devices/0000:03:00.0",
+				"sys/bus/pci/devices/0000:02:00.0/virtfn0":     "sys/bus/pci/devices/0000:02:01.0",
+				"sys/bus/pci/devices/0000:03:00.0/virtfn0":     "sys/bus/pci/devices/0000:03:01.0",
+			},
+			maxDevNum:      2,
+			expectedDevNum: 2,
+		},
 	}
 	for _, tt := range tcases {
 		t.Run(tt.name, func(t *testing.T) {
@@ -419,8 +479,12 @@ func TestScan(t *testing.T) {
 			if !tt.expectedErr && err != nil {
 				t.Errorf("got unexpected error: %+v", err)
 			}
-			if len(fN.tree["generic"]) != tt.expectedDevNum {
-				t.Errorf("expected %d, but got %d devices", tt.expectedDevNum, len(fN.tree["generic"]))
+			devNum := 0
+			for _, resource := range fN.tree {
+				devNum = devNum + len(resource)
+			}
+			if devNum != tt.expectedDevNum {
+				t.Errorf("expected %d, but got %d devices", tt.expectedDevNum, devNum)
 			}
 
 			if err = os.RemoveAll(tmpdir); err != nil {