Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp471525yba; Wed, 15 May 2019 04:43:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqwNnWuZjhJdGhaujNCTgn8pAfJD/Et4VnsrCz6z/vYCbxLfvzILCJNrnBeJQ49FZDjHVG2X X-Received: by 2002:a62:e718:: with SMTP id s24mr46917853pfh.247.1557920620001; Wed, 15 May 2019 04:43:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557920619; cv=none; d=google.com; s=arc-20160816; b=0RZkeXs0N8MvaKP26DUkiuJ7zKm7lkQgnUwIixhTVMcfVYFHpopBdnkcoLmlH2sE3x OqgC6nbQ5fC2DVBg2nw1x1Xcz9tWgousxOX3I/Jg2ZkXwxMaqkAEs8yNWUX28pXwfMXo XQ4UdeoxaPP8xbmECC8U72ccMXd9y0tdLZEwNdeDMzryAzDhcJvlwyCXORL8HrZ0vBCa zNY03HEkIecN9SixJZZ/rliquZv1kkymVsK3Mpnrep3blcv5RurkHCVLxsfo6f+8aQbW 17UkRGsEVeuATXeA/opD36kVG9TitxFjvGqcwNjpssb+rEwF2K8dSex2PvxVlZyRlkUo vaag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+MJloMRvwToIIjPxij/FLTE63dMUSQeeaxwbWMcHIXw=; b=M1M8UO8vdKQXT6mpPVpNrgSxIJJEnDSnhFFXu4MjvlfxG/grdcq8BzbsSWkZyFkgft mD++0n3d2j/PVLk9d3eDIk1HS7Vwh3DLZLhlNO02dIwRCIkNw1rnbVLlYHijuScdqwrX 06Zg9FS74yqLLyj0cY2bAaAqRhRw+zondqO3bzdAlYBFmMX/J+ZZrhC9wOYrSdOBdzdE qEarF9HmkjxKRwq3UwenLHy49JkO7aDVu32jL29RgzSPMYw0m8h2WQAzDsF1C8WHsqyf t8oLyzLrQvG+B2XSVGKTFJLjxGg4Lv+TCXZQts61A9B9bRHCz+LyhDGVYloYuTYvA/di GtVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=khQt5Ntu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p16si1596296pgg.59.2019.05.15.04.43.25; Wed, 15 May 2019 04:43:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=khQt5Ntu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732676AbfEOLlu (ORCPT + 99 others); Wed, 15 May 2019 07:41:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:39550 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732027AbfEOL22 (ORCPT ); Wed, 15 May 2019 07:28:28 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 97C2420881; Wed, 15 May 2019 11:28:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557919707; bh=OBQuELnhqmPV0sBmv0eweVPY123OuzMvGNhslJ0/i7U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=khQt5NtuxZA7CortcvVu/ctQQoBsxzNXgFzTQG7ip2NLGmb8sS4f1ev5oCr9u8hLV goxX6jeTFuBIC+amzk3iMZRGpyiLGVRYQExk71N3mJ58SCfWd79YjCSvp9mGJMNmOp maiDjIi1zb+DMsnCcoh/47PIxlRSYOipwMhgNlwU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Williams , Guenter Roeck , Kees Cook , Mathieu Desnoyers , Thomas Gleixner , Mike Rapoport , Russell King , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH 5.0 062/137] init: initialize jump labels before command line option parsing Date: Wed, 15 May 2019 12:55:43 +0200 Message-Id: <20190515090657.981383435@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090651.633556783@linuxfoundation.org> References: <20190515090651.633556783@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 6041186a32585fc7a1d0f6cfe2f138b05fdc3c82 ] When a module option, or core kernel argument, toggles a static-key it requires jump labels to be initialized early. While x86, PowerPC, and ARM64 arrange for jump_label_init() to be called before parse_args(), ARM does not. Kernel command line: rdinit=/sbin/init page_alloc.shuffle=1 panic=-1 console=ttyAMA0,115200 page_alloc.shuffle=1 ------------[ cut here ]------------ WARNING: CPU: 0 PID: 0 at ./include/linux/jump_label.h:303 page_alloc_shuffle+0x12c/0x1ac static_key_enable(): static key 'page_alloc_shuffle_key+0x0/0x4' used before call to jump_label_init() Modules linked in: CPU: 0 PID: 0 Comm: swapper Not tainted 5.1.0-rc4-next-20190410-00003-g3367c36ce744 #1 Hardware name: ARM Integrator/CP (Device Tree) [] (unwind_backtrace) from [] (show_stack+0x10/0x18) [] (show_stack) from [] (dump_stack+0x18/0x24) [] (dump_stack) from [] (__warn+0xe0/0x108) [] (__warn) from [] (warn_slowpath_fmt+0x44/0x6c) [] (warn_slowpath_fmt) from [] (page_alloc_shuffle+0x12c/0x1ac) [] (page_alloc_shuffle) from [] (shuffle_store+0x28/0x48) [] (shuffle_store) from [] (parse_args+0x1f4/0x350) [] (parse_args) from [] (start_kernel+0x1c0/0x488) Move the fallback call to jump_label_init() to occur before parse_args(). The redundant calls to jump_label_init() in other archs are left intact in case they have static key toggling use cases that are even earlier than option parsing. Link: http://lkml.kernel.org/r/155544804466.1032396.13418949511615676665.stgit@dwillia2-desk3.amr.corp.intel.com Signed-off-by: Dan Williams Reported-by: Guenter Roeck Reviewed-by: Kees Cook Cc: Mathieu Desnoyers Cc: Thomas Gleixner Cc: Mike Rapoport Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- init/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init/main.c b/init/main.c index c86a1c8f19f40..7ae8245452650 100644 --- a/init/main.c +++ b/init/main.c @@ -574,6 +574,8 @@ asmlinkage __visible void __init start_kernel(void) page_alloc_init(); pr_notice("Kernel command line: %s\n", boot_command_line); + /* parameters may set static keys */ + jump_label_init(); parse_early_param(); after_dashes = parse_args("Booting kernel", static_command_line, __start___param, @@ -583,8 +585,6 @@ asmlinkage __visible void __init start_kernel(void) parse_args("Setting init args", after_dashes, NULL, 0, -1, -1, NULL, set_init_arg); - jump_label_init(); - /* * These use large bootmem allocations and must precede * kmem_cache_init() -- 2.20.1