]> git.baikalelectronics.ru Git - kernel.git/commit
locking/csd_lock: Change csdlock_debug from early_param to __setup
authorChen Zhongjin <chenzhongjin@huawei.com>
Tue, 10 May 2022 09:46:39 +0000 (17:46 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Aug 2022 12:24:24 +0000 (14:24 +0200)
commit4c2a3f570c4c80b56288a646692afd83c27f13d6
tree08aadab7ad4bcfd867e08eb4695630e6aafb2d3a
parente545e9f5f419ffcaae5a7f36d22eae3e3a6159f1
locking/csd_lock: Change csdlock_debug from early_param to __setup

[ Upstream commit 258b7f51c305552ffbe477b143e58363895ac255 ]

The csdlock_debug kernel-boot parameter is parsed by the
early_param() function csdlock_debug().  If set, csdlock_debug()
invokes static_branch_enable() to enable csd_lock_wait feature, which
triggers a panic on arm64 for kernels built with CONFIG_SPARSEMEM=y and
CONFIG_SPARSEMEM_VMEMMAP=n.

With CONFIG_SPARSEMEM_VMEMMAP=n, __nr_to_section is called in
static_key_enable() and returns NULL, resulting in a NULL dereference
because mem_section is initialized only later in sparse_init().

This is also a problem for powerpc because early_param() functions
are invoked earlier than jump_label_init(), also resulting in
static_key_enable() failures.  These failures cause the warning "static
key 'xxx' used before call to jump_label_init()".

Thus, early_param is too early for csd_lock_wait to run
static_branch_enable(), so changes it to __setup to fix these.

Fixes: e600706be131 ("locking/csd_lock: Add boot parameter for controlling CSD lock debugging")
Cc: stable@vger.kernel.org
Reported-by: Chen jingwen <chenjingwen6@huawei.com>
Signed-off-by: Chen Zhongjin <chenzhongjin@huawei.com>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
kernel/smp.c