From: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
To: Michael Ellerman <mpe@ellerman.id.au>
Cc: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>,
linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
live-patching@vger.kernel.org,
Josh Poimboeuf <jpoimboe@redhat.com>,
Balbir Singh <bsingharora@gmail.com>
Subject: [PATCH v4 3/3] powerpc/modules: Improve restore_r2() error message
Date: Tue, 14 Nov 2017 04:29:10 -0500 [thread overview]
Message-ID: <20171114092910.20399-4-kamalesh@linux.vnet.ibm.com> (raw)
In-Reply-To: <20171114092910.20399-1-kamalesh@linux.vnet.ibm.com>
From: Josh Poimboeuf <jpoimboe@redhat.com>
Print the function address associated with the restore_r2() error to
make it easier to debug the problem.
Also clarify the wording a bit.
Before:
module_64: patch_foo: Expect noop after relocate, got 3c820000
After:
module_64: patch_foo: Expected noop after call, got 7c630034 at netdev_has_upper_dev+0x54/0xb0 [patch_foo]
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
---
arch/powerpc/kernel/module_64.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c
index 9e5391f..dad3ea5 100644
--- a/arch/powerpc/kernel/module_64.c
+++ b/arch/powerpc/kernel/module_64.c
@@ -494,8 +494,8 @@ static int restore_r2(u32 *instruction, struct module *me)
return 1;
if (*instruction != PPC_INST_NOP) {
- pr_err("%s: Expect noop after relocate, got %08x\n",
- me->name, *instruction);
+ pr_err("%s: Expected noop after call, got %08x at %pS\n",
+ me->name, *instruction, instruction);
return 0;
}
/* ld r2,R2_STACK_OFFSET(r1) */
--
2.9.3
next prev parent reply other threads:[~2017-11-14 9:32 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-14 9:29 [PATCH v4 0/3] ppc64le: Add REL24 relocation support of livepatch symbols Kamalesh Babulal
2017-11-14 9:29 ` [PATCH v4 1/3] kernel/modules: " Kamalesh Babulal
2017-12-12 11:39 ` [v4, " Michael Ellerman
2017-11-14 9:29 ` [PATCH v4 2/3] powerpc/modules: Don't try to restore r2 after a sibling call Kamalesh Babulal
2017-11-14 10:29 ` Naveen N. Rao
2017-11-14 15:53 ` Josh Poimboeuf
2017-11-15 5:38 ` Kamalesh Babulal
2017-11-15 9:28 ` Naveen N. Rao
2017-11-16 1:26 ` Josh Poimboeuf
2017-11-16 13:09 ` Naveen N. Rao
2017-11-16 17:45 ` [PATCH v4.2] " Josh Poimboeuf
2017-11-17 8:17 ` Kamalesh Babulal
2017-11-18 8:33 ` Naveen N. Rao
2017-12-12 11:39 ` [v4.2] " Michael Ellerman
2017-11-14 9:29 ` Kamalesh Babulal [this message]
2017-12-06 4:32 ` [PATCH v4 3/3] powerpc/modules: Improve restore_r2() error message Michael Ellerman
2017-12-12 11:39 ` [v4,3/3] " Michael Ellerman
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=20171114092910.20399-4-kamalesh@linux.vnet.ibm.com \
--to=kamalesh@linux.vnet.ibm.com \
--cc=bsingharora@gmail.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=live-patching@vger.kernel.org \
--cc=mpe@ellerman.id.au \
/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).