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 386E3C43444 for ; Thu, 10 Jan 2019 17:52:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0E1C2214DA for ; Thu, 10 Jan 2019 17:52:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=linaro.org header.i=@linaro.org header.b="e5zAqn8F" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730696AbfAJRwS (ORCPT ); Thu, 10 Jan 2019 12:52:18 -0500 Received: from mail-qt1-f196.google.com ([209.85.160.196]:44574 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730738AbfAJRwS (ORCPT ); Thu, 10 Jan 2019 12:52:18 -0500 Received: by mail-qt1-f196.google.com with SMTP id n32so14243041qte.11 for ; Thu, 10 Jan 2019 09:52:17 -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=e5zAqn8FwHcZKg1LC1tVPV7fhNt8tU9+cfuLDFrOAMll/bqWLEQPC+EuqBm8MbKYAh brJNsri0/RUkvWVnD9XM7y7dbAcUZaWX0ra2H7spljiB9wfhK3ZtcuN+npFaSGPpnFm/ 39hgPcUCnsaE6I3Re5kLsGWyhAaV8oxHO3cUY= 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=sFx2cZNWcmxRKvEmZSr7ZZ8CjR0mSsbfITl5dVJjRwCfVKr/NSP4/pImCXuJC1/S98 zwQcIm9r4uStYFnm0KqFtdY8x9NKcqZ72jvOsTc4+R3YgQ9tez6oyBl52THQmLSQLHG5 /yQATsnFt3Z+Ojcl2l2CymfkImjEOLY0uZhO2tkmCwqqCqkrv9m1pwSVesAbUjNl9SYu Z+NtzmwNDgO1w8tVUSxG9aAgL8fh4MW7q/q4GEgugLx16j5t9lN5eBlAmVFzARxM6j9H vIs/+eGvEl/+8zdEgaR3kkjVmsG/u9VKDYw3Asa2+HqnERFyZBo5mypsQ8LV/sPGUSFL 1iJw== X-Gm-Message-State: AJcUukc0JFHqlgqQavNXoHIyqV6v1HyQFS6nycMHVsPsMwF6yWJ6TXps bQg440cNsKvbmk64pc1AY2eWyv+0Px4= X-Google-Smtp-Source: ALg8bN4hh5B70vBsTCbjL+oql5kQs5nTITZCmCYMvH6f8f/CBktsDKHEyLPKE0j/KdhZn3rAelGr3g== X-Received: by 2002:ad4:4391:: with SMTP id s17mr10830663qvr.32.1547142736635; Thu, 10 Jan 2019 09:52:16 -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 b8sm41815904qka.79.2019.01.10.09.52.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jan 2019 09:52:15 -0800 (PST) From: David Long To: stable@vger.kernel.org, Russell King - ARM Linux , Florian Fainelli , Julien Thierry , Tony Lindgren , Marc Zyngier , Mark Rutland Cc: Greg KH , Mark Brown Subject: [PATCH 4.14 16/17] ARM: ensure that processor vtables is not lost after boot Date: Thu, 10 Jan 2019 12:51:49 -0500 Message-Id: <20190110175150.5239-17-dave.long@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190110175150.5239-1-dave.long@linaro.org> References: <20190110175150.5239-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