Skip to content

Commit

Permalink
libctr: Reset the inherited cpu affinity
Browse files Browse the repository at this point in the history
Old kernels do that automatically, but new kernels remember
the affinity that was set before the cgroup move due to

https://lore.kernel.org/lkml/20220922180041.1768141-1-longman@redhat.com

This is undesirable for containers, because they inherit
the systemd affinity when the should really move to the container
space cpus.

see https://issues.redhat.com/browse/OCPBUGS-15102 for more information

Co-authored-by:  Martin Sivak <msivak@redhat.com>
Signed-off-by: Peter Hunt <pehunt@redhat.com>
  • Loading branch information
haircommander and MarSik committed Sep 28, 2023
1 parent 1614cab commit c06381c
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions libcontainer/process_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,14 @@ func (p *setnsProcess) start() (retErr error) {
}
}
}
// Reset the inherited cpu affinity. Old kernels do that automatically, but
// new kernels remember the affinity that was set before the cgroup move.
// This is undesirable, because it inherits the systemd affinity when the container
// should really move to the container space cpus.
if err = unix.SchedSetaffinity(p.pid(), &unix.CPUSet{}); err != nil && err != unix.EINVAL && err != unix.ENODEV { //nolint:errorlint
return fmt.Errorf("error resetting pid %d affinity: %w", p.pid(), err)
}

if p.intelRdtPath != "" {
// if Intel RDT "resource control" filesystem path exists
_, err := os.Stat(p.intelRdtPath)
Expand Down Expand Up @@ -419,6 +427,14 @@ func (p *initProcess) start() (retErr error) {
if err := p.manager.Apply(p.pid()); err != nil {
return fmt.Errorf("unable to apply cgroup configuration: %w", err)
}

// Reset the inherited cpu affinity. Old kernels do that automatically, but
// new kernels remember the affinity that was set before the cgroup move.
// This is undesirable, because it inherits the systemd affinity when the container
// should really move to the container space cpus.
if err = unix.SchedSetaffinity(p.pid(), &unix.CPUSet{}); err != nil && err != unix.EINVAL && err != unix.ENODEV { //nolint:errorlint
return fmt.Errorf("error resetting pid %d affinity: %w", p.pid(), err)
}
if p.intelRdtManager != nil {
if err := p.intelRdtManager.Apply(p.pid()); err != nil {
return fmt.Errorf("unable to apply Intel RDT configuration: %w", err)
Expand Down

0 comments on commit c06381c

Please sign in to comment.