From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E128DC433F5 for ; Mon, 10 Oct 2022 23:58:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230134AbiJJX65 (ORCPT ); Mon, 10 Oct 2022 19:58:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230104AbiJJX6y (ORCPT ); Mon, 10 Oct 2022 19:58:54 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1CF47FF89 for ; Mon, 10 Oct 2022 16:58:52 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id u16-20020a250950000000b006be72659056so11958583ybm.3 for ; Mon, 10 Oct 2022 16:58:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=32G3k93Ulqw+bBT8wloqCvMkNp9uoyXmylHiGN2Ypxc=; b=oBamiBMlwevwaWtK9/MK/DT9KKivXxO2BxJN593yqX6pYjoGISML+X3eegUtf6A2M5 4iA2KIkdw4Sa2t3eOKZT3OrwBQCo8yzMbPa7sEEiMxRHAUJzqmE8fikOru5PvKc3xLKp 7pBhjHTEQuE239jf1M8tJM2axFb+arNmTjtVlvz9nWLtrXVa2bgjE1lgBqheC+oaMxPV buJwf/w9KTYkdmjq4x2mUZ67/K32gzGzfrn+c8T3b3ekZOISsbXD9cufr41n2pvvZnd4 2U5PTZALuINUVBwjM1H5EV2MwG9mT5ARQpFgxKTCSTKgM98LAeeMrpsjT5iMKRDZqt+F TL8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=32G3k93Ulqw+bBT8wloqCvMkNp9uoyXmylHiGN2Ypxc=; b=zuP4F0RZ/6TBjQdUXV8wjvlizdvD/TRs/biD5WjjJEKdoCNVUiy1ACiXURmOfC9/f6 wwl1ny1G1ju7CXtRBjPNswVi9WI3xSMKUgdpUxhVbF9OjLxixZpRKKmbBqqbfkSKFLqW JPKrj+pLziCKZQ4/9JeUOy9sXRegTfbNS9bRVeDu1Uq6Bvj5aBLnp7k6B5eKekbh/pB9 P1p/zEm4keYuVNAtdbaIMHETsfQfr6PyWAXoR0zLTu/ouVnVOrk/r0aN2sG54QowoqI9 XuuBmPdF/cnZrQ13cb6K8GOGSpUO8ETpkG9fAWQ0RvNkMdhPYN0f7adJBp5gtSPNQpFR NE8Q== X-Gm-Message-State: ACrzQf1A+GoedgwBll5yySOJwuWk9uWQpj66JTQC60T7LD2VhDtjKIGe CxlG8+nj/S/5gxHjJwuiLjk5L/g8z384T3Rs X-Google-Smtp-Source: AMsMyM5DVXg5sRb4xhrP+EF/t+N8fSesDoGkVZhdZwcIM0i//2doFKVpIAnhQz1pvBQYkekxL/PBBffZP3lfkxTd X-Received: from yosry.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:2327]) (user=yosryahmed job=sendgmr) by 2002:a0d:ce05:0:b0:345:5ea7:22fa with SMTP id q5-20020a0dce05000000b003455ea722famr19246450ywd.279.1665446332163; Mon, 10 Oct 2022 16:58:52 -0700 (PDT) Date: Mon, 10 Oct 2022 23:58:42 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.38.0.rc1.362.ged0d419d3c-goog Message-ID: <20221010235845.3379019-1-yosryahmed@google.com> Subject: [PATCH v1 0/3] Fix cgroup1 support in get from fd/file interfaces From: Yosry Ahmed To: Tejun Heo , Zefan Li , Johannes Weiner , Yonghong Song , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa Cc: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Yosry Ahmed Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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