add pf skip to gpu nfdhook

This corresponds to the previous gpu-plugin skip code.

Signed-off-by: Ukri Niemimuukko <ukri.niemimuukko@intel.com>

Makefile

@@ -29,7 +29,7 @@ OLM_MANIFESTS = deployments/operator/manifests
 WEBHOOK_IMAGE_FILE = intel-fpga-admissionwebhook-devel.tgz
 
 pkgs  = $(shell $(GO) list ./... | grep -v vendor | grep -v e2e | grep -v envtest)
-cmds = $(shell ls cmd)
+cmds = $(shell ls --ignore=internal cmd)
 e2e_tmp_dir := $(shell mktemp -u -t e2e-tests.XXXXXXXXXX)
 
 all: build

cmd/gpu_nfdhook/labeler.go

@@ -24,6 +24,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/intel/intel-device-plugins-for-kubernetes/cmd/internal/pluginutils"
 	"github.com/pkg/errors"
 	"k8s.io/klog/v2"
 )
@@ -86,6 +87,11 @@ func (l *labeler) scan() ([]string, error) {
 			continue
 		}
 
+		if pluginutils.IsSriovPFwithVFs(path.Join(l.sysfsDRMDir, f.Name())) {
+			klog.V(4).Infof("Skipping PF with VF")
+			continue
+		}
+
 		_, err = os.ReadDir(path.Join(l.sysfsDRMDir, f.Name(), "device/drm"))
 		if err != nil {
 			return gpuNameList, errors.Wrap(err, "Can't read device folder")
@@ -221,10 +227,13 @@ func (l *labeler) createLabels() error {
 		l.labels.addNumericLabel(labelNamespace+"memory.max", int64(memoryAmount))
 	}
 	gpuCount := len(gpuNameList)
-	// add gpu list label (example: "card0.card1.card2")
-	l.labels[labelNamespace+gpuListLabelName] = strings.Join(gpuNameList, ".")
-	// all GPUs get default number of millicores (1000)
-	l.labels.addNumericLabel(labelNamespace+millicoreLabelName, int64(millicoresPerGPU*gpuCount))
+	if gpuCount > 0 {
+		// add gpu list label (example: "card0.card1.card2")
+		l.labels[labelNamespace+gpuListLabelName] = strings.Join(gpuNameList, ".")
+
+		// all GPUs get default number of millicores (1000)
+		l.labels.addNumericLabel(labelNamespace+millicoreLabelName, int64(millicoresPerGPU*gpuCount))
+	}
 
 	return nil
 }

cmd/gpu_nfdhook/labeler_test.go

@@ -63,6 +63,24 @@ func getTestCases() []testcase {
 				"gpu.intel.com/cards":                "card0",
 			},
 		},
+		{
+			sysfsdirs: []string{
+				"card0/device/drm/card0",
+			},
+			sysfsfiles: map[string][]byte{
+				"card0/device/vendor":       []byte("0x8086"),
+				"card0/device/sriov_numvfs": []byte("1"),
+			},
+			name:           "pf with vfs",
+			memoryOverride: 16000000000,
+			capabilityFile: map[string][]byte{
+				"0/i915_capabilities": []byte(
+					"platform: new\n" +
+						"gen: 9"),
+			},
+			expectedRetval: nil,
+			expectedLabels: labelMap{},
+		},
 		{
 			sysfsdirs: []string{
 				"card0/device/drm/card0",
@@ -244,7 +262,7 @@ func TestLabeling(t *testing.T) {
 				t.Errorf("unexpected return value")
 			}
 			if tc.expectedRetval == nil && !reflect.DeepEqual(labeler.labels, tc.expectedLabels) {
-				t.Errorf("label mismatch with expectation:\n%v\n%v\n", labeler.labels, tc.expectedLabels)
+				t.Errorf("test %v label mismatch with expectation:\n%v\n%v\n", tc.name, labeler.labels, tc.expectedLabels)
 			}
 			for filename := range tc.capabilityFile {
 				os.Remove(path.Join(root, filename))

cmd/gpu_plugin/gpu_plugin.go

@@ -29,6 +29,7 @@ import (
 	pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1"
 
 	"github.com/intel/intel-device-plugins-for-kubernetes/cmd/gpu_plugin/rm"
+	"github.com/intel/intel-device-plugins-for-kubernetes/cmd/internal/pluginutils"
 	dpapi "github.com/intel/intel-device-plugins-for-kubernetes/pkg/deviceplugin"
 )
 
@@ -159,8 +160,7 @@ func (dp *devicePlugin) scan() (dpapi.DeviceTree, error) {
 			return nil, errors.Wrap(err, "Can't read device folder")
 		}
 
-		dat, err := os.ReadFile(path.Join(dp.sysfsDir, f.Name(), "device/sriov_numvfs"))
-		isPFwithVFs := (err == nil && strings.TrimSpace(string(dat)) != "0")
+		isPFwithVFs := pluginutils.IsSriovPFwithVFs(path.Join(dp.sysfsDir, f.Name()))
 
 		for _, drmFile := range drmFiles {
 			if dp.controlDeviceReg.MatchString(drmFile.Name()) {

cmd/internal/pluginutils/sriov.go

@@ -0,0 +1,31 @@
+// Copyright 2021 Intel Corporation. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package pluginutils
+
+import (
+	"os"
+	"path"
+	"strings"
+)
+
+func IsSriovPFwithVFs(pfpath string) bool {
+	dat, err := os.ReadFile(path.Join(pfpath, "device/sriov_numvfs"))
+
+	if err == nil && strings.TrimSpace(string(dat)) != "0" {
+		return true
+	}
+
+	return false
+}