From: Tejun Heo <tj@kernel.org>
To: lizefan@huawei.com, hannes@cmpxchg.org, peterz@infradead.org,
mingo@redhat.com, longman@redhat.com
Cc: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-team@fb.com, pjt@google.com, luto@amacapital.net,
efault@gmx.de, torvalds@linux-foundation.org, guro@fb.com
Subject: [PATCH cgroup/for-4.15] cgroup: statically initialize init_css_set->dfl_cgrp
Date: Mon, 25 Sep 2017 14:10:30 -0700 [thread overview]
Message-ID: <20170925211030.GB560070@devbig577.frc2.facebook.com> (raw)
In-Reply-To: <20170811163754.3939102-1-tj@kernel.org>
Hello,
A follow-up patch to fix sporadic oops during boot which is caused by
trying dereference the default cgroup from accounting code before
cgroup is initialized.
Applied to cgroup/for-4.15.
Thanks.
------ 8< ------
>From 38683148828165ea0b66ace93a9fedc2d3281e27 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Mon, 25 Sep 2017 13:50:20 -0700
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Like other csets, init_css_set's dfl_cgrp is initialized when the cset
gets linked. init_css_set gets linked in cgroup_init(). This has
been fine till now but the recently added basic CPU usage accounting
may end up accessing dfl_cgrp of init before cgroup_init() leading to
the following oops.
SELinux: Initializing.
BUG: unable to handle kernel NULL pointer dereference at 00000000000000b0
IP: account_system_index_time+0x60/0x90
PGD 0 P4D 0
Oops: 0000 [#1] SMP
Modules linked in:
CPU: 0 PID: 0 Comm: swapper/0 Not tainted 4.14.0-rc2-00003-g041cd64 #10
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS
+1.9.3-20161025_171302-gandalf 04/01/2014
task: ffffffff81e10480 task.stack: ffffffff81e00000
RIP: 0010:account_system_index_time+0x60/0x90
RSP: 0000:ffff880011e03cb8 EFLAGS: 00010002
RAX: ffffffff81ef8800 RBX: ffffffff81e10480 RCX: 0000000000000003
RDX: 0000000000000000 RSI: 00000000000f4240 RDI: 0000000000000000
RBP: ffff880011e03cc0 R08: 0000000000010000 R09: 0000000000000000
R10: 0000000000000020 R11: 0000003b9aca0000 R12: 000000000001c100
R13: 0000000000000000 R14: ffffffff81e10480 R15: ffffffff81e03cd8
FS: 0000000000000000(0000) GS:ffff880011e00000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00000000000000b0 CR3: 0000000001e09000 CR4: 00000000000006b0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
<IRQ>
account_system_time+0x45/0x60
account_process_tick+0x5a/0x140
update_process_times+0x22/0x60
tick_periodic+0x2b/0x90
tick_handle_periodic+0x25/0x70
timer_interrupt+0x15/0x20
__handle_irq_event_percpu+0x7e/0x1b0
handle_irq_event_percpu+0x23/0x60
handle_irq_event+0x42/0x70
handle_level_irq+0x83/0x100
handle_irq+0x6f/0x110
do_IRQ+0x46/0xd0
common_interrupt+0x9d/0x9d
Fix it by statically initializing init_css_set.dfl_cgrp so that init's
default cgroup is accessible from the get-go.
Fixes: 041cd640b2f3 ("cgroup: Implement cgroup2 basic CPU usage accounting")
Reported-by: “kbuild-all@01.org” <kbuild-all@01.org>
Signed-off-by: Tejun Heo <tj@kernel.org>
---
kernel/cgroup/cgroup.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index d036625..7975b20 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -649,6 +649,14 @@ struct css_set init_css_set = {
.cgrp_links = LIST_HEAD_INIT(init_css_set.cgrp_links),
.mg_preload_node = LIST_HEAD_INIT(init_css_set.mg_preload_node),
.mg_node = LIST_HEAD_INIT(init_css_set.mg_node),
+
+ /*
+ * The following field is re-initialized when this cset gets linked
+ * in cgroup_init(). However, let's initialize the field
+ * statically too so that the default cgroup can be accessed safely
+ * early during boot.
+ */
+ .dfl_cgrp = &cgrp_dfl_root.cgrp,
};
static int css_set_count = 1; /* 1 for init_css_set */
--
2.9.5
next prev parent reply other threads:[~2017-09-25 21:10 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-11 16:37 [PATCHSET for-4.14] cgroup, sched: cgroup2 basic resource accounting Tejun Heo
2017-08-11 16:37 ` [PATCH 1/3] sched/cputime: Expose cputime_adjust() Tejun Heo
2017-08-11 16:37 ` [PATCH 2/3] cpuacct: Introduce cgroup_account_cputime[_field]() Tejun Heo
2017-08-11 17:28 ` [PATCH v2 " Tejun Heo
2017-08-11 16:37 ` [PATCH 3/3] cgroup: Implement cgroup2 basic CPU usage accounting Tejun Heo
2017-08-11 20:19 ` Waiman Long
2017-08-13 19:44 ` Tejun Heo
2017-08-13 23:20 ` Waiman Long
2017-08-17 12:07 ` Roman Gushchin
2017-08-17 13:13 ` Tejun Heo
2017-08-29 14:32 ` Peter Zijlstra
2017-08-29 15:24 ` Tejun Heo
2017-08-29 15:32 ` Waiman Long
2017-08-29 15:42 ` Tejun Heo
2017-08-29 15:59 ` Peter Zijlstra
2017-08-29 17:43 ` [PATCH v2 " Tejun Heo
2017-08-29 18:06 ` Waiman Long
2017-08-29 18:10 ` Tejun Heo
2017-08-16 18:52 ` [PATCHSET for-4.14] cgroup, sched: cgroup2 basic resource accounting Tejun Heo
2017-08-17 8:13 ` Ingo Molnar
2017-08-17 13:01 ` Tejun Heo
2017-08-17 15:03 ` Ingo Molnar
2017-08-24 17:20 ` Tejun Heo
2017-09-22 18:05 ` Tejun Heo
2017-09-23 13:37 ` Peter Zijlstra
2017-09-23 13:44 ` Tejun Heo
2017-09-25 7:27 ` Peter Zijlstra
2017-09-25 15:07 ` Tejun Heo
2017-09-25 21:10 ` Tejun Heo [this message]
2017-09-25 21:34 ` [PATCH cgroup/for-4.15] sched/cputime: Add dummy cputime_adjust() implementation for CONFIG_VIRT_CPU_ACCOUNTING_NATIVE Tejun Heo
2017-09-26 9:10 ` Peter Zijlstra
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=20170925211030.GB560070@devbig577.frc2.facebook.com \
--to=tj@kernel.org \
--cc=cgroups@vger.kernel.org \
--cc=efault@gmx.de \
--cc=guro@fb.com \
--cc=hannes@cmpxchg.org \
--cc=kernel-team@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=longman@redhat.com \
--cc=luto@amacapital.net \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=pjt@google.com \
--cc=torvalds@linux-foundation.org \
/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
Powered by JetHome