build(deps): bump github.com/intel/goresctrl from 0.3.0 to 0.5.0

Bumps [github.com/intel/goresctrl](https://github.com/intel/goresctrl) from 0.3.0 to 0.5.0.
- [Release notes](https://github.com/intel/goresctrl/releases)
- [Commits](https://github.com/intel/goresctrl/compare/v0.3.0...v0.5.0)

---
updated-dependencies:
- dependency-name: github.com/intel/goresctrl
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

vendor/github.com/intel/goresctrl/pkg/cgroups/cgroupblkio.go

@@ -15,11 +15,10 @@
 package cgroups
 
 import (
+	"errors"
 	"fmt"
 	"strconv"
 	"strings"
-
-	"github.com/hashicorp/go-multierror"
 )
 
 // cgroups blkio parameter filenames.
@@ -35,9 +34,10 @@ var blkioThrottleWriteIOPSFiles = []string{"blkio.throttle.write_iops_device"}
 // Effects of Weight and Rate values in SetBlkioParameters():
 // Value  |  Effect
 // -------+-------------------------------------------------------------------
-//    -1  |  Do not write to cgroups, value is missing.
-//     0  |  Write to cgroups, will clear the setting as specified in cgroups blkio interface.
-//  other |  Write to cgroups, sets the value.
+//
+//	  -1  |  Do not write to cgroups, value is missing.
+//	   0  |  Write to cgroups, will clear the setting as specified in cgroups blkio interface.
+//	other |  Write to cgroups, sets the value.
 type BlockIOParameters struct {
 	Weight                  int64
 	WeightDevice            DeviceWeights
@@ -142,7 +142,7 @@ type devMajMin struct {
 
 // ResetBlkioParameters adds new, changes existing and removes missing blockIO parameters in cgroupsDir.
 func ResetBlkioParameters(groupDir string, blockIO BlockIOParameters) error {
-	var errors *multierror.Error
+	errs := []error{}
 	oldBlockIO, _ := GetBlkioParameters(groupDir)
 	newBlockIO := NewBlockIOParameters()
 	newBlockIO.Weight = blockIO.Weight
@@ -151,8 +151,8 @@ func ResetBlkioParameters(groupDir string, blockIO BlockIOParameters) error {
 	newBlockIO.ThrottleWriteBpsDevice = resetDevRates(oldBlockIO.ThrottleWriteBpsDevice, blockIO.ThrottleWriteBpsDevice)
 	newBlockIO.ThrottleReadIOPSDevice = resetDevRates(oldBlockIO.ThrottleReadIOPSDevice, blockIO.ThrottleReadIOPSDevice)
 	newBlockIO.ThrottleWriteIOPSDevice = resetDevRates(oldBlockIO.ThrottleWriteIOPSDevice, blockIO.ThrottleWriteIOPSDevice)
-	errors = multierror.Append(errors, SetBlkioParameters(groupDir, newBlockIO))
-	return errors.ErrorOrNil()
+	errs = append(errs, SetBlkioParameters(groupDir, newBlockIO))
+	return errors.Join(errs...)
 }
 
 // resetDevWeights adds wanted weight parameters to new and resets unwanted weights.
@@ -189,16 +189,16 @@ func resetDevRates(old, wanted []DeviceRate) []DeviceRate {
 
 // GetBlkioParameters returns BlockIO parameters from files in cgroups blkio controller directory.
 func GetBlkioParameters(group string) (BlockIOParameters, error) {
-	var errors *multierror.Error
+	errs := []error{}
 	blockIO := NewBlockIOParameters()
 
-	errors = multierror.Append(errors, readWeight(group, blkioWeightFiles, &blockIO.Weight))
-	errors = multierror.Append(errors, readDeviceParameters(group, blkioWeightDeviceFiles, &blockIO.WeightDevice))
-	errors = multierror.Append(errors, readDeviceParameters(group, blkioThrottleReadBpsFiles, &blockIO.ThrottleReadBpsDevice))
-	errors = multierror.Append(errors, readDeviceParameters(group, blkioThrottleWriteBpsFiles, &blockIO.ThrottleWriteBpsDevice))
-	errors = multierror.Append(errors, readDeviceParameters(group, blkioThrottleReadIOPSFiles, &blockIO.ThrottleReadIOPSDevice))
-	errors = multierror.Append(errors, readDeviceParameters(group, blkioThrottleWriteIOPSFiles, &blockIO.ThrottleWriteIOPSDevice))
-	return blockIO, errors.ErrorOrNil()
+	errs = append(errs, readWeight(group, blkioWeightFiles, &blockIO.Weight))
+	errs = append(errs, readDeviceParameters(group, blkioWeightDeviceFiles, &blockIO.WeightDevice))
+	errs = append(errs, readDeviceParameters(group, blkioThrottleReadBpsFiles, &blockIO.ThrottleReadBpsDevice))
+	errs = append(errs, readDeviceParameters(group, blkioThrottleWriteBpsFiles, &blockIO.ThrottleWriteBpsDevice))
+	errs = append(errs, readDeviceParameters(group, blkioThrottleReadIOPSFiles, &blockIO.ThrottleReadIOPSDevice))
+	errs = append(errs, readDeviceParameters(group, blkioThrottleWriteIOPSFiles, &blockIO.ThrottleWriteIOPSDevice))
+	return blockIO, errors.Join(errs...)
 }
 
 // readWeight parses int64 from a cgroups entry.
@@ -217,7 +217,7 @@ func readWeight(groupDir string, filenames []string, rv *int64) error {
 
 // readDeviceParameters parses device lines used for weights and throttling rates.
 func readDeviceParameters(groupDir string, filenames []string, params DeviceParameters) error {
-	var errors *multierror.Error
+	errs := []error{}
 	contents, err := readFirstFile(groupDir, filenames)
 	if err != nil {
 		return err
@@ -230,38 +230,38 @@ func readDeviceParameters(groupDir string, filenames []string, params DevicePara
 		// Expect syntax MAJOR:MINOR VALUE
 		devVal := strings.Split(line, " ")
 		if len(devVal) != 2 {
-			errors = multierror.Append(errors, fmt.Errorf("invalid line %q, single space expected", line))
+			errs = append(errs, fmt.Errorf("invalid line %q, single space expected", line))
 			continue
 		}
 		majMin := strings.Split(devVal[0], ":")
 		if len(majMin) != 2 {
-			errors = multierror.Append(errors, fmt.Errorf("invalid line %q, single colon expected before space", line))
+			errs = append(errs, fmt.Errorf("invalid line %q, single colon expected before space", line))
 			continue
 		}
 		major, majErr := strconv.ParseInt(majMin[0], 10, 64)
 		minor, minErr := strconv.ParseInt(majMin[1], 10, 64)
 		value, valErr := strconv.ParseInt(devVal[1], 10, 64)
 		if majErr != nil || minErr != nil || valErr != nil {
-			errors = multierror.Append(errors, fmt.Errorf("invalid number when parsing \"major:minor value\" from \"%s:%s %s\"", majMin[0], majMin[1], devVal[1]))
+			errs = append(errs, fmt.Errorf("invalid number when parsing \"major:minor value\" from \"%s:%s %s\"", majMin[0], majMin[1], devVal[1]))
 			continue
 		}
 		params.Append(major, minor, value)
 	}
-	return errors.ErrorOrNil()
+	return errors.Join(errs...)
 }
 
 // readFirstFile returns contents of the first successfully read entry.
 func readFirstFile(groupDir string, filenames []string) (string, error) {
-	var errors *multierror.Error
+	errs := []error{}
 	// If reading all the files fails, return list of read errors.
 	for _, filename := range filenames {
 		content, err := Blkio.Group(groupDir).Read(filename)
 		if err == nil {
 			return content, nil
 		}
-		errors = multierror.Append(errors, err)
+		errs = append(errs, err)
 	}
-	err := errors.ErrorOrNil()
+	err := errors.Join(errs...)
 	if err != nil {
 		return "", fmt.Errorf("could not read any of files %q: %w", filenames, err)
 	}
@@ -270,40 +270,40 @@ func readFirstFile(groupDir string, filenames []string) (string, error) {
 
 // SetBlkioParameters writes BlockIO parameters to files in cgroups blkio contoller directory.
 func SetBlkioParameters(group string, blockIO BlockIOParameters) error {
-	var errors *multierror.Error
+	errs := []error{}
 	if blockIO.Weight >= 0 {
-		errors = multierror.Append(errors, writeFirstFile(group, blkioWeightFiles, "%d", blockIO.Weight))
+		errs = append(errs, writeFirstFile(group, blkioWeightFiles, "%d", blockIO.Weight))
 	}
 	for _, wd := range blockIO.WeightDevice {
-		errors = multierror.Append(errors, writeFirstFile(group, blkioWeightDeviceFiles, "%d:%d %d", wd.Major, wd.Minor, wd.Weight))
+		errs = append(errs, writeFirstFile(group, blkioWeightDeviceFiles, "%d:%d %d", wd.Major, wd.Minor, wd.Weight))
 	}
 	for _, rd := range blockIO.ThrottleReadBpsDevice {
-		errors = multierror.Append(errors, writeFirstFile(group, blkioThrottleReadBpsFiles, "%d:%d %d", rd.Major, rd.Minor, rd.Rate))
+		errs = append(errs, writeFirstFile(group, blkioThrottleReadBpsFiles, "%d:%d %d", rd.Major, rd.Minor, rd.Rate))
 	}
 	for _, rd := range blockIO.ThrottleWriteBpsDevice {
-		errors = multierror.Append(errors, writeFirstFile(group, blkioThrottleWriteBpsFiles, "%d:%d %d", rd.Major, rd.Minor, rd.Rate))
+		errs = append(errs, writeFirstFile(group, blkioThrottleWriteBpsFiles, "%d:%d %d", rd.Major, rd.Minor, rd.Rate))
 	}
 	for _, rd := range blockIO.ThrottleReadIOPSDevice {
-		errors = multierror.Append(errors, writeFirstFile(group, blkioThrottleReadIOPSFiles, "%d:%d %d", rd.Major, rd.Minor, rd.Rate))
+		errs = append(errs, writeFirstFile(group, blkioThrottleReadIOPSFiles, "%d:%d %d", rd.Major, rd.Minor, rd.Rate))
 	}
 	for _, rd := range blockIO.ThrottleWriteIOPSDevice {
-		errors = multierror.Append(errors, writeFirstFile(group, blkioThrottleWriteIOPSFiles, "%d:%d %d", rd.Major, rd.Minor, rd.Rate))
+		errs = append(errs, writeFirstFile(group, blkioThrottleWriteIOPSFiles, "%d:%d %d", rd.Major, rd.Minor, rd.Rate))
 	}
-	return errors.ErrorOrNil()
+	return errors.Join(errs...)
 }
 
 // writeFirstFile writes content to the first existing file in the list under groupDir.
 func writeFirstFile(groupDir string, filenames []string, format string, args ...interface{}) error {
-	var errors *multierror.Error
+	errs := []error{}
 	// Returns list of errors from writes, list of single error due to all filenames missing or nil on success.
 	for _, filename := range filenames {
 		if err := Blkio.Group(groupDir).Write(filename, format, args...); err != nil {
-			errors = multierror.Append(errors, err)
+			errs = append(errs, err)
 			continue
 		}
 		return nil
 	}
-	err := errors.ErrorOrNil()
+	err := errors.Join(errs...)
 	if err != nil {
 		data := fmt.Sprintf(format, args...)
 		return fmt.Errorf("writing all files %v failed, errors: %w, content %q", filenames, err, data)

vendor/github.com/intel/goresctrl/pkg/cgroups/cgroupcontrol.go

@@ -31,7 +31,7 @@ type Controller int
 // Group represents a control group.
 type Group string
 
-//nolint
+// nolint
 const (
 	// UnkownController represents a controller of unknown type.
 	UnknownController Controller = iota
@@ -105,7 +105,7 @@ func (c Controller) String() string {
 
 // Path returns the absolute path of the given controller.
 func (c Controller) Path() string {
-	return path.Join(mountDir, c.String())
+	return cgroupPath(c.String())
 }
 
 // RelPath returns the relative path of the given controller.
@@ -115,7 +115,7 @@ func (c Controller) RelPath() string {
 
 // Group returns the given group for the controller.
 func (c Controller) Group(group string) Group {
-	return Group(path.Join(mountDir, c.String(), group))
+	return Group(cgroupPath(c.String(), group))
 }
 
 // AsGroup returns the group for the given absolute directory path.
@@ -125,7 +125,7 @@ func AsGroup(absDir string) Group {
 
 // Controller returns the controller for the group.
 func (g Group) Controller() Controller {
-	relPath := strings.TrimPrefix(string(g), mountDir+"/")
+	relPath := strings.TrimPrefix(string(g), cgroupPath()+"/")
 	split := strings.SplitN(relPath, "/", 2)
 	if len(split) > 0 {
 		return controllerDirs[split[0]]
@@ -232,6 +232,6 @@ func (g Group) writePids(entry string, pids ...string) error {
 
 // error returns a formatted group-specific error.
 func (g Group) errorf(format string, args ...interface{}) error {
-	name := strings.TrimPrefix(string(g), mountDir+"/")
+	name := strings.TrimPrefix(string(g), cgroupPath()+"/")
 	return fmt.Errorf("cgroup "+name+": "+format, args...)
 }

vendor/github.com/intel/goresctrl/pkg/cgroups/cgrouppath.go

@@ -15,11 +15,10 @@
 package cgroups
 
 import (
-	"path"
-	"path/filepath"
+	goresctrlpath "github.com/intel/goresctrl/pkg/path"
 )
 
-//nolint
+// nolint
 const (
 	// Tasks is a cgroup's "tasks" entry.
 	Tasks = "tasks"
@@ -37,39 +36,18 @@ const (
 	CpusetMems = "cpuset.mems"
 )
 
-var (
-	// mount is the parent directory for per-controller cgroupfs mounts.
-	mountDir = "/sys/fs/cgroup"
-	// v2Dir is the parent directory for per-controller cgroupfs mounts.
-	v2Dir = path.Join(mountDir, "unified")
-	// KubeletRoot is the --cgroup-root option the kubelet is running with.
-	KubeletRoot = ""
-)
+const cgroupBasePath = "sys/fs/cgroup"
 
 // GetMountDir returns the common mount point for cgroup v1 controllers.
 func GetMountDir() string {
-	return mountDir
-}
-
-// SetMountDir sets the common mount point for the cgroup v1 controllers.
-func SetMountDir(dir string) {
-	v2, _ := filepath.Rel(mountDir, v2Dir)
-	mountDir = dir
-	if v2 != "" {
-		v2Dir = path.Join(mountDir, v2)
-	}
+	return cgroupPath()
 }
 
 // GetV2Dir returns the cgroup v2 unified mount directory.
 func GetV2Dir() string {
-	return v2Dir
+	return cgroupPath("unified")
 }
 
-// SetV2Dir sets the unified cgroup v2 mount directory.
-func SetV2Dir(dir string) {
-	if dir[0] == '/' {
-		v2Dir = dir
-	} else {
-		v2Dir = path.Join(mountDir, v2Dir)
-	}
+func cgroupPath(elems ...string) string {
+	return goresctrlpath.Path(append([]string{cgroupBasePath}, elems...)...)
 }