2022-05-17 20:22:48

by Xiu Jianfeng

Subject: [PATCH -next] cgroup: Make cgroup_debug static

Make cgroup_debug static since it's only used in cgroup.c

Signed-off-by: Xiu Jianfeng <[email protected]>
---
kernel/cgroup/cgroup-internal.h | 1 -
kernel/cgroup/cgroup.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/kernel/cgroup/cgroup-internal.h b/kernel/cgroup/cgroup-internal.h
index 6e36e854b512..5da09c74228d 100644
--- a/kernel/cgroup/cgroup-internal.h
+++ b/kernel/cgroup/cgroup-internal.h
@@ -12,7 +12,6 @@
#define TRACE_CGROUP_PATH_LEN 1024
extern spinlock_t trace_cgroup_path_lock;
extern char trace_cgroup_path[TRACE_CGROUP_PATH_LEN];
-extern bool cgroup_debug;
extern void __init enable_debug_cgroup(void);

/*
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index adb820e98f24..a97fd051430b 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -96,7 +96,7 @@ EXPORT_SYMBOL_GPL(css_set_lock);

DEFINE_SPINLOCK(trace_cgroup_path_lock);
char trace_cgroup_path[TRACE_CGROUP_PATH_LEN];
-bool cgroup_debug __read_mostly;
+static bool cgroup_debug __read_mostly;

/*
* Protects cgroup_idr and css_idr so that IDs can be released without
--
2.17.1

2022-05-18 04:48:46

by Tejun Heo

Subject: Re: [PATCH -next] cgroup: Make cgroup_debug static

On Tue, May 17, 2022 at 07:25:23PM +0800, Xiu Jianfeng wrote:
> Make cgroup_debug static since it's only used in cgroup.c
>
> Signed-off-by: Xiu Jianfeng <[email protected]>

The only thing it does is gating CFTYPE_DEBUG which isn't used anymore.
Can you remove both CFTYPE_DEBUG and cgroup_debug() instead?

Thanks.

--
tejun

2022-05-18 17:01:10

by Tejun Heo

Subject: Re: [PATCH -next] cgroup: Make cgroup_debug static

On Wed, May 18, 2022 at 02:48:36PM +0800, xiujianfeng wrote:
>
> 在 2022/5/18 1:06, Tejun Heo 写道:
> > On Tue, May 17, 2022 at 07:25:23PM +0800, Xiu Jianfeng wrote:
> > > Make cgroup_debug static since it's only used in cgroup.c
> > >
> > > Signed-off-by: Xiu Jianfeng <[email protected]>
> > The only thing it does is gating CFTYPE_DEBUG which isn't used anymore.
> > Can you remove both CFTYPE_DEBUG and cgroup_debug() instead?
>
> It's ok to me, but I found CFTYPE_DEBUG is still used in cpuset subsys,
>
>   .name = "cpus.subpartitions",
>   .seq_show = cpuset_common_seq_show,
>   .private = FILE_SUBPARTS_CPULIST,
>   .flags = CFTYPE_DEBUG,
>
> if remove CFTYPE_DEBUG and cgroup_debug,  cpus.subpartitions will be showed
> by default,  is this ok?

Ah, I missed that. You're right. Lemme apply the original path.

Thanks.

--
tejun

2022-05-18 17:07:06

by Tejun Heo

Subject: Re: [PATCH -next] cgroup: Make cgroup_debug static

On Tue, May 17, 2022 at 07:25:23PM +0800, Xiu Jianfeng wrote:
> Make cgroup_debug static since it's only used in cgroup.c
>
> Signed-off-by: Xiu Jianfeng <[email protected]>

Applied to cgroup/for-5.19.

Thanks.

--
tejun