diff options
author | Paul Holzinger <pholzing@redhat.com> | 2021-09-02 14:14:59 +0200 |
---|---|---|
committer | Paul Holzinger <pholzing@redhat.com> | 2021-10-12 21:43:11 +0200 |
commit | 3ba69dccf78194792a4b0156db8c69417b20a713 (patch) | |
tree | 325afc80df95c0b5eb49b74d175cdd0ba1a480ff /libpod | |
parent | c90beedbe160eb6e8094b492091231f3c5838006 (diff) | |
download | podman-3ba69dccf78194792a4b0156db8c69417b20a713.tar.gz podman-3ba69dccf78194792a4b0156db8c69417b20a713.tar.bz2 podman-3ba69dccf78194792a4b0156db8c69417b20a713.zip |
rootlessport: reduce memory usage of the process
Don't use reexec for the rootlessport process, instead make it a
separate binary to reduce the memory usage. The problem with reexec is
that it will import all packages that podman uses and therefore loads a
lot of stuff into the heap. The rootlessport process however only needs
the rootlesskit library.
The memory usage is a concern since the rootlessport process will spawn
two process per container which has ports forwarded. The processes stay
until the container dies. On my laptop the current reexec version uses
47800 KB RSS. The new separate binary only uses 4540 KB RSS. This is
more than a 90% improvement.
The Makefile has been updated to compile the new binary and install it
to the libexec directory.
Fixes #10790
[NO TESTS NEEDED]
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'libpod')
-rw-r--r-- | libpod/networking_slirp4netns.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libpod/networking_slirp4netns.go b/libpod/networking_slirp4netns.go index 46cda89a9..ffd53ec2b 100644 --- a/libpod/networking_slirp4netns.go +++ b/libpod/networking_slirp4netns.go @@ -484,10 +484,14 @@ func (r *Runtime) setupRootlessPortMappingViaRLK(ctr *Container, netnsPath strin } cfgR := bytes.NewReader(cfgJSON) var stdout bytes.Buffer - cmd := exec.Command(fmt.Sprintf("/proc/%d/exe", os.Getpid())) - cmd.Args = []string{rootlessport.ReexecKey} - // Leak one end of the pipe in rootlessport process, the other will be sent to conmon + path, err := r.config.FindHelperBinary(rootlessport.BinaryName, false) + if err != nil { + return err + } + cmd := exec.Command(path) + cmd.Args = []string{rootlessport.BinaryName} + // Leak one end of the pipe in rootlessport process, the other will be sent to conmon if ctr.rootlessPortSyncR != nil { defer errorhandling.CloseQuiet(ctr.rootlessPortSyncR) } |