Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp4123798pxb; Mon, 8 Feb 2021 08:29:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJzLbjR4wN55xyQPGaOPXuKXBYAEnuLT+BiseBUOH6yenXV9vNfdTIXAp5xhUFpVxdjXuBp1 X-Received: by 2002:a17:906:b0c2:: with SMTP id bk2mr17959104ejb.223.1612801796424; Mon, 08 Feb 2021 08:29:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612801796; cv=none; d=google.com; s=arc-20160816; b=yanLNJyh4YlpvCLxIXgHuO2vAYdntxiQoI5R1yxuv/HncqlHPBbPsdjvGHR3ZTTXba hAwgoTR3ApDLGP8m8NglUWDyyh7r1coxgprmFr8oyOPp5XeD1JnRYT7SHsa8VMcjpRUl CtL/xX8BzkV45115SpwPPsSLJAu8kVgxqPQ48pSKebBz9gyKsguqxSwD31oPjbzTR5+3 0c1S8sDn70EGHOL9UTBNOTQKd6pKdj1OPpQgFfWHlOqyYllYRntIqgOF0GSijMe2ZXt2 lIUJWgmc1uFskWi8PRAeg11m+8QUUr4+eO7xXOfEukBeMuQB9Y3fVa+o/BX+asXzd6m/ Sukw== 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=2ymxJMbZ0lJ2ZMvPpen3eikbAdZnmiZREJFRLVp8i8A=; b=p8GmEMzwjC8st+65RS5gcwMtFLc7Yg1OWU1cbdAboeBC6we/ncmrqejd6kFLdwe9vv fDTdFq/a5lPp0Qnn2KpA0aBcWLkDUx0zFfhaNRc9r5r18Pv0xQXNC1YBN23mgLCaxv3B +xB7BUhj5/Hu3adXrCubgJepPqMXsxVdWk5zs5YFoU1kO9FbYOTkjm610WivFeNJPgJQ khnwuhbBZWi8I/2UJGz2PBBkm8kslYn4earOgSCZqmOkSPZljCz2P7sB0IlXHnbXsT1/ 1pgUXB/58W30g31UEUi2Igik6NS0M8+XNJu1JG3Du2bOHKmk8mWPlDJD88s7K2DUJ07z sOBg== 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 b6si13851283edu.567.2021.02.08.08.29.32; Mon, 08 Feb 2021 08:29:56 -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 S234353AbhBHQ2w (ORCPT + 99 others); Mon, 8 Feb 2021 11:28:52 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:36059 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233382AbhBHPM7 (ORCPT ); Mon, 8 Feb 2021 10:12:59 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4DZ8bP5SHkz9vBnS; Mon, 8 Feb 2021 16:10:25 +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 M1xg4y0kzZAq; Mon, 8 Feb 2021 16:10:25 +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 4DZ8bP4fsMz9tyNx; Mon, 8 Feb 2021 16:10:25 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 104B18B7BA; Mon, 8 Feb 2021 16:10:31 +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 Cu-nroFGS6V2; Mon, 8 Feb 2021 16:10:30 +0100 (CET) Received: from po16121vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.230.103]) by messagerie.si.c-s.fr (Postfix) with ESMTP id CBD118B7B2; Mon, 8 Feb 2021 16:10:30 +0100 (CET) Received: by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0) id B4FB06733E; Mon, 8 Feb 2021 15:10:30 +0000 (UTC) Message-Id: <9a90805ab6b9101b46daf56470f457a57acd86fc.1612796617.git.christophe.leroy@csgroup.eu> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v5 11/22] powerpc/syscall: Save r3 in regs->orig_r3 To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , npiggin@gmail.com, msuchanek@suse.de Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Mon, 8 Feb 2021 15:10:30 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Save r3 in regs->orig_r3 in system_call_exception() Signed-off-by: Christophe Leroy --- v5: Removed the assembly one on SCV type system call --- arch/powerpc/kernel/entry_64.S | 2 -- arch/powerpc/kernel/interrupt.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index 33ddfeef4fe9..a91c2def165d 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S @@ -108,7 +108,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_TM) li r11,\trapnr std r11,_TRAP(r1) std r12,_CCR(r1) - std r3,ORIG_GPR3(r1) addi r10,r1,STACK_FRAME_OVERHEAD ld r11,exception_marker@toc(r2) std r11,-16(r10) /* "regshere" marker */ @@ -278,7 +277,6 @@ END_BTB_FLUSH_SECTION std r10,_LINK(r1) std r11,_TRAP(r1) std r12,_CCR(r1) - std r3,ORIG_GPR3(r1) addi r10,r1,STACK_FRAME_OVERHEAD ld r11,exception_marker@toc(r2) std r11,-16(r10) /* "regshere" marker */ diff --git a/arch/powerpc/kernel/interrupt.c b/arch/powerpc/kernel/interrupt.c index 46fd195ca659..1a2dec49f811 100644 --- a/arch/powerpc/kernel/interrupt.c +++ b/arch/powerpc/kernel/interrupt.c @@ -29,6 +29,8 @@ notrace long system_call_exception(long r3, long r4, long r5, { syscall_fn f; + regs->orig_gpr3 = r3; + if (IS_ENABLED(CONFIG_PPC_IRQ_SOFT_MASK_DEBUG)) BUG_ON(irq_soft_mask_return() != IRQS_ALL_DISABLED); -- 2.25.0