public inbox for cgroups@vger.kernel.org
 help / color / mirror / Atom feed
From: Yosry Ahmed <yosryahmed@google.com>
To: Alexei Starovoitov <ast@kernel.org>,
	Daniel Borkmann <daniel@iogearbox.net>,
	Andrii Nakryiko <andrii@kernel.org>,
	Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
	Yonghong Song <yhs@fb.com>,
	John Fastabend <john.fastabend@gmail.com>,
	KP Singh <kpsingh@kernel.org>, Hao Luo <haoluo@google.com>,
	Tejun Heo <tj@kernel.org>, Zefan Li <lizefan.x@bytedance.com>,
	Johannes Weiner <hannes@cmpxchg.org>,
	Shuah Khan <shuah@kernel.org>, Michal Hocko <mhocko@kernel.org>
Cc: Roman Gushchin <roman.gushchin@linux.dev>,
	David Rientjes <rientjes@google.com>,
	Stanislav Fomichev <sdf@google.com>,
	Greg Thelen <gthelen@google.com>,
	Shakeel Butt <shakeelb@google.com>,
	linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
	bpf@vger.kernel.org, cgroups@vger.kernel.org,
	Yosry Ahmed <yosryahmed@google.com>
Subject: [PATCH bpf-next v2 1/8] cgroup: enable cgroup_get_from_file() on cgroup1
Date: Fri, 10 Jun 2022 19:44:28 +0000	[thread overview]
Message-ID: <20220610194435.2268290-2-yosryahmed@google.com> (raw)
In-Reply-To: <20220610194435.2268290-1-yosryahmed@google.com>

cgroup_get_from_file() currently fails with -EBADF if called on cgroup
v1. However, the current implementation works on cgroup v1 as well, so
the restriction is unnecessary.

This enabled cgroup_get_from_fd() to work on cgroup v1, which would be
the only thing stopping bpf cgroup_iter from supporting cgroup v1.

Signed-off-by: Yosry Ahmed <yosryahmed@google.com>
---
 kernel/cgroup/cgroup.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 1779ccddb734d..9943fcb1e574d 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -6090,11 +6090,6 @@ static struct cgroup *cgroup_get_from_file(struct file *f)
 		return ERR_CAST(css);
 
 	cgrp = css->cgroup;
-	if (!cgroup_on_dfl(cgrp)) {
-		cgroup_put(cgrp);
-		return ERR_PTR(-EBADF);
-	}
-
 	return cgrp;
 }
 
