[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <e8186bf5-51ed-453f-8ba2-350735a2b058@redhat.com>
Date: Sun, 4 Aug 2024 21:23:16 -0400
From: Waiman Long <longman@...hat.com>
To: Xiu Jianfeng <xiujianfeng@...weicloud.com>, tj@...nel.org,
lizefan.x@...edance.com, hannes@...xchg.org, mkoutny@...e.com
Cc: cgroups@...r.kernel.org, linux-kernel@...r.kernel.org,
xiujianfeng@...wei.com
Subject: Re: [PATCH v2 -next] cgroup/pids: Remove unreachable paths of
pids_{can,cancel}_fork
On 8/4/24 20:43, Xiu Jianfeng wrote:
> From: Xiu Jianfeng <xiujianfeng@...wei.com>
>
> According to the implementation of cgroup_css_set_fork(), it will fail
> if cset cannot be found and the can_fork/cancel_fork methods will not
> be called in this case, which means that the argument 'cset' for these
> methods must not be NULL, so remove the unrechable paths in them.
>
> Signed-off-by: Xiu Jianfeng <xiujianfeng@...wei.com>
> ---
> v2: reword the commit message
> ---
> kernel/cgroup/pids.c | 14 ++------------
> 1 file changed, 2 insertions(+), 12 deletions(-)
>
> diff --git a/kernel/cgroup/pids.c b/kernel/cgroup/pids.c
> index 34aa63d7c9c6..8f61114c36dd 100644
> --- a/kernel/cgroup/pids.c
> +++ b/kernel/cgroup/pids.c
> @@ -272,15 +272,10 @@ static void pids_event(struct pids_cgroup *pids_forking,
> */
> static int pids_can_fork(struct task_struct *task, struct css_set *cset)
> {
> - struct cgroup_subsys_state *css;
> struct pids_cgroup *pids, *pids_over_limit;
> int err;
>
> - if (cset)
> - css = cset->subsys[pids_cgrp_id];
> - else
> - css = task_css_check(current, pids_cgrp_id, true);
> - pids = css_pids(css);
> + pids = css_pids(cset->subsys[pids_cgrp_id]);
> err = pids_try_charge(pids, 1, &pids_over_limit);
> if (err)
> pids_event(pids, pids_over_limit);
> @@ -290,14 +285,9 @@ static int pids_can_fork(struct task_struct *task, struct css_set *cset)
>
> static void pids_cancel_fork(struct task_struct *task, struct css_set *cset)
> {
> - struct cgroup_subsys_state *css;
> struct pids_cgroup *pids;
>
> - if (cset)
> - css = cset->subsys[pids_cgrp_id];
> - else
> - css = task_css_check(current, pids_cgrp_id, true);
> - pids = css_pids(css);
> + pids = css_pids(cset->subsys[pids_cgrp_id]);
> pids_uncharge(pids, 1);
> }
>
Reviewed-by: Waiman Long <longman@...hat.com>
Powered by blists - more mailing lists