Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp490484yba; Wed, 15 May 2019 05:04:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqw3eXBEugLmTlVTL7gJOW2jMqWBgz845zxY8mEFcVNGOe8u+3WTQ3Q2kFOccePtRM634/e5 X-Received: by 2002:a17:902:7d83:: with SMTP id a3mr44740371plm.305.1557921893195; Wed, 15 May 2019 05:04:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557921893; cv=none; d=google.com; s=arc-20160816; b=lJkGSiP4J7zZhkFLxM+M5Ai0KwBL6wHsxUwD6gsHU7IMm5Uczs9szX0cZyR0uHBlVJ 5uowCb+MOrYWu5cddNAUB6lRe75nhnXPYzuEHb8aZALsz8wZPhvrG3LF+wsOOx+NCHiv W1QGz78NH2tluq+hn+OecNO3ZVVyOtg12t5s+EFfGlu9r5Jn1MBmRz/gnSD+12stZFBF tLwyhyVHqIHjtzSx4n0RdLw+iT7sDVw8m1daKfir09cKqPoBpxRYIAWSGgTSK8NLA/Dm p40zOFtnnf9c/BtFJGjPp0fDF7Kbnwo4+zlTtwvC/j5hD3IMSANfv0fTnOu1AksvFOVs VKEw== 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=T7tLctGctR3ptlo9reA/kPgakbo3gXI1f2t2xk8XHKo=; b=bWs1MEDrltl235ZYBgbmlbO1NEcIkUGVfUT8k1r+1/FmJfB+zPjJ/xYT+Phi7AEAcp I8aJRlrjoQp894tnMd8+HskZ6R+lAO7WT7ap0piAT1PGcJnHkmGTA62qSfLUQMfLbBnp DyRe98AMPSz7SCQ44H531B5MsSo47htJPmumAvJEZoo72eeUn5LtDS9+bXczFGSzpRtj 1lB9rmrnKeCUv0kRJqwOIVKv9nhmGlM+3LDhWPyQvmHUR6ZFjyTVslqrzuJ3bCfyghzj 14ZjWqQMK2SZTwKQex5dfp8A1pRgjKo5A53EqbSCRS3+PdTYeBgYn/ENx57KfVPqRJeD SI/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="f3G6ax/d"; 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 f90si1585295plb.25.2019.05.15.05.04.38; Wed, 15 May 2019 05:04:53 -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="f3G6ax/d"; 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 S1730422AbfEOMBd (ORCPT + 99 others); Wed, 15 May 2019 08:01:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:49844 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729612AbfEOLN6 (ORCPT ); Wed, 15 May 2019 07:13:58 -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 E0F5520862; Wed, 15 May 2019 11:13:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557918837; bh=EjGdWzC78v/tPe7/TXnVS+KJPS4UOC1N3+oDzI1GkZg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f3G6ax/duQ9JC/oeXnBlMvebw3QSDVtr57kJPlcZJ5m7+O1B+J98hzsliRaWvZueZ yl9mSJPGQy/OhhECeWZxsrdDKoptzus3F22WG8KUqH1d1UOdBq2uXHeD8cAJUaceR5 9M5YAVqpvNzWYkoYQ22GrQMBUSHSEqdfmYe7r6Pw= 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 4.9 19/51] init: initialize jump labels before command line option parsing Date: Wed, 15 May 2019 12:55:54 +0200 Message-Id: <20190515090623.160610879@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090616.669619870@linuxfoundation.org> References: <20190515090616.669619870@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 3c7f71d8e7046..148843e627a06 100644 --- a/init/main.c +++ b/init/main.c @@ -516,6 +516,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, @@ -525,8 +527,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