-- 
2.36.1.476.g0c4daa206d-goog


  reply	other threads:[~2022-06-10 19:44 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-10 19:44 [PATCH bpf-next v2 0/8] bpf: rstat: cgroup hierarchical stats Yosry Ahmed
2022-06-10 19:44 ` Yosry Ahmed [this message]
2022-06-10 19:44 ` [PATCH bpf-next v2 3/8] bpf, iter: Fix the condition on p when calling stop Yosry Ahmed
2022-06-20 18:48   ` Yonghong Song
2022-06-21  7:25     ` Hao Luo
     [not found]       ` <CA+khW7jU=Fqt49jxG8y5n2YtRu4_C1gFUW-PqZGY_Rt8PGrGEg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2022-06-24 17:46         ` Yonghong Song
2022-06-24 18:23           ` Yosry Ahmed
2022-06-10 19:44 ` [PATCH bpf-next v2 4/8] bpf: Introduce cgroup iter Yosry Ahmed
2022-06-11  6:23   ` kernel test robot
2022-06-11  7:34   ` kernel test robot
2022-06-11 12:44   ` kernel test robot
     [not found]   ` <20220610194435.2268290-5-yosryahmed-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2022-06-11 12:55     ` kernel test robot
2022-06-28  4:09     ` Yonghong Song
2022-06-28  6:06       ` Yosry Ahmed
2022-07-07 23:33       ` Hao Luo
2022-06-28  4:14     ` Yonghong Song
2022-06-28  6:03       ` Yosry Ahmed
2022-06-28 17:03         ` Yonghong Song
2022-07-07 23:36       ` Hao Luo
     [not found] ` <20220610194435.2268290-1-yosryahmed-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2022-06-10 19:44   ` [PATCH bpf-next v2 2/8] cgroup: Add cgroup_put() in !CONFIG_CGROUPS case Yosry Ahmed
2022-06-10 19:44   ` [PATCH bpf-next v2 5/8] selftests/bpf: Test cgroup_iter Yosry Ahmed
2022-06-28  6:11     ` Yonghong Song
2022-06-10 19:48   ` [PATCH bpf-next v2 0/8] bpf: rstat: cgroup hierarchical stats Yosry Ahmed
2022-06-10 19:44 ` [PATCH bpf-next v2 6/8] cgroup: bpf: enable bpf programs to integrate with rstat Yosry Ahmed
     [not found]   ` <20220610194435.2268290-7-yosryahmed-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2022-06-10 20:52     ` kernel test robot
2022-06-10 21:22   ` kernel test robot
     [not found]     ` <202206110544.D5cTU0WQ-lkp-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2022-06-10 21:30       ` Yosry Ahmed
2022-06-11 19:57         ` Alexei Starovoitov
2022-06-13 17:05           ` Yosry Ahmed
2022-06-11 10:22   ` kernel test robot
2022-06-28  6:12   ` Yonghong Song
2022-06-10 19:44 ` [PATCH bpf-next v2 7/8] selftests/bpf: extend cgroup helpers Yosry Ahmed
2022-06-10 19:44 ` [PATCH bpf-next v2 8/8] bpf: add a selftest for cgroup hierarchical stats collection Yosry Ahmed
     [not found]   ` <20220610194435.2268290-9-yosryahmed-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2022-06-28  6:14     ` Yonghong Song
     [not found]       ` <00df1932-38fe-c6f8-49d0-3a44affb1268-b10kYP2dOMg@public.gmane.org>
2022-06-28  6:47         ` Yosry Ahmed
2022-06-28  7:14           ` Yosry Ahmed
2022-06-29  0:09             ` Yosry Ahmed
     [not found]               ` <CAJD7tkarwnbcqR1DUN-iJmt0k_njwBfDMd=P8ket8DfEfRRYjw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2022-06-29  6:48                 ` Yonghong Song
2022-06-29  8:04                   ` Yosry Ahmed
2022-07-02  0:55                     ` Yonghong Song
2022-07-06 21:29                       ` Yosry Ahmed
     [not found]             ` <CAJD7tkZ3AEPEUD9V-5nxUgmS5SLc6qp50ZyrRoAQgdzPM=a-Hg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2022-06-29  6:17               ` Yonghong Song
2022-06-28  7:43           ` Yosry Ahmed
     [not found]             ` <CAJD7tkbOztCEWgMzoCOdD+g3whMMQWW2e0gwo9p0tVK=3hqmcw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2022-06-29  6:26               ` Yonghong Song
2022-06-29  8:03                 ` Yosry Ahmed
     [not found]                 ` <59376285-21bc-ff12-3d64-3ea7257becb2-b10kYP2dOMg@public.gmane.org>
2022-07-01 23:28                   ` Hao Luo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220610194435.2268290-2-yosryahmed@google.com \
    --to=yosryahmed@google.com \
    --cc=andrii@kernel.org \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=cgroups@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=gthelen@google.com \
    --cc=hannes@cmpxchg.org \
    --cc=haoluo@google.com \
    --cc=john.fastabend@gmail.com \
    --cc=kafai@fb.com \
    --cc=kpsingh@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizefan.x@bytedance.com \
    --cc=mhocko@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=rientjes@google.com \
    --cc=roman.gushchin@linux.dev \
    --cc=sdf@google.com \
    --cc=shakeelb@google.com \
    --cc=shuah@kernel.org \
    --cc=songliubraving@fb.com \
    --cc=tj@kernel.org \
    --cc=yhs@fb.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox