Re: [PATCH 5.15 00/91] 5.15.108-rc1 review

Bagas Sanjaya
2023-04-19T04:18:16Z

[-- Attachment #1: Type: text/plain, Size: 2112 bytes --]

On Tue, Apr 18, 2023 at 10:51:05AM -0600, Tom Saeger wrote:
> > Tom Saeger identified that the below commit moves it out of ifdef.
> >
> > commit 354ed597442952fb680c9cafc7e4eb8a76f9514c
> > Author: Yu Zhao <yuzhao@google.com>
> > Date: Sun Sep 18 02:00:07 2022 -0600
> >
> > mm: multi-gen LRU: kill switch
> >
> FWIW - partially backporting (location of cgroup_mutex extern) from:
> 354ed5974429 ("mm: multi-gen LRU: kill switch")
>
> fixes x86_64 build for me.
>
> Regards,
>
> --Tom
>
> diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
> index 45cdb12243e3..460ba084888a 100644
> --- a/include/linux/cgroup.h
> +++ b/include/linux/cgroup.h
> @@ -433,6 +433,8 @@ static inline void cgroup_put(struct cgroup *cgrp)
> css_put(&cgrp->self);
> }
>
> +extern struct mutex cgroup_mutex;
> +
> /**
> * task_css_set_check - obtain a task's css_set with extra access conditions
> * @task: the task to obtain css_set for
> @@ -447,7 +449,6 @@ static inline void cgroup_put(struct cgroup *cgrp)
> * as locks used during the cgroup_subsys::attach() methods.
> */
> #ifdef CONFIG_PROVE_RCU
> -extern struct mutex cgroup_mutex;
> extern spinlock_t css_set_lock;
> #define task_css_set_check(task, __c) \
> rcu_dereference_check((task)->cgroups, \
> diff --git a/kernel/cgroup/cgroup-internal.h b/kernel/cgroup/cgroup-internal.h
> index d8fcc139ac05..28c32a01da7d 100644
> --- a/kernel/cgroup/cgroup-internal.h
> +++ b/kernel/cgroup/cgroup-internal.h
> @@ -165,7 +165,6 @@ struct cgroup_mgctx {
> #define DEFINE_CGROUP_MGCTX(name) \
> struct cgroup_mgctx name = CGROUP_MGCTX_INIT(name)
>
> -extern struct mutex cgroup_mutex;
> extern spinlock_t css_set_lock;
> extern struct cgroup_subsys *cgroup_subsys[];
> extern struct list_head cgroup_roots;

Yu, would you like to provide formal backport? Or maybe take Tom's
diff above and ACK it?

--
An old man doll... just what I always wanted! - Clara

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]