commit f3a2aebdd6fb ("cgroup: enable cgroup_get_from_file() on cgroup1") enabled using cgroup_get_from_file() and cgroup_get_from_fd() on cgroup1, to enable bpf cgroup_iter to attach to cgroup1. Apparently, other callers depended on these functions only supporting cgroup2, so f3a2aebdd6 was reverted. Instead, add new separate interfaces that support both cgroup1 and cgroup2 and use them in bpf cgroup_iter. Yosry Ahmed (2): cgroup: add cgroup_v1v2_get_from_[fd/file]() bpf: cgroup_iter: support cgroup1 using cgroup fd include/linux/cgroup.h | 1 + kernel/bpf/cgroup_iter.c | 2 +- kernel/cgroup/cgroup.c | 50 +++++++++++++++++++++++++++++++++++----- 3 files changed, 46 insertions(+), 7 deletions(-) -- 2.38.0.rc1.362.ged0d419d3c-goog