Merge pull request #5490 from askervin/5Bu_blockio

Support for cgroups blockio

services/tasks/blockio_default.go

@@ -0,0 +1,24 @@
+//go:build !linux
+// +build !linux
+
+/*
+   Copyright The containerd Authors.
+
+   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 tasks
+
+func BlockIOEnabled() bool { return false }
+
+func initBlockIO(configFilePath string) error { return nil }

services/tasks/blockio_linux.go

@@ -0,0 +1,50 @@
+//go:build linux
+// +build linux
+
+/*
+   Copyright The containerd Authors.
+
+   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 tasks
+
+import (
+	"fmt"
+
+	"github.com/containerd/containerd/log"
+
+	"github.com/intel/goresctrl/pkg/blockio"
+)
+
+var blockIOEnabled bool
+
+func BlockIOEnabled() bool { return blockIOEnabled }
+
+func initBlockIO(configFilePath string) error {
+	blockIOEnabled = false
+
+	if configFilePath == "" {
+		log.L.Debug("No blockio config file specified, blockio not configured")
+		return nil
+	}
+
+	if err := blockio.SetConfigFromFile(configFilePath, true); err != nil {
+		return fmt.Errorf("blockio not enabled: %w", err)
+	}
+
+	blockIOEnabled = true
+
+	return nil
+
+}

services/tasks/local.go

@@ -67,6 +67,8 @@ const (
 
 // Config for the tasks service plugin
 type Config struct {
+	// BlockIOConfigFile specifies the path to blockio configuration file
+	BlockIOConfigFile string `toml:"blockio_config_file" json:"blockioConfigFile"`
 	// RdtConfigFile specifies the path to RDT configuration file
 	RdtConfigFile string `toml:"rdt_config_file" json:"rdtConfigFile"`
 }
@@ -139,6 +141,9 @@ func initFunc(ic *plugin.InitContext) (interface{}, error) {
 		l.monitor.Monitor(t, nil)
 	}
 
+	if err := initBlockIO(config.BlockIOConfigFile); err != nil {
+		log.G(ic.Context).WithError(err).Errorf("blockio initialization failed")
+	}
 	if err := initRdt(config.RdtConfigFile); err != nil {
 		log.G(ic.Context).WithError(err).Errorf("RDT initialization failed")
 	}