From: Torsten Duwe <duwe@lst.de>
To: Petr Mladek <pmladek@suse.com>
Cc: jeyu@redhat.com, jkosina@suse.cz, jikos@kernel.org,
linux-kernel@vger.kernel.org, rostedt@goodmis.org,
kamalesh@linux.vnet.ibm.com, linuxppc-dev@ozlabs.org,
live-patching@vger.kernel.org, mbenes@suse.cz
Subject: [PATCH 1/2] ppc64le live patch: clear out storage location(s) in mini stack frame
Date: Wed, 9 Mar 2016 18:28:21 +0100 [thread overview]
Message-ID: <20160309172821.GC27913@lst.de> (raw)
This can be applied on top of Petr Mladek's v4 rework of the ppc64le
live patching. Inspired by Balbir Singh's v5, information about the
callee's r2 is stored in a "reserved" 32 bit location in the caller's
stack frame, instead of 64 bits in the newly created mini frame 24(r1).
It only needs to work for a local call, when caller's TOC == callee's
TOC, and along with the return address (LR) it's all within a 4GiB
range (+-31 bits). If the original call already was global, we are
allowed to restore any nonsense into r2, because the global caller
will restore its TOC anyway from the ABI compliant location 24(r1)
right after return.
Signed-off-by: Torsten Duwe <duwe@suse.de>
---
This is only the preparation for dumping the mini stack frame.
It shouldn't break anything, bisecting-wise.
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -1284,8 +1284,9 @@ ftrace_call:
* lr and LRSAVE(r1) contain the address of klp_return_helper.
* We loaded ctr with the address of the patched function earlier
*/
+ subf r0, r0, r2 /* Calculate offset from current TOC to LR */
+ stw r0, 12(r1) /* and save it in CR+4 */
stdu r1, -32(r1) /* open new mini stack frame */
- std r2, 24(r1) /* save TOC now, unconditionally. */
bl 5f
5: mflr r12
addi r12, r12, (klp_return_helper + 4 - .)@l
@@ -1323,9 +1324,10 @@ _GLOBAL(ftrace_stub)
* maybe inserting a klp_return_helper frame or not.
*/
klp_return_helper:
- ld r2, 24(r1) /* restore TOC (saved by ftrace_caller) */
addi r1, r1, 32 /* destroy mini stack frame */
+ lwa r2, 12(r1) /* Load from CR+4, offset of TOC w.r.t LR */
ld r0, LRSAVE(r1) /* get the real return address */
+ add r2, r2, r0 /* Add the current LR to offset */
mtlr r0
blr
#endif
next reply other threads:[~2016-03-09 17:28 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-09 17:28 Torsten Duwe [this message]
2016-03-09 17:30 ` [PATCH 2/2] ppc64le live patch: get rid of mini stack frame Torsten Duwe
2016-03-10 12:25 ` Petr Mladek
2016-03-10 12:51 ` Petr Mladek
2016-03-10 12:58 ` Jiri Kosina
2016-03-10 13:04 ` Torsten Duwe
2016-03-11 0:50 ` Michael Ellerman
2016-03-11 3:37 ` [PATCH 1/2] ppc64le live patch: clear out storage location(s) in " Balbir Singh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160309172821.GC27913@lst.de \
--to=duwe@lst.de \
--cc=jeyu@redhat.com \
--cc=jikos@kernel.org \
--cc=jkosina@suse.cz \
--cc=kamalesh@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=live-patching@vger.kernel.org \
--cc=mbenes@suse.cz \
--cc=pmladek@suse.com \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).