-
Notifications
You must be signed in to change notification settings - Fork 92
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
firecracker: set jailer cgroup CPU weight according to task size (#7858)
- Loading branch information
Showing
5 changed files
with
183 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
114 changes: 114 additions & 0 deletions
114
buildpatches/com_github_firecracker_microvm_firecracker_go_sdk_cgroup.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| From 82d24f54a9a8cad65d8949816e3f6e85a134017d Mon Sep 17 00:00:00 2001 | ||
| From: Brandon Duffany <[email protected]> | ||
| Date: Wed, 6 Nov 2024 17:01:44 -0500 | ||
| Subject: [PATCH] Support jailer cgroup args | ||
|
|
||
| Signed-off-by: Brandon Duffany <[email protected]> | ||
| --- | ||
| jailer.go | 29 ++++++++++++++++++++++++++++- | ||
| jailer_test.go | 4 ++++ | ||
| 2 files changed, 32 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/jailer.go b/jailer.go | ||
| index 208de670..3246738d 100644 | ||
| --- a/jailer.go | ||
| +++ b/jailer.go | ||
| @@ -85,6 +85,10 @@ type JailerConfig struct { | ||
| // CgroupVersion is the version of the cgroup filesystem to use. | ||
| CgroupVersion string | ||
|
|
||
| + // CgroupArgs are cgroup settings applied by the jailer. Each arg must be | ||
| + // formatted like <cgroup_file>=<value>, like "cpu.shares=10" | ||
| + CgroupArgs []string | ||
| + | ||
| // Stdout specifies the IO writer for STDOUT to use when spawning the jailer. | ||
| Stdout io.Writer | ||
| // Stderr specifies the IO writer for STDERR to use when spawning the jailer. | ||
| @@ -109,6 +113,7 @@ type JailerCommandBuilder struct { | ||
| daemonize bool | ||
| firecrackerArgs []string | ||
| cgroupVersion string | ||
| + cgroupArgs []string | ||
|
|
||
| stdin io.Reader | ||
| stdout io.Writer | ||
| @@ -143,6 +148,10 @@ func (b JailerCommandBuilder) Args() []string { | ||
| args = append(args, "--cgroup", fmt.Sprintf("cpuset.cpus=%s", cpulist)) | ||
| } | ||
|
|
||
| + for _, cgroupArg := range b.cgroupArgs { | ||
| + args = append(args, "--cgroup", cgroupArg) | ||
| + } | ||
| + | ||
| if len(b.cgroupVersion) > 0 { | ||
| args = append(args, "--cgroup-version", b.cgroupVersion) | ||
| } | ||
| @@ -204,13 +213,30 @@ func (b JailerCommandBuilder) WithExecFile(path string) JailerCommandBuilder { | ||
| return b | ||
| } | ||
|
|
||
| -// WithNumaNode uses the specfied node for the jailer. This represents the numa | ||
| +// WithNumaNode uses the specified node for the jailer. This represents the numa | ||
| // node that the process will get assigned to. | ||
| +// Note: this is a convenience function that just sets the values of the cgroup | ||
| +// files "cpuset.mems" and "cpuset.cpus". | ||
| +// If those files are also configured using WithCgroupArgs, the values passed to | ||
| +// WithCgroupArgs will take precedence. | ||
| func (b JailerCommandBuilder) WithNumaNode(node int) JailerCommandBuilder { | ||
| b.node = node | ||
| return b | ||
| } | ||
|
|
||
| +// WithCgroupArgs sets cgroup file values to be set by the jailer. | ||
| +// Each arg must be of the form <cgroup_file>=<value>. | ||
| +// Each call to this function resets the cgroup arguments, rather than | ||
| +// appending. | ||
| +// | ||
| +// Example: | ||
| +// | ||
| +// b = b.WithCgroupArgs("cpu.shares=10") | ||
| +func (b JailerCommandBuilder) WithCgroupArgs(cgroupArgs ...string) JailerCommandBuilder { | ||
| + b.cgroupArgs = cgroupArgs | ||
| + return b | ||
| +} | ||
| + | ||
| // WithChrootBaseDir will set the given path as the chroot base directory. This | ||
| // specifies where chroot jails are built and defaults to /srv/jailer. | ||
| func (b JailerCommandBuilder) WithChrootBaseDir(path string) JailerCommandBuilder { | ||
| @@ -348,6 +374,7 @@ func jail(ctx context.Context, m *Machine, cfg *Config) error { | ||
| WithChrootBaseDir(cfg.JailerCfg.ChrootBaseDir). | ||
| WithDaemonize(cfg.JailerCfg.Daemonize). | ||
| WithCgroupVersion(cfg.JailerCfg.CgroupVersion). | ||
| + WithCgroupArgs(cfg.JailerCfg.CgroupArgs...). | ||
| WithFirecrackerArgs(fcArgs...). | ||
| WithStdout(stdout). | ||
| WithStderr(stderr) | ||
| diff --git a/jailer_test.go b/jailer_test.go | ||
| index 7c7017bc..6037cd27 100644 | ||
| --- a/jailer_test.go | ||
| +++ b/jailer_test.go | ||
| @@ -103,6 +103,7 @@ func TestJailerBuilder(t *testing.T) { | ||
| UID: Int(123), | ||
| GID: Int(100), | ||
| NumaNode: Int(0), | ||
| + CgroupArgs: []string{"cpu.shares=10"}, | ||
| ChrootStrategy: NewNaiveChrootStrategy("kernel-image-path"), | ||
| ExecFile: "/path/to/firecracker", | ||
| ChrootBaseDir: "/tmp", | ||
| @@ -123,6 +124,8 @@ func TestJailerBuilder(t *testing.T) { | ||
| "cpuset.mems=0", | ||
| "--cgroup", | ||
| fmt.Sprintf("cpuset.cpus=%s", getNumaCpuset(0)), | ||
| + "--cgroup", | ||
| + "cpu.shares=10", | ||
| "--cgroup-version", | ||
| "2", | ||
| "--chroot-base-dir", | ||
| @@ -146,6 +149,7 @@ func TestJailerBuilder(t *testing.T) { | ||
| WithUID(IntValue(c.jailerCfg.UID)). | ||
| WithGID(IntValue(c.jailerCfg.GID)). | ||
| WithNumaNode(IntValue(c.jailerCfg.NumaNode)). | ||
| + WithCgroupArgs(c.jailerCfg.CgroupArgs...). | ||
| WithCgroupVersion(c.jailerCfg.CgroupVersion). | ||
| WithExecFile(c.jailerCfg.ExecFile) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters