Skip to content

Commit 3b7b613

Browse files
committed
libct: speedup process.Env handling
The current implementation sets all the environment variables passed in Process.Env in the current process, one by one, then uses os.Environ to read those back. As pointed out in [1], this is slow, as runc calls os.Setenv for every variable, and there may be a few thousands of those. Looking into how os.Setenv is implemented, it is indeed slow, especially when cgo is enabled. Looking into why it was implemented, I found commit 9744d72 and traced it to [2], which discusses the actual reasons. At the time were: - HOME is not passed into container as it is set in setupUser by os.Setenv and has no effect on config.Env; - there is no deduplication of environment variables. Yet it was decided to not go ahead with this patch, but later [3] was merged with the carry of this patch. Now, from what I see: 1. Passing environment to exec is way faster than using os.Setenv and os.Environ (tests show ~20x faster in simple Go test, and 2x faster in real-world test, see below). 2. Setting environment variables in the runc context can result is ugly side effects (think GODEBUG, LD_PRELOAD, or _LIBCONTAINER_*). 3. Nothing in runtime spec says that the environment needs to be deduplicated, or the order of preference (whether the first or the last value of a variable with the same name is to be used). We should stick to what we have in order to maintain backward compatibility. This patch: - switches to passing env directly to exec; - adds deduplication mechanism to retain backward compatibility; - sets PATH from process.Env in the current process; - adds HOME to process.Env if not set; The benchmark added by the previous commit shows ~3x improvement: │ before │ after │ │ sec/op │ sec/op vs base │ ExecInBigEnv-20 61.53m ± 1% 21.87m ± 16% -64.46% (p=0.000 n=10) [1]: #1983 [2]: docker-archive/libcontainer#418 [3]: docker-archive/libcontainer#432 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
1 parent d71b39c commit 3b7b613

File tree

5 files changed

+115
-42
lines changed

5 files changed

+115
-42
lines changed

libcontainer/env.go

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
package libcontainer
2+
3+
import (
4+
"errors"
5+
"fmt"
6+
"os"
7+
"slices"
8+
"strings"
9+
)
10+
11+
// prepareEnv checks supplied environment variables for validity, removes
12+
// duplicates (leaving the last value only), and sets PATH from env, if found.
13+
// Returns the deduplicated environment, and a flag telling if HOME is found.
14+
func prepareEnv(env []string) ([]string, bool, error) {
15+
if env == nil {
16+
return nil, false, nil
17+
}
18+
// Deduplication code based on dedupEnv from Go 1.22 os/exec.
19+
20+
// Construct the output in reverse order, to preserve the
21+
// last occurrence of each key.
22+
out := make([]string, 0, len(env))
23+
saw := make(map[string]bool, len(env))
24+
for n := len(env); n > 0; n-- {
25+
kv := env[n-1]
26+
i := strings.IndexByte(kv, '=')
27+
if i == -1 {
28+
return nil, false, errors.New("invalid environment variable: missing '='")
29+
}
30+
if i == 0 {
31+
return nil, false, errors.New("invalid environment variable: name cannot be empty")
32+
}
33+
key := kv[:i]
34+
if saw[key] { // Duplicate.
35+
continue
36+
}
37+
saw[key] = true
38+
if strings.IndexByte(kv, 0) >= 0 {
39+
return nil, false, fmt.Errorf("invalid environment variable %q: contains nul byte (\\x00)", key)
40+
}
41+
if key == "PATH" {
42+
// Needs to be set as it is used for binary lookup.
43+
if err := os.Setenv("PATH", kv[i+1:]); err != nil {
44+
return nil, false, err
45+
}
46+
}
47+
out = append(out, kv)
48+
}
49+
// Restore the original order.
50+
slices.Reverse(out)
51+
52+
return out, saw["HOME"], nil
53+
}

libcontainer/env_test.go

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
package libcontainer
2+
3+
import (
4+
"slices"
5+
"testing"
6+
)
7+
8+
func TestPrepareEnvDedup(t *testing.T) {
9+
tests := []struct {
10+
env, wantEnv []string
11+
}{
12+
{
13+
env: []string{},
14+
wantEnv: []string{},
15+
},
16+
{
17+
env: []string{"HOME=/root", "FOO=bar"},
18+
wantEnv: []string{"HOME=/root", "FOO=bar"},
19+
},
20+
{
21+
env: []string{"A=a", "A=b", "A=c"},
22+
wantEnv: []string{"A=c"},
23+
},
24+
{
25+
env: []string{"TERM=vt100", "HOME=/home/one", "HOME=/home/two", "TERM=xterm", "HOME=/home/three", "FOO=bar"},
26+
wantEnv: []string{"TERM=xterm", "HOME=/home/three", "FOO=bar"},
27+
},
28+
}
29+
30+
for _, tc := range tests {
31+
env, _, err := prepareEnv(tc.env)
32+
if err != nil {
33+
t.Error(err)
34+
continue
35+
}
36+
if !slices.Equal(env, tc.wantEnv) {
37+
t.Errorf("want %v, got %v", tc.wantEnv, env)
38+
}
39+
}
40+
}

libcontainer/init_linux.go

Lines changed: 16 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"runtime"
1212
"runtime/debug"
1313
"strconv"
14-
"strings"
1514
"syscall"
1615

1716
"github.com/containerd/console"
@@ -185,8 +184,8 @@ func startInitialization() (retErr error) {
185184
defer pidfdSocket.Close()
186185
}
187186

188-
// clear the current process's environment to clean any libcontainer
189-
// specific env vars.
187+
// From here on, we don't need current process environment. It is not
188+
// used directly anywhere below this point, but let's clear it anyway.
190189
os.Clearenv()
191190

192191
defer func() {
@@ -209,9 +208,11 @@ func startInitialization() (retErr error) {
209208
}
210209

211210
func containerInit(t initType, config *initConfig, pipe *syncSocket, consoleSocket, pidfdSocket, fifoFile, logPipe *os.File) error {
212-
if err := populateProcessEnvironment(config.Env); err != nil {
211+
env, homeSet, err := prepareEnv(config.Env)
212+
if err != nil {
213213
return err
214214
}
215+
config.Env = env
215216

216217
// Clean the RLIMIT_NOFILE cache in go runtime.
217218
// Issue: https://github.com/opencontainers/runc/issues/4195
@@ -225,6 +226,7 @@ func containerInit(t initType, config *initConfig, pipe *syncSocket, consoleSock
225226
pidfdSocket: pidfdSocket,
226227
config: config,
227228
logPipe: logPipe,
229+
addHome: !homeSet,
228230
}
229231
return i.Init()
230232
case initStandard:
@@ -236,36 +238,13 @@ func containerInit(t initType, config *initConfig, pipe *syncSocket, consoleSock
236238
config: config,
237239
fifoFile: fifoFile,
238240
logPipe: logPipe,
241+
addHome: !homeSet,
239242
}
240243
return i.Init()
241244
}
242245
return fmt.Errorf("unknown init type %q", t)
243246
}
244247

245-
// populateProcessEnvironment loads the provided environment variables into the
246-
// current processes's environment.
247-
func populateProcessEnvironment(env []string) error {
248-
for _, pair := range env {
249-
name, val, ok := strings.Cut(pair, "=")
250-
if !ok {
251-
return errors.New("invalid environment variable: missing '='")
252-
}
253-
if name == "" {
254-
return errors.New("invalid environment variable: name cannot be empty")
255-
}
256-
if strings.IndexByte(name, 0) >= 0 {
257-
return fmt.Errorf("invalid environment variable %q: name contains nul byte (\\x00)", name)
258-
}
259-
if strings.IndexByte(val, 0) >= 0 {
260-
return fmt.Errorf("invalid environment variable %q: value contains nul byte (\\x00)", name)
261-
}
262-
if err := os.Setenv(name, val); err != nil {
263-
return err
264-
}
265-
}
266-
return nil
267-
}
268-
269248
// verifyCwd ensures that the current directory is actually inside the mount
270249
// namespace root of the current process.
271250
func verifyCwd() error {
@@ -294,8 +273,8 @@ func verifyCwd() error {
294273

295274
// finalizeNamespace drops the caps, sets the correct user
296275
// and working dir, and closes any leaked file descriptors
297-
// before executing the command inside the namespace
298-
func finalizeNamespace(config *initConfig) error {
276+
// before executing the command inside the namespace.
277+
func finalizeNamespace(config *initConfig, addHome bool) error {
299278
// Ensure that all unwanted fds we may have accidentally
300279
// inherited are marked close-on-exec so they stay out of the
301280
// container
@@ -341,7 +320,7 @@ func finalizeNamespace(config *initConfig) error {
341320
if err := system.SetKeepCaps(); err != nil {
342321
return fmt.Errorf("unable to set keep caps: %w", err)
343322
}
344-
if err := setupUser(config); err != nil {
323+
if err := setupUser(config, addHome); err != nil {
345324
return fmt.Errorf("unable to setup user: %w", err)
346325
}
347326
// Change working directory AFTER the user has been set up, if we haven't done it yet.
@@ -459,8 +438,9 @@ func syncParentSeccomp(pipe *syncSocket, seccompFd int) error {
459438
return readSync(pipe, procSeccompDone)
460439
}
461440

462-
// setupUser changes the groups, gid, and uid for the user inside the container
463-
func setupUser(config *initConfig) error {
441+
// setupUser changes the groups, gid, and uid for the user inside the container,
442+
// and appends user's HOME to config.Env if addHome is true.
443+
func setupUser(config *initConfig, addHome bool) error {
464444
// Set up defaults.
465445
defaultExecUser := user.ExecUser{
466446
Uid: 0,
@@ -541,11 +521,9 @@ func setupUser(config *initConfig) error {
541521
return err
542522
}
543523

544-
// if we didn't get HOME already, set it based on the user's HOME
545-
if envHome := os.Getenv("HOME"); envHome == "" {
546-
if err := os.Setenv("HOME", execUser.Home); err != nil {
547-
return err
548-
}
524+
// If we didn't get HOME already, set it based on the user's HOME.
525+
if addHome {
526+
config.Env = append(config.Env, "HOME="+execUser.Home)
549527
}
550528
return nil
551529
}

libcontainer/setns_init_linux.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ type linuxSetnsInit struct {
2525
pidfdSocket *os.File
2626
config *initConfig
2727
logPipe *os.File
28+
addHome bool
2829
}
2930

3031
func (l *linuxSetnsInit) getSessionRingName() string {
@@ -100,7 +101,7 @@ func (l *linuxSetnsInit) Init() error {
100101
return err
101102
}
102103
}
103-
if err := finalizeNamespace(l.config); err != nil {
104+
if err := finalizeNamespace(l.config, l.addHome); err != nil {
104105
return err
105106
}
106107
if err := apparmor.ApplyProfile(l.config.AppArmorProfile); err != nil {
@@ -153,5 +154,5 @@ func (l *linuxSetnsInit) Init() error {
153154
if err := utils.UnsafeCloseFrom(l.config.PassedFilesCount + 3); err != nil {
154155
return err
155156
}
156-
return system.Exec(name, l.config.Args, os.Environ())
157+
return system.Exec(name, l.config.Args, l.config.Env)
157158
}

libcontainer/standard_init_linux.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ type linuxStandardInit struct {
2727
fifoFile *os.File
2828
logPipe *os.File
2929
config *initConfig
30+
addHome bool
3031
}
3132

3233
func (l *linuxStandardInit) getSessionRingParams() (string, uint32, uint32) {
@@ -189,7 +190,7 @@ func (l *linuxStandardInit) Init() error {
189190
return err
190191
}
191192
}
192-
if err := finalizeNamespace(l.config); err != nil {
193+
if err := finalizeNamespace(l.config, l.addHome); err != nil {
193194
return err
194195
}
195196
// finalizeNamespace can change user/group which clears the parent death
@@ -287,5 +288,5 @@ func (l *linuxStandardInit) Init() error {
287288
if err := utils.UnsafeCloseFrom(l.config.PassedFilesCount + 3); err != nil {
288289
return err
289290
}
290-
return system.Exec(name, l.config.Args, os.Environ())
291+
return system.Exec(name, l.config.Args, l.config.Env)
291292
}

0 commit comments

Comments
 (0)