Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libct/intelrdt: skip reading /proc/cpuinfo #3485

Merged
merged 5 commits into from
Jul 28, 2022
Merged

libct/intelrdt: skip reading /proc/cpuinfo #3485

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
13674f4
libct/intelrdt: delete IsMBAScEnabled()
corhere Jul 26, 2022
9f10748
libct/intelrdt: skip reading /proc/cpuinfo
corhere Jul 26, 2022
c156bde
libct/intelrdt: elide parsing mountinfo
corhere Jul 26, 2022
56daf36
libct/intelrdt: skip remove unless configured
corhere Jul 26, 2022
ea0bd78
libct/intelrdt: check if available iff configured
corhere Jul 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
libct/intelrdt: skip remove unless configured 
The OCI runtime spec mandates "[i]f intelRdt is not set, the runtime
MUST NOT manipulate any resctrl pseudo-filesystems." Attempting to
delete files counts as manipulating, so stop doing that when the
container's RDT configuration is nil.

Signed-off-by: Cory Snider <csnider@mirantis.com>
  • Loading branch information
@corhere @kolyshkin
corhere authored and kolyshkin committed Jul 28, 2022
commit 56daf36be2c5c944f3ee7a8d37cf809c514ffcf7
2 changes: 1 addition & 1 deletion libcontainer/intelrdt/intelrdt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ func (m *Manager) Destroy() error {
// Don't remove resctrl group if closid has been explicitly specified. The
// group is likely externally managed, i.e. by some other entity than us.
// There are probably other containers/tasks sharing the same group.
if m.config.IntelRdt == nil || m.config.IntelRdt.ClosID == "" {
if m.config.IntelRdt != nil && m.config.IntelRdt.ClosID == "" {
kolyshkin marked this conversation as resolved.
Show resolved Hide resolved
m.mu.Lock()
defer m.mu.Unlock()
if err := os.RemoveAll(m.GetPath()); err != nil {
Expand Down