Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp2498632pxb; Tue, 9 Mar 2021 04:13:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJzv+8U1vcS4B0ZOu61nikp/VOzraFzj2IOQ1k/ux7CKIJO6hItWaQg11RUuSAXXTI2svj+9 X-Received: by 2002:a17:906:1a16:: with SMTP id i22mr2962068ejf.522.1615292018725; Tue, 09 Mar 2021 04:13:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615292018; cv=none; d=google.com; s=arc-20160816; b=PrMpj0I/aG9xpTN4U/D14L0a90wMYhymCK+btPhmOsptEsldP0L+7lxmZhPeOP4tel g1ezfE1scGOcgyoMkTLbdbPPlDV9K4lgF/a0wygVVaTgMpscHH691oB9AXSRNRAvqQLk U2FuVVt/kCzMD5hH1gIldK96p4BYPi6ZrFHnDD6aAgFnREhwefXA1eLX/QnQL42n62gX h768IrJ0gkeb5IwFxNudIfad+ri0wwxQNKGRTlHgEc6yLHBy1hudbGcgtoNWo43qqQrD VHR1QSoka4rMTj1HDNEs/i7KZyB56oRFjFx0jKZ0SCbl6EDZyz55SGedZ7O+9LC3FipH diWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:cc:to:subject:from:references:in-reply-to :message-id; bh=JToBHYZg39oZtIPjBcno3RdXa4RwSWCphUZFUmd4nWA=; b=r4L0XXVL8CZifyi6+db0/hS84RN+Fus4Az8KUEzn67H9YLW/ZJSUbk35MZKQNU0IdA bjf9JSZU/t9AE3dXi5MOIjn0cQNDKETin388UU6gWLaccvF60LFZcp1+aKopywHqYc3y cgxIsPE0R1EOKQnGxZiI3ZgLiLyEcCsA8/j7YpkpU+yMbm/86xE9Iip1JF6eHljZZW7D NV0/7Vm0foTi93GiG5SlWnK+TiGNxW+rlQ1rCU88B/3lMlokdLvgd0B5axRxheHoKCwN Hk2vosQoJFUagncniGUusLHuCgdpLaI4aq+Xv94JCs7YiinQOspCtepliYF3HAt3vkTg 7LgQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a7si10652732edm.320.2021.03.09.04.13.16; Tue, 09 Mar 2021 04:13:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231463AbhCIMKV (ORCPT + 99 others); Tue, 9 Mar 2021 07:10:21 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:16142 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231140AbhCIMJo (ORCPT ); Tue, 9 Mar 2021 07:09:44 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4DvvCV2FM3z9tyjK; Tue, 9 Mar 2021 13:09:42 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id lakAMHEI4lKy; Tue, 9 Mar 2021 13:09:42 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 4DvvCV1Vtvz9tyjH; Tue, 9 Mar 2021 13:09:42 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 982258B800; Tue, 9 Mar 2021 13:09:43 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id ljHoolQAssPL; Tue, 9 Mar 2021 13:09:43 +0100 (CET) Received: from po16121vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 58FEB8B7FC; Tue, 9 Mar 2021 13:09:43 +0100 (CET) Received: by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 3B84267555; Tue, 9 Mar 2021 12:09:43 +0000 (UTC) Message-Id: <093fab6b58815862d34fffb75fd69b826cf9bf4a.1615291472.git.christophe.leroy@csgroup.eu> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v2 17/43] powerpc/32: Statically initialise first emergency context To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , npiggin@gmail.com Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Tue, 9 Mar 2021 12:09:43 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The check of the emergency context initialisation in vmap_stack_overflow is buggy for the SMP case, as it compares r1 with 0 while in the SMP case r1 is offseted by the CPU id. Instead of fixing it, just perform static initialisation of the first emergency context. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/head_32.h | 6 +----- arch/powerpc/kernel/setup_32.c | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/kernel/head_32.h b/arch/powerpc/kernel/head_32.h index 88b02bd91e8e..15c6fc7cbbf5 100644 --- a/arch/powerpc/kernel/head_32.h +++ b/arch/powerpc/kernel/head_32.h @@ -205,11 +205,7 @@ lis r1, emergency_ctx@ha #endif lwz r1, emergency_ctx@l(r1) - cmpwi cr1, r1, 0 - bne cr1, 1f - lis r1, init_thread_union@ha - addi r1, r1, init_thread_union@l -1: addi r1, r1, THREAD_SIZE - INT_FRAME_SIZE + addi r1, r1, THREAD_SIZE - INT_FRAME_SIZE EXCEPTION_PROLOG_2 SAVE_NVGPRS(r11) addi r3, r1, STACK_FRAME_OVERHEAD diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index 8ba49a6bf515..d7c1f92152af 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c @@ -164,7 +164,7 @@ void __init irqstack_early_init(void) } #ifdef CONFIG_VMAP_STACK -void *emergency_ctx[NR_CPUS] __ro_after_init; +void *emergency_ctx[NR_CPUS] __ro_after_init = {[0] = &init_stack}; void __init emergency_stack_init(void) { -- 2.25.0