From patchwork Sun May 21 13:15:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 765091 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wW2Ty4g0xz9s1h for ; Sun, 21 May 2017 23:20:38 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YyyYTAVD"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3wW2Ty3bLbzDqLT for ; Sun, 21 May 2017 23:20:38 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YyyYTAVD"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pg0-x243.google.com (mail-pg0-x243.google.com [IPv6:2607:f8b0:400e:c05::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3wW2Ny2fmDzDqLv for ; Sun, 21 May 2017 23:16:18 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YyyYTAVD"; dkim-atps=neutral Received: by mail-pg0-x243.google.com with SMTP id s62so14736961pgc.0 for ; Sun, 21 May 2017 06:16:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=39/w5T9+wtN+pHhxZEea7fVW4+4hBsmusTSMbxRm6AM=; b=YyyYTAVDzYX+iw4qkOjn4hooMMnNfuFMz2vVq2hkgxV5rE/SCg145iw3eA0ZdfEi1a vZ6NBaLswZMuWED+6UKbPFjpfNL4N8prnZTU6NLoBNWU/EtmwGJvqk1lKNuibeNhJ0tW BRaKff+MO5s0E8iWDVVYt+SPwHqhq5HiHkwpgVeWUG7itQCRBzYUWpK5VClSIZxwUA/j wP9iR3lQlhUuZYHGY3Gt2XlhhXGelxEBuXjURgM4kFBMkHUVO2DGOFk7y4RPApRgf1WQ 47C63mDgN1DBIHg6I5ibl2T9UzVQWQ7kDFat7WcDCG/UAc2/xYcaJI9YiIPDQ0RQmq8m AA/A== 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=39/w5T9+wtN+pHhxZEea7fVW4+4hBsmusTSMbxRm6AM=; b=EfEBdMlRsFGZcDMkyz27b8vr5vIws1Vf7XzjXww2h7GNZ5XOPBM36cnMyU9Kd48K8h BaOapLfw6SZPvt555DMJXtsccZi3FtW8ir6jg8OfRcf6xOzc/fsyMQhdX7RmfrZn4hlp SPgU5mrd5+4fP3q1aFEe1980KqhRP6qXDYsXkSgQ6Z2bdz2xkoFltEmL8z4POK2m4IIa KZypMWahNbhihCzDXwIvZbT1g3PgnXf9IVFjLCjzBC7CwCJG38zI46WGrbFt/omk4WPK XMnCpbR78uhfHMCXsmuJDjq2Ggjlt9Vd4oSI6yQxJbPLjrKQ1ysYGxQBBsTl1cyP934Z DQJA== X-Gm-Message-State: AODbwcC3FO728D4RLNjhZn5+21A7x0WfjOhpkK2lLG4qwG/mUnNoEIHM 1azKcfm/x6ev3w== X-Received: by 10.98.5.130 with SMTP id 124mr1494020pff.209.1495372576709; Sun, 21 May 2017 06:16:16 -0700 (PDT) Received: from roar.ozlabs.ibm.com (149.45.218.139.dynamic.dsl.dv.iprimus.net.au. [139.218.45.149]) by smtp.gmail.com with ESMTPSA id x80sm26285428pff.105.2017.05.21.06.16.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 May 2017 06:16:15 -0700 (PDT) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 2/9] powerpc/64s: SLB miss handler avoid saving faulting address into EX_DAR Date: Sun, 21 May 2017 23:15:43 +1000 Message-Id: <20170521131550.25813-3-npiggin@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170521131550.25813-1-npiggin@gmail.com> References: <20170521131550.25813-1-npiggin@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nicholas Piggin Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The EX_DAR save area is only used in exceptional cases. With r3 no longer clobbered by slb_allocate_realmode, saving faulting address to EX_DAR can be deferred to those cases. Signed-off-by: Nicholas Piggin --- arch/powerpc/kernel/exceptions-64s.S | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index ae418b85c17c..a4a71bce35d6 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -628,7 +628,6 @@ EXC_COMMON_BEGIN(slb_miss_realmode) stw r9,PACA_EXSLB+EX_CCR(r13) /* save CR in exc. frame */ std r10,PACA_EXSLB+EX_LR(r13) /* save LR */ - std r3,PACA_EXSLB+EX_DAR(r13) crset 4*cr0+eq #ifdef CONFIG_PPC_STD_MMU_64 @@ -638,11 +637,10 @@ END_MMU_FTR_SECTION_IFCLR(MMU_FTR_TYPE_RADIX) #endif ld r10,PACA_EXSLB+EX_LR(r13) - ld r3,PACA_EXSLB+EX_R3(r13) lwz r9,PACA_EXSLB+EX_CCR(r13) /* get saved CR */ mtlr r10 - beq 8f /* if bad address, make full stack frame */ + beq- 8f /* if bad address, make full stack frame */ andi. r10,r12,MSR_RI /* check for unrecoverable exception */ beq- 2f @@ -657,6 +655,7 @@ END_MMU_FTR_SECTION_IFCLR(MMU_FTR_TYPE_RADIX) .machine pop RESTORE_PPR_PACA(PACA_EXSLB, r9) + ld r3,PACA_EXSLB+EX_R3(r13) ld r9,PACA_EXSLB+EX_R9(r13) ld r10,PACA_EXSLB+EX_R10(r13) ld r11,PACA_EXSLB+EX_R11(r13) @@ -665,7 +664,9 @@ END_MMU_FTR_SECTION_IFCLR(MMU_FTR_TYPE_RADIX) rfid b . /* prevent speculative execution */ -2: mfspr r11,SPRN_SRR0 +2: std r3,PACA_EXSLB+EX_DAR(r13) + ld r3,PACA_EXSLB+EX_R3(r13) + mfspr r11,SPRN_SRR0 LOAD_HANDLER(r10,unrecov_slb) mtspr SPRN_SRR0,r10 ld r10,PACAKMSR(r13) @@ -673,7 +674,9 @@ END_MMU_FTR_SECTION_IFCLR(MMU_FTR_TYPE_RADIX) rfid b . -8: mfspr r11,SPRN_SRR0 +8: std r3,PACA_EXSLB+EX_DAR(r13) + ld r3,PACA_EXSLB+EX_R3(r13) + mfspr r11,SPRN_SRR0 LOAD_HANDLER(r10,bad_addr_slb) mtspr SPRN_SRR0,r10 ld r10,PACAKMSR(r13)