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.9 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 124C0C2BBD0 for ; Tue, 8 Sep 2020 08:34:52 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6A5912177B for ; Tue, 8 Sep 2020 08:34:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6A5912177B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=csgroup.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4Blz3Y2twYzDqCR for ; Tue, 8 Sep 2020 18:34:49 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=csgroup.eu (client-ip=93.17.236.30; helo=pegase1.c-s.fr; envelope-from=christophe.leroy@csgroup.eu; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=csgroup.eu Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Blyy23PyTzDqMf for ; Tue, 8 Sep 2020 18:29:58 +1000 (AEST) Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4Blyxt1N3Wz9v01m; Tue, 8 Sep 2020 10:29:54 +0200 (CEST) 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 wC9EWojMJWui; Tue, 8 Sep 2020 10:29:54 +0200 (CEST) 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 4Blyxt0THqz9v01l; Tue, 8 Sep 2020 10:29:54 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id BCC0A8B7AD; Tue, 8 Sep 2020 10:29:54 +0200 (CEST) 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 1xS5vZZ-XOYr; Tue, 8 Sep 2020 10:29:54 +0200 (CEST) Received: from [192.168.4.90] (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 5E52B8B7AA; Tue, 8 Sep 2020 10:29:54 +0200 (CEST) Subject: Re: [RFC PATCH 02/12] powerpc: remove arguments from interrupt handler functions To: Nicholas Piggin References: <20200905174335.3161229-1-npiggin@gmail.com> <20200905174335.3161229-3-npiggin@gmail.com> <1599478457.27656.1.camel@po17688vm.idsi0.si.c-s.fr> <1599551224.3zoap14y55.astroid@bobo.none> From: Christophe Leroy Message-ID: Date: Tue, 8 Sep 2020 10:29:41 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <1599551224.3zoap14y55.astroid@bobo.none> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: fr Content-Transfer-Encoding: 8bit X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linuxppc-dev@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Le 08/09/2020 à 09:48, Nicholas Piggin a écrit : > Excerpts from Christophe Leroy's message of September 7, 2020 9:34 pm: >> On Mon, 2020-09-07 at 11:20 +0200, Christophe Leroy wrote: >>> >>> Le 05/09/2020 à 19:43, Nicholas Piggin a écrit : >>>> Make interrupt handlers all just take the pt_regs * argument and load >>>> DAR/DSISR etc from that. Make those that return a value return long. >>> >>> I like this, it will likely simplify a bit the VMAP_STACK mess. >>> >>> Not sure it is that easy. My board is stuck after the start of init. >>> >>> >>> On the 8xx, on Instruction TLB Error exception, we do >>> >>> andis. r5,r9,DSISR_SRR1_MATCH_32S@h /* Filter relevant SRR1 bits */ >>> >>> On book3s/32, on ISI exception we do: >>> andis. r5,r9,DSISR_SRR1_MATCH_32S@h /* Filter relevant SRR1 bits */ >>> >>> On 40x and bookE, on ISI exception we do: >>> li r5,0 /* Pass zero as arg3 */ >>> >>> >>> And regs->dsisr will just contain nothing >>> >>> So it means we should at least write back r5 into regs->dsisr from there >>> ? The performance impact should be minimal as we already write _DAR so >>> the cache line should already be in the cache. >>> >>> A hacky 'stw r5, _DSISR(r1)' in handle_page_fault() does the trick, >>> allthough we don't want to do it for both ISI and DSI at the end, so >>> you'll have to do it in every head_xxx.S >> >> To get you series build and work, I did the following hacks: > > Great, thanks for this. > >> diff --git a/arch/powerpc/include/asm/interrupt.h >> b/arch/powerpc/include/asm/interrupt.h >> index acfcc7d5779b..c11045d3113a 100644 >> --- a/arch/powerpc/include/asm/interrupt.h >> +++ b/arch/powerpc/include/asm/interrupt.h >> @@ -93,7 +93,9 @@ static inline void interrupt_nmi_exit_prepare(struct >> pt_regs *regs, struct inter >> { >> nmi_exit(); >> >> +#ifdef CONFIG_PPC64 >> this_cpu_set_ftrace_enabled(state->ftrace_enabled); >> +#endif > > This seems okay, not a hack. > >> #ifdef CONFIG_PPC_BOOK3S_64 >> /* Check we didn't change the pending interrupt mask. */ >> diff --git a/arch/powerpc/kernel/entry_32.S >> b/arch/powerpc/kernel/entry_32.S >> index f4d0af8e1136..66f7adbe1076 100644 >> --- a/arch/powerpc/kernel/entry_32.S >> +++ b/arch/powerpc/kernel/entry_32.S >> @@ -663,6 +663,7 @@ ppc_swapcontext: >> */ >> .globl handle_page_fault >> handle_page_fault: >> + stw r5,_DSISR(r1) >> addi r3,r1,STACK_FRAME_OVERHEAD >> #ifdef CONFIG_PPC_BOOK3S_32 >> andis. r0,r5,DSISR_DABRMATCH@h > > Is this what you want to do for 32, or do you want to seperate > ISI and DSI sides? > No I think we want to separate ISI and DSI sides. And I think the specific filtering done in ISI could be done in do_page_fault() in C. Ok, it would make a special handling for is_exec but there are already several places where the behaviour differs based on is_exec. The only thing we need to keep at ASM level is the DABR stuff for calling do_break() in handle_page_fault(), because it is used to decide whether full regs are saved or not. But it could be a test done earlier in the prolog and the result being kept in one of the CR bits. That way we can avoid reloading dsisr and dar from the stack, especially for VMAP stack as they are saved quite early in the prolog. Or we can take them out of the thread struct and save them in the stack a little latter in the prolog, but then we have to keep the RI bit a bit cleared longer. While we are playing with do_page_fault(), did you have a look at the series I sent https://patchwork.ozlabs.org/project/linuxppc-dev/patch/7baae4086cbb9ffb08c933b065ff7d29dbc03dd6.1596734104.git.christophe.leroy@csgroup.eu/ Christophe