From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65031C43381 for ; Thu, 14 Feb 2019 02:10:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 33FC8222C9 for ; Thu, 14 Feb 2019 02:10:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="bT3kHfdd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404990AbfBNCK4 (ORCPT ); Wed, 13 Feb 2019 21:10:56 -0500 Received: from mail-qt1-f193.google.com ([209.85.160.193]:42390 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404923AbfBNCKs (ORCPT ); Wed, 13 Feb 2019 21:10:48 -0500 Received: by mail-qt1-f193.google.com with SMTP id b8so5153819qtr.9 for ; Wed, 13 Feb 2019 18:10:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JWWM0xAWumO0p3bY/5x9HLgVZOQ3s148CYkAGBmj6Ho=; b=bT3kHfddWoHjrWDizCUVqCfJci9GhpLD5WdiKcPx9Y6Xh6xad5lgywK8s1mOg27y02 QotBuVnRS4fym+imfJ/3aIv9jA1z+WiYfT0k6Kw3FM0N16aQ1WlpQt0oIGr8fuo5ULh4 K2/4vkB77v7jLnFQj4sxAanlpa5QVZ5Ih2NCq5hOXpODH61LocWaDRHRurs00Kf3RR8S aZxMGLJgD8OjczBDYplKPCfkAe0fsCSFNLV3MFfiY9+hjg+AxUNeDM0jZuj3QZD2vPm6 Gh/P0w6VNVUH8s4ppUgnkZuKFSvLX66fiSdol/3PFrwvTeCyXB5aTTrjMmuwM/WOd8lu 5elQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JWWM0xAWumO0p3bY/5x9HLgVZOQ3s148CYkAGBmj6Ho=; b=HisR7s0g40aUNNwUUrpbZU9jBOSiZdRgnNFEGMyD56tNvBqiomgJHFjeXWSBOBJo9T LYw/DQzbVkynaBGY/xzuy4ZmClPU9RNvxk4WvfuexU++2VEJ0U+ZIkQkmlIDPiqBKt+r M04CC+UkA1msq2BwqmT+qc0mGo+u6p0sQ/FWFGN/apBLCYYPg78oCnv1WLDJlEMpmbpa 2fuXAcSHqKxwkpdasHyWT3/kitgZO9KI4EZzhqBSgfFgHcOixWkxKc4REW/JwRNoYRZl FyjnkxJVo6FN6Kh7EWGRIRKREDyodVDtZUFl9Y1nqWYnAyn366mUmzjaarKxDtJEFVJN MTvg== X-Gm-Message-State: AHQUAuaakFLEDswNi4f7qIcv+pYv+1SCq4+VOpUQsiZpEQFW76lfNNj+ z2fQ7F+Ot0uIrdSNh3osowbrr6h5OBI= X-Google-Smtp-Source: AHgI3IazptIldckFE+JpS4X8VLBIbLvw497vjBxkeyWoq09DUgmSPtkMKbQh84Uxc//yagtB+DHsxA== X-Received: by 2002:ac8:814:: with SMTP id u20mr1011078qth.313.1550110246693; Wed, 13 Feb 2019 18:10:46 -0800 (PST) Received: from localhost.localdomain (pool-72-71-243-63.cncdnh.fast00.myfairpoint.net. [72.71.243.63]) by smtp.googlemail.com with ESMTPSA id d63sm1091575qka.22.2019.02.13.18.10.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Feb 2019 18:10:46 -0800 (PST) From: David Long To: stable@vger.kernel.org, Russell King - ARM Linux , Florian Fainelli , Julien Thierry , Tony Lindgren , Marc Zyngier , Greg KH , Mark Rutland Cc: Will Deacon , Mark Brown , linux-kernel@vger.kernel.org Subject: [PATCH 4.14 V2 16/17] ARM: ensure that processor vtables is not lost after boot Date: Wed, 13 Feb 2019 21:10:21 -0500 Message-Id: <20190214021022.5313-17-dave.long@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190214021022.5313-1-dave.long@linaro.org> References: <20190214021022.5313-1-dave.long@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Russell King Commit 3a4d0c2172bcf15b7a3d9d498b2b355f9864286b upstream. Marek Szyprowski reported problems with CPU hotplug in current kernels. This was tracked down to the processor vtables being located in an init section, and therefore discarded after kernel boot, despite being required after boot to properly initialise the non-boot CPUs. Arrange for these tables to end up in .rodata when required. Reported-by: Marek Szyprowski Tested-by: Krzysztof Kozlowski Fixes: 383fb3ee8024 ("ARM: spectre-v2: per-CPU vtables to work around big.Little systems") Signed-off-by: Russell King Signed-off-by: David A. Long --- arch/arm/mm/proc-macros.S | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S index 81d0efb055c6..19516fbc2c55 100644 --- a/arch/arm/mm/proc-macros.S +++ b/arch/arm/mm/proc-macros.S @@ -274,6 +274,13 @@ .endm .macro define_processor_functions name:req, dabort:req, pabort:req, nommu=0, suspend=0, bugs=0 +/* + * If we are building for big.Little with branch predictor hardening, + * we need the processor function tables to remain available after boot. + */ +#if 1 // defined(CONFIG_BIG_LITTLE) && defined(CONFIG_HARDEN_BRANCH_PREDICTOR) + .section ".rodata" +#endif .type \name\()_processor_functions, #object .align 2 ENTRY(\name\()_processor_functions) @@ -309,6 +316,9 @@ ENTRY(\name\()_processor_functions) .endif .size \name\()_processor_functions, . - \name\()_processor_functions +#if 1 // defined(CONFIG_BIG_LITTLE) && defined(CONFIG_HARDEN_BRANCH_PREDICTOR) + .previous +#endif .endm .macro define_cache_functions name:req -- 2.17.1