Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp2498690pxb; Tue, 9 Mar 2021 04:13:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJxn2x7oy+YxP0+3IFfxsqB+4T35K+YI/mPaQSZCKhGsddkWFQ/sLA2/zLzFTIcBtrghZmQ9 X-Received: by 2002:a17:906:1746:: with SMTP id d6mr20515503eje.36.1615292024572; Tue, 09 Mar 2021 04:13:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615292024; cv=none; d=google.com; s=arc-20160816; b=MAvAGqWBjk2s6oMooKryBg2DAdGcI67KpLz6LzimWltI9T9BxXS/v1mqTqt26XRqTW uMWLY5j0GIqoBvs9Lrh7b7hiCOTbJbXkH5GZzqq8oZAUOHUpJ58NSugn51UX0u+Y7TSW dIxhGW5J2Qh5jKYSLeYge+LQ9Na2nxMqvwhGwjPTysVt7dioJeyzEfa2U/vre7auB/on /xqiLhQvcTyNdLCfrPgZmLkAj9fGNd3C/XqNkQH+G3KWR7BAdRHNGswb5HwCcBTIA15S NLnyFxesPS5dM/X98xpBrd9Qq4P+l+Af3FXMP6Xh36C3lqOLT4HTQW5Xnjk03QertRFq j5Bw== 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=nyZ7/nd6yDUuNk22J9d1YYAhJcwgdP8IU6LiLa3432A=; b=eRHeVgcbplbYOcPPzclrPwlICWp3Pv4qDpGHyTTBoGcF8AaeoWvYVKaHc1TW8lM3iH +3o5j/K9RJX1dEARNQuW3FiJBzRwo32sVDoa1mLP9wRJx0qgcYo1C/zvwOkxT+vRarMW bQNcdElOmk5veoNY3urd6hBjUUjrBZ1PLpRbUUdSHGVzIu/6NQYJvZBhFhHP6TMt49zx MrajqMvWP0NCvMqMI8wsKo9Ew5xdHCGhM8L3hK0/9gqtmnSvyGogTc75jpEdRGIbMDQ3 SAGxXyMO0/Z5IcWrUOOWAZRewvd3J1fczq0Jrs8Y2ZBvX0HgTU1sz6FFRo0aQvMxVrVA RC/A== 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 n2si9761905ejl.444.2021.03.09.04.13.21; Tue, 09 Mar 2021 04:13:44 -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 S231495AbhCIMKX (ORCPT + 99 others); Tue, 9 Mar 2021 07:10:23 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:33529 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231162AbhCIMJq (ORCPT ); Tue, 9 Mar 2021 07:09:46 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4DvvCW5x5kz9tyjd; Tue, 9 Mar 2021 13:09:43 +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 1iIRQWswONXf; Tue, 9 Mar 2021 13:09:43 +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 4DvvCW56F5z9tyjW; Tue, 9 Mar 2021 13:09:43 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 09E018B804; Tue, 9 Mar 2021 13:09:45 +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 BCFj7NPgsukm; Tue, 9 Mar 2021 13:09:44 +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 663248B7FC; Tue, 9 Mar 2021 13:09:44 +0100 (CET) Received: by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 49FB667555; Tue, 9 Mar 2021 12:09:44 +0000 (UTC) Message-Id: <845f6b33f70842954d756c54d487ed5e9e2ee11c.1615291472.git.christophe.leroy@csgroup.eu> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v2 18/43] powerpc/32: Add vmap_stack_overflow label inside the macro 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:44 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For consistency, add in the macro the label used by exception prolog to branch to stack overflow processing. While at it, enclose the macro in #ifdef CONFIG_VMAP_STACK on the 8xx as already done on book3s/32. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/head_32.h | 3 ++- arch/powerpc/kernel/head_8xx.S | 3 ++- arch/powerpc/kernel/head_book3s_32.S | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/kernel/head_32.h b/arch/powerpc/kernel/head_32.h index 15c6fc7cbbf5..d97ec94b34da 100644 --- a/arch/powerpc/kernel/head_32.h +++ b/arch/powerpc/kernel/head_32.h @@ -52,7 +52,7 @@ 1: #ifdef CONFIG_VMAP_STACK mtcrf 0x3f, r1 - bt 32 - THREAD_ALIGN_SHIFT, stack_overflow + bt 32 - THREAD_ALIGN_SHIFT, vmap_stack_overflow #endif .endm @@ -196,6 +196,7 @@ ret_from_except) .macro vmap_stack_overflow_exception +vmap_stack_overflow: #ifdef CONFIG_SMP mfspr r1, SPRN_SPRG_THREAD lwz r1, TASK_CPU - THREAD(r1) diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S index cdbfa9d41353..b63445c55f4d 100644 --- a/arch/powerpc/kernel/head_8xx.S +++ b/arch/powerpc/kernel/head_8xx.S @@ -338,8 +338,9 @@ DARFixed:/* Return from dcbx instruction bug workaround */ /* 0x300 is DataAccess exception, needed by bad_page_fault() */ EXC_XFER_LITE(0x300, handle_page_fault) -stack_overflow: +#ifdef CONFIG_VMAP_STACK vmap_stack_overflow_exception +#endif /* On the MPC8xx, these next four traps are used for development * support of breakpoints and such. Someday I will get around to diff --git a/arch/powerpc/kernel/head_book3s_32.S b/arch/powerpc/kernel/head_book3s_32.S index 59efbee7c080..9dc05890477d 100644 --- a/arch/powerpc/kernel/head_book3s_32.S +++ b/arch/powerpc/kernel/head_book3s_32.S @@ -729,7 +729,6 @@ fast_hash_page_return: #endif /* CONFIG_PPC_BOOK3S_604 */ #ifdef CONFIG_VMAP_STACK -stack_overflow: vmap_stack_overflow_exception #endif -- 2.25.0