From: Nicholas Piggin <npiggin@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Nicholas Piggin <npiggin@gmail.com>
Subject: [PATCH 2/3] powerpc/code-patching: warn on code patching failure
Date: Fri, 26 Nov 2021 13:22:48 +1000 [thread overview]
Message-ID: <20211126032249.1652080-2-npiggin@gmail.com> (raw)
In-Reply-To: <20211126032249.1652080-1-npiggin@gmail.com>
Callers are supposed to handle this, but it is possible that they
don't or they do but don't make much noise about it. A failure is
probably an indication of a bigger problem somewhere so it is good
to warn once about it.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
arch/powerpc/lib/code-patching.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c
index 57e160963ab7..70247fc58b6e 100644
--- a/arch/powerpc/lib/code-patching.c
+++ b/arch/powerpc/lib/code-patching.c
@@ -161,6 +161,7 @@ static int do_patch_instruction(u32 *addr, struct ppc_inst instr)
text_poke_addr = (unsigned long)__this_cpu_read(text_poke_area)->addr;
if (map_patch_area(addr, text_poke_addr)) {
+ WARN_ON_ONCE(1);
err = -1;
goto out;
}
@@ -192,8 +193,10 @@ static bool skip_addr_verif = false;
int patch_instruction(u32 *addr, struct ppc_inst instr)
{
/* Make sure we aren't patching a freed init section */
- if (!skip_addr_verif && !kernel_text_address((unsigned long)addr))
+ if (!skip_addr_verif && !kernel_text_address((unsigned long)addr)) {
+ WARN_ON_ONCE(1);
return 0;
+ }
return do_patch_instruction(addr, instr);
}
--
2.23.0
next prev parent reply other threads:[~2021-11-26 3:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-26 3:22 [PATCH 1/3] powerpc/code-patching: work around code patching verification in patching tests Nicholas Piggin
2021-11-26 3:22 ` Nicholas Piggin [this message]
2021-11-26 3:22 ` [PATCH 3/3] powerpc/code-patching: don't use the stack for code " Nicholas Piggin
2021-11-26 6:34 ` [PATCH 1/3] powerpc/code-patching: work around code patching verification in " Christophe Leroy
2021-11-26 10:27 ` Nicholas Piggin
2021-11-26 10:39 ` Christophe Leroy
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=20211126032249.1652080-2-npiggin@gmail.com \
--to=npiggin@gmail.com \
--cc=linuxppc-dev@lists.ozlabs.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).