common: remove cgv1 for podman6 by lsm5 · Pull Request #417 · podman-container-tools/container-libs

lsm5 · 2025-10-24T18:46:48Z

Following up on review comments in #387 . Reattempting with finer commits for easier review.

podmanbot · 2025-10-24T18:48:07Z

✅ A new PR has been created in buildah to vendor these changes: podman-container-tools/buildah#6449

packit-as-a-service · 2025-10-24T19:23:26Z

Packit jobs failed. @containers/packit-build please check.

lsm5 · 2025-10-24T23:25:51Z

@Luap99 @mtrmac PTAL. Smaller commits so should be hopefully easier to review.

I haven't removed any of the IsCgroup2UnifiedMode calls where there were error checks. Only assumed the bool to be true there, and removed the cgv1 parts.

Unless there are any critical blockers like some change being obviously wrong or some cgv1 logic still present and open to being called, I'd prefer to leave any cleanups / simplifications for followup.

lsm5 · 2025-10-24T23:26:27Z

should obsolete #387

Replace with cgroups.IsCgroup2UnifiedMode. Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

And all the cgroup v1 logic that relied on the cgroup2 bool Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

I can only see it being called in libpod/oci_conmon_linux.go that too when CgroupManager is not systemd, so it should be safe to remove. Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

lsm5 · 2025-10-28T13:06:32Z

@mheon PTAL.

mheon · 2025-10-29T16:01:07Z

LGTM

mtrmac

Thanks! This is really much easier to review when split.

(Reviewed only locally reading the code, I don’t know much about cgroups. Leaving follow-ups for a separate PR as requested.)

mtrmac · 2025-10-30T20:53:42Z

