From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>,
Michael Ellerman <mpe@ellerman.id.au>,
Sasha Levin <sashal@kernel.org>,
npiggin@gmail.com, keescook@chromium.org, ulf.hansson@linaro.org,
Jason@zx2c4.com, ebiederm@xmission.com, jniethe5@gmail.com,
wangkefeng.wang@huawei.com, linuxppc-dev@lists.ozlabs.org,
bpf@vger.kernel.org
Subject: [PATCH AUTOSEL 6.2 08/16] powerpc: Remove __kernel_text_address() in show_instructions()
Date: Sun, 5 Mar 2023 08:51:59 -0500 [thread overview]
Message-ID: <20230305135207.1793266-8-sashal@kernel.org> (raw)
In-Reply-To: <20230305135207.1793266-1-sashal@kernel.org>
From: Christophe Leroy <christophe.leroy@csgroup.eu>
[ Upstream commit d9ab6da64fd15608c9feb20d769d8df1a32fe212 ]
That test was introducted in 2006 by
commit 00ae36de49cc ("[POWERPC] Better check in show_instructions").
At that time, there was no BPF progs.
As seen in message of commit 89d21e259a94 ("powerpc/bpf/32: Fix Oops
on tail call tests"), when a page fault occurs in test_bpf.ko for
instance, the code is dumped as XXXXXXXXs. Allthough
__kernel_text_address() checks is_bpf_text_address(), it seems it is
not enough.
Today, show_instructions() uses get_kernel_nofault() to read the code,
so there is no real need for additional verifications.
ARM64 and x86 don't do any additional check before dumping
instructions. Do the same and remove __kernel_text_address()
in show_instructions().
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/4fd69ef7945518c3e27f96b95046a5c1468d35bf.1675245773.git.christophe.leroy@csgroup.eu
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/powerpc/kernel/process.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index c22cc234672f9..effe9697905dc 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -1405,8 +1405,7 @@ static void show_instructions(struct pt_regs *regs)
for (i = 0; i < NR_INSN_TO_PRINT; i++) {
int instr;
- if (!__kernel_text_address(pc) ||
- get_kernel_nofault(instr, (const void *)pc)) {
+ if (get_kernel_nofault(instr, (const void *)pc)) {
pr_cont("XXXXXXXX ");
} else {
if (nip == pc)
--
2.39.2
next prev parent reply other threads:[~2023-03-05 13:53 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-05 13:51 [PATCH AUTOSEL 6.2 01/16] clk: qcom: mmcc-apq8084: remove spdm clocks Sasha Levin
2023-03-05 13:51 ` [PATCH AUTOSEL 6.2 02/16] MIPS: Fix a compilation issue Sasha Levin
2023-03-05 13:51 ` [PATCH AUTOSEL 6.2 03/16] powerpc: Check !irq instead of irq == NO_IRQ and remove NO_IRQ Sasha Levin
2023-03-05 13:51 ` [PATCH AUTOSEL 6.2 04/16] powerpc/64: Don't recurse irq replay Sasha Levin
2023-03-05 13:51 ` [PATCH AUTOSEL 6.2 05/16] s390/virtio: sort out physical vs virtual pointers usage Sasha Levin
2023-03-06 10:26 ` Nico Boehr
2023-03-14 17:26 ` Sasha Levin
2023-03-05 13:51 ` [PATCH AUTOSEL 6.2 06/16] powerpc/iommu: fix memory leak with using debugfs_lookup() Sasha Levin
2023-03-05 13:51 ` [PATCH AUTOSEL 6.2 07/16] clk: renesas: rcar-gen3: Disable R-Car H3 ES1.* Sasha Levin
2023-03-05 13:59 ` Geert Uytterhoeven
2023-03-14 17:42 ` Sasha Levin
2023-03-05 13:51 ` Sasha Levin [this message]
2023-03-05 13:52 ` [PATCH AUTOSEL 6.2 09/16] powerpc/bpf/32: Only set a stack frame when necessary Sasha Levin
2023-03-05 13:52 ` [PATCH AUTOSEL 6.2 10/16] powerpc/64: Fix task_cpu in early boot when booting non-zero cpuid Sasha Levin
2023-03-05 13:52 ` [PATCH AUTOSEL 6.2 11/16] powerpc/64: Move paca allocation to early_setup() Sasha Levin
2023-03-05 13:52 ` [PATCH AUTOSEL 6.2 12/16] powerpc/kcsan: Exclude udelay to prevent recursive instrumentation Sasha Levin
2023-03-05 13:52 ` [PATCH AUTOSEL 6.2 13/16] alpha: fix R_ALPHA_LITERAL reloc for large modules Sasha Levin
2023-03-05 13:52 ` [PATCH AUTOSEL 6.2 14/16] macintosh: windfarm: Use unsigned type for 1-bit bitfields Sasha Levin
2023-03-05 13:52 ` [PATCH AUTOSEL 6.2 15/16] PCI: Add SolidRun vendor ID Sasha Levin
2023-03-05 13:52 ` [PATCH AUTOSEL 6.2 16/16] PCI: Avoid FLR for SolidRun SNET DPU rev 1 Sasha Levin
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=20230305135207.1793266-8-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=Jason@zx2c4.com \
--cc=bpf@vger.kernel.org \
--cc=christophe.leroy@csgroup.eu \
--cc=ebiederm@xmission.com \
--cc=jniethe5@gmail.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=npiggin@gmail.com \
--cc=stable@vger.kernel.org \
--cc=ulf.hansson@linaro.org \
--cc=wangkefeng.wang@huawei.com \
/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