public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Hao Luo <haoluo@google.com>
To: linux-kernel@vger.kernel.org, bpf@vger.kernel.org,
	cgroups@vger.kernel.org, netdev@vger.kernel.org
Cc: Alexei Starovoitov <ast@kernel.org>,
	Andrii Nakryiko <andrii@kernel.org>,
	Daniel Borkmann <daniel@iogearbox.net>,
	Martin KaFai Lau <martin.lau@linux.dev>,
	Song Liu <song@kernel.org>, Yonghong Song <yhs@fb.com>,
	Tejun Heo <tj@kernel.org>, Zefan Li <lizefan.x@bytedance.com>,
	KP Singh <kpsingh@kernel.org>,
	Johannes Weiner <hannes@cmpxchg.org>,
	Michal Hocko <mhocko@kernel.org>,
	Benjamin Tissoires <benjamin.tissoires@redhat.com>,
	John Fastabend <john.fastabend@gmail.com>,
	Michal Koutny <mkoutny@suse.com>,
	Roman Gushchin <roman.gushchin@linux.dev>,
	David Rientjes <rientjes@google.com>,
	Stanislav Fomichev <sdf@google.com>,
	Shakeel Butt <shakeelb@google.com>,
	Yosry Ahmed <yosryahmed@google.com>, Hao Luo <haoluo@google.com>
Subject: [PATCH bpf-next v7 2/8] cgroup: enable cgroup_get_from_file() on cgroup1
Date: Fri,  5 Aug 2022 14:48:15 -0700	[thread overview]
Message-ID: <20220805214821.1058337-3-haoluo@google.com> (raw)
In-Reply-To: <20220805214821.1058337-1-haoluo@google.com>

From: Yosry Ahmed <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>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Hao Luo <haoluo@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 13c8e91d7862..49803849a289 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -6099,11 +6099,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.37.1.559.g78731f0fdb-goog


  parent reply	other threads:[~2022-08-05 21:49 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-05 21:48 [PATCH bpf-next v7 0/8] bpf: rstat: cgroup hierarchical stats Hao Luo
2022-08-05 21:48 ` [PATCH bpf-next v7 1/8] btf: Add a new kfunc flag which allows to mark a function to be sleepable Hao Luo
2022-08-05 21:48 ` Hao Luo [this message]
2022-08-05 21:48 ` [PATCH bpf-next v7 3/8] bpf, iter: Fix the condition on p when calling stop Hao Luo
2022-08-05 21:48 ` [PATCH bpf-next v7 4/8] bpf: Introduce cgroup iter Hao Luo
2022-08-09  0:18   ` Andrii Nakryiko
2022-08-09  0:56     ` Hao Luo
2022-08-09 16:23       ` Alexei Starovoitov
2022-08-09 18:38         ` Hao Luo
2022-08-11  3:10           ` Hao Luo
2022-08-11 14:09             ` Yosry Ahmed
2022-08-16  4:12               ` Andrii Nakryiko
2022-08-16  4:19                 ` Andrii Nakryiko
2022-08-16  6:52                 ` Hao Luo
2022-08-16 17:17                   ` Andrii Nakryiko
2022-08-16 17:22                     ` Hao Luo
2022-08-05 21:48 ` [PATCH bpf-next v7 5/8] selftests/bpf: Test cgroup_iter Hao Luo
2022-08-09  0:20   ` Andrii Nakryiko
2022-08-09  1:18     ` Hao Luo
2022-08-05 21:48 ` [PATCH bpf-next v7 6/8] cgroup: bpf: enable bpf programs to integrate with rstat Hao Luo
2022-08-05 21:48 ` [PATCH bpf-next v7 7/8] selftests/bpf: extend cgroup helpers Hao Luo
2022-08-05 21:48 ` [PATCH bpf-next v7 8/8] selftests/bpf: add a selftest for cgroup hierarchical stats collection Hao Luo
2022-08-09 16:20 ` [PATCH bpf-next v7 0/8] bpf: rstat: cgroup hierarchical stats patchwork-bot+netdevbpf

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=20220805214821.1058337-3-haoluo@google.com \
    --to=haoluo@google.com \
    --cc=andrii@kernel.org \
    --cc=ast@kernel.org \
    --cc=benjamin.tissoires@redhat.com \
    --cc=bpf@vger.kernel.org \
    --cc=cgroups@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=hannes@cmpxchg.org \
    --cc=john.fastabend@gmail.com \
    --cc=kpsingh@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizefan.x@bytedance.com \
    --cc=martin.lau@linux.dev \
    --cc=mhocko@kernel.org \
    --cc=mkoutny@suse.com \
    --cc=netdev@vger.kernel.org \
    --cc=rientjes@google.com \
    --cc=roman.gushchin@linux.dev \
    --cc=sdf@google.com \
    --cc=shakeelb@google.com \
    --cc=song@kernel.org \
    --cc=tj@kernel.org \
    --cc=yhs@fb.com \
    --cc=yosryahmed@google.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