@@ -212,21 +200,15 @@ func resourcesToProps(res *cgroups.Resources, v2 bool) (map[string]uint64, map[s
 		case res.Memory == -1 || res.MemorySwap == -1:


(Turning this into if would be nicer.)

mtrmac · 2025-10-31T22:05:55Z

 	"strings"

 	"github.com/opencontainers/cgroups"
 	"github.com/opencontainers/cgroups/fs"


@lsm5 in all of these handler packages, we import cgroups/fs to declare fields which are never used, so it looks like this can be simplified further.

… and that makes #387 (comment) even more attractive.

Ref: podman-container-tools#417 (comment) Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

This broke a lot of stuff, so this should only be re-reverted once things are known to work in Podman and Buildah. Commits reverted: - e94388d - 26e4421 - b7be55c - cce5ec8 - 5f98dfb - ceaec36 - ed47881 - 2cf45c5 - 80309d7 - 8251431 - ff00d90 - 213e7ec Ref: podman-container-tools#417 Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

github-actions Bot added the common Related to "common" package label Oct 24, 2025

podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025

dnm: Vendor changes from podman-container-tools/container-libs#417

1cadee8

podmanbot mentioned this pull request Oct 24, 2025

Sync: common: remove cgv1 (reattempt with finer commits) podman-container-tools/buildah#6449

Closed

lsm5 changed the title ~~common: remove cgv1 (reattempt with finer commits)~~ [WIP] common: remove cgv1 (reattempt with finer commits) Oct 24, 2025

podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025

dnm: Vendor changes from podman-container-tools/container-libs#417

23140b6

lsm5 force-pushed the podman6-no-cgv1-new branch from e82ef0f to c69aaf4 Compare October 24, 2025 19:22

podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025

dnm: Vendor changes from podman-container-tools/container-libs#417

dea3a74

podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025

dnm: Vendor changes from podman-container-tools/container-libs#417

94b0f61

podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025

dnm: Vendor changes from podman-container-tools/container-libs#417

e5e5744

podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025

dnm: Vendor changes from podman-container-tools/container-libs#417

c6962a1

podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025

dnm: Vendor changes from podman-container-tools/container-libs#417

adba09a

podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025

dnm: Vendor changes from podman-container-tools/container-libs#417

d3c05d8

lsm5 force-pushed the podman6-no-cgv1-new branch from 1c21882 to 453e6e8 Compare October 24, 2025 21:43

podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025

dnm: Vendor changes from podman-container-tools/container-libs#417

6c7305c

podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025

dnm: Vendor changes from podman-container-tools/container-libs#417

8047926

podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025

dnm: Vendor changes from podman-container-tools/container-libs#417

46d9d86

podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025

dnm: Vendor changes from podman-container-tools/container-libs#417

b5b2c96

lsm5 force-pushed the podman6-no-cgv1-new branch from 9002044 to 7cf077c Compare October 24, 2025 22:34

podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025

dnm: Vendor changes from podman-container-tools/container-libs#417

d474ca4

lsm5 force-pushed the podman6-no-cgv1-new branch from 7cf077c to c30076c Compare October 24, 2025 23:00

podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025

dnm: Vendor changes from podman-container-tools/container-libs#417

cd0e17b

podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 24, 2025

dnm: Vendor changes from podman-container-tools/container-libs#417

f8c20b1

lsm5 marked this pull request as ready for review October 24, 2025 23:25

lsm5 changed the title ~~[WIP] common: remove cgv1 (reattempt with finer commits)~~ common: remove cgv1 (reattempt with finer commits) Oct 25, 2025

lsm5 added 2 commits October 25, 2025 09:27

common: remove pkg/cgroupv2

213e7ec

Replace with cgroups.IsCgroup2UnifiedMode. Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

CgroupControl: remove cgroup2 and additionalControllers

ff00d90

And all the cgroup v1 logic that relied on the cgroup2 bool Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

lsm5 added 6 commits October 25, 2025 09:29

common/pkg/sysinfo: checkCgroupPids needs no args

ed47881

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

Remove Create method from controllerHandler

ceaec36

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

Remove Destroy method from controllerHandler

5f98dfb

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

delete cgroups.AddPid

cce5ec8

I can only see it being called in libpod/oci_conmon_linux.go that too when CgroupManager is not systemd, so it should be safe to remove. Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

common/pkg/config: cleanup defaultCgroupManager

b7be55c

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

cgroups: remove ErrCgroupV1Rootless code

26e4421

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

lsm5 force-pushed the podman6-no-cgv1-new branch from df3ce3a to 26e4421 Compare October 25, 2025 13:30

podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 25, 2025

dnm: Vendor changes from podman-container-tools/container-libs#417

f7b0420

common/pkg/cgroups.AvailableControllers simplification

e94388d

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

podmanbot pushed a commit to podmanbot/buildah that referenced this pull request Oct 25, 2025

dnm: Vendor changes from podman-container-tools/container-libs#417

52c646c

lsm5 mentioned this pull request Oct 25, 2025

common: remove Cgroups v1 support (podman6) #387

Closed

lsm5 changed the title ~~common: remove cgv1 (reattempt with finer commits)~~ common: remove cgv1 for podman6 (reattempt with finer commits) Oct 25, 2025

lsm5 changed the title ~~common: remove cgv1 for podman6 (reattempt with finer commits)~~ common: remove cgv1 for podman6 Oct 25, 2025

mheon reviewed Oct 29, 2025

View reviewed changes

Comment thread common/pkg/cgroupv2/cgroups_unsupported.go

mtrmac approved these changes Oct 30, 2025

View reviewed changes

mtrmac merged commit b636c80 into podman-container-tools:main Oct 30, 2025
18 checks passed

mtrmac mentioned this pull request Oct 30, 2025

common: no slirp for podman6 #393

Draft

lsm5 deleted the podman6-no-cgv1-new branch October 31, 2025 13:51

mtrmac reviewed Oct 31, 2025

View reviewed changes

Comment thread common/pkg/cgroups/cgroups_linux.go

mtrmac mentioned this pull request Oct 31, 2025

Cgroupv1 removal follow-ups #430

Closed

lsm5 added a commit to lsm5/container-libs that referenced this pull request Nov 4, 2025

common/pkg/cgroups.AvailableControllers: cleanup and inline

2c9fdbd

Ref: podman-container-tools#417 (comment) Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

lsm5 added a commit to lsm5/container-libs that referenced this pull request Nov 4, 2025

common/pkg/cgroups/systemd_linux.go: Simplified rewrite

e0a4dce

Ref: podman-container-tools#417 (comment) Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

lsm5 mentioned this pull request Nov 5, 2025

Revert Cgroups V1 removal #442

Merged

mtrmac mentioned this pull request Nov 22, 2025

Cgroups V1 removal #464

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

common: remove cgv1 for podman6#417

common: remove cgv1 for podman6#417
mtrmac merged 12 commits into
podman-container-tools:mainfrom
lsm5:podman6-no-cgv1-new

lsm5 commented Oct 24, 2025

Uh oh!

podmanbot commented Oct 24, 2025

Uh oh!

packit-as-a-service Bot commented Oct 24, 2025

Uh oh!

lsm5 commented Oct 24, 2025

Uh oh!

lsm5 commented Oct 24, 2025

Uh oh!

lsm5 commented Oct 28, 2025

Uh oh!

Uh oh!

mheon commented Oct 29, 2025

Uh oh!

mtrmac left a comment

Uh oh!

Uh oh!

mtrmac Oct 30, 2025

Uh oh!

Uh oh!

mtrmac Oct 31, 2025 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

		@@ -212,21 +200,15 @@ func resourcesToProps(res *cgroups.Resources, v2 bool) (map[string]uint64, map[s
		case res.Memory == -1 \|\| res.MemorySwap == -1:

Conversation

lsm5 commented Oct 24, 2025

Uh oh!

podmanbot commented Oct 24, 2025

Uh oh!

packit-as-a-service Bot commented Oct 24, 2025

Uh oh!

lsm5 commented Oct 24, 2025

Uh oh!

lsm5 commented Oct 24, 2025

Uh oh!

lsm5 commented Oct 28, 2025

Uh oh!

Uh oh!

mheon commented Oct 29, 2025

Uh oh!

mtrmac left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mtrmac Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mtrmac Oct 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

mtrmac Oct 31, 2025 •

edited

Loading