From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759186AbcBYAar (ORCPT ); Wed, 24 Feb 2016 19:30:47 -0500 Received: from mail-pf0-f181.google.com ([209.85.192.181]:35422 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756602AbcBYAaq (ORCPT ); Wed, 24 Feb 2016 19:30:46 -0500 Subject: Re: [PATCH 05/12] powerpc/ftrace: ftrace_graph_caller() needs to save/restore toc To: Michael Ellerman , linuxppc-dev@ozlabs.org References: <1456324115-21144-1-git-send-email-mpe@ellerman.id.au> <1456324115-21144-5-git-send-email-mpe@ellerman.id.au> Cc: duwe@lst.de, linux-kernel@vger.kernel.org, rostedt@goodmis.org, kamalesh@linux.vnet.ibm.com, pmladek@suse.com, jeyu@redhat.com, jkosina@suse.cz, live-patching@vger.kernel.org, mbenes@suse.cz From: Balbir Singh Message-ID: <56CE4B2E.7070505@gmail.com> Date: Thu, 25 Feb 2016 11:30:38 +1100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.0 MIME-Version: 1.0 In-Reply-To: <1456324115-21144-5-git-send-email-mpe@ellerman.id.au> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 25/02/16 01:28, Michael Ellerman wrote: > Signed-off-by: Michael Ellerman > --- > arch/powerpc/kernel/entry_64.S | 8 ++++++++ > 1 file changed, 8 insertions(+) > > Squash. > > diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S > index 2a7313cfbc7d..9e77a2c8f218 100644 > --- a/arch/powerpc/kernel/entry_64.S > +++ b/arch/powerpc/kernel/entry_64.S > @@ -1237,6 +1237,11 @@ _GLOBAL(ftrace_graph_caller) > std r5, 64(r1) > std r4, 56(r1) > std r3, 48(r1) > + > + /* Save callee's TOC in the ABI compliant location */ > + std r2, 24(r1) R2_STACK_OFFSET for readability? > + ld r2, PACATOC(r13) /* get kernel TOC in r2 */ > + > mfctr r4 /* ftrace_caller has moved local addr here */ > std r4, 40(r1) > mflr r3 /* ftrace_caller has restored LR from stack */ > @@ -1262,6 +1267,9 @@ _GLOBAL(ftrace_graph_caller) > ld r4, 56(r1) > ld r3, 48(r1) > > + /* Restore callee's TOC */ > + ld r2, 24(r1) > + > addi r1, r1, 112 > mflr r0 > std r0, LRSAVE(r1) Reviewed-by: Balbir Singh Balbir Singh.