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. Revert f3a2aebdd6 and add new separate interfaces that support both cgroup1 and cgroup2. Yosry Ahmed (3): Revert "cgroup: enable cgroup_get_from_file() on cgroup1" cgroup: add cgroup_all_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 | 55 +++++++++++++++++++++++++++++++++++----- 3 files changed, 51 insertions(+), 7 deletions(-) -- 2.38.0.rc1.362.ged0d419d3c-goog