| Message ID | 3ff9823c0a812a8a145d979a9600a6d4591b80ee.1638446239.git.christophe.leroy@csgroup.eu (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v1,01/11] powerpc/code-patching: Remove pr_debug()/pr_devel() messages and fix check() | expand |
On Thu, 2 Dec 2021 13:00:17 +0100, Christophe Leroy wrote: > code-patching has been working for years now, time has come to > remove debugging messages. > > Change useful message to KERN_INFO and remove other ones. > > Also add KERN_ERR to check() macro and change it into a do/while > to make checkpatch happy. > > [...] Applied to powerpc/next. [01/11] powerpc/code-patching: Remove pr_debug()/pr_devel() messages and fix check() https://git.kernel.org/powerpc/c/edecd2d6d6f4a122dd62bce654b4f63301e8ad9a [02/11] powerpc/code-patching: Remove init_mem_is_free https://git.kernel.org/powerpc/c/af5304a7506588221d8317ef3f76585eb4483506 [03/11] powerpc/code-patching: Fix error handling in do_patch_instruction() https://git.kernel.org/powerpc/c/285672f99327d5b8febdf83cadba61a68abe5d69 [04/11] powerpc/code-patching: Fix unmap_patch_area() error handling https://git.kernel.org/powerpc/c/a3483c3dd18c136785a31406fe27210649fc4fba [05/11] powerpc/code-patching: Reorganise do_patch_instruction() to ease error handling https://git.kernel.org/powerpc/c/6b21af74495b556f9d496d97d74e7a3d0ab16d7c [06/11] powerpc/code-patching: Fix patch_branch() return on out-of-range failure https://git.kernel.org/powerpc/c/d5937db114e4b6446c62809484729955f1aeb108 [07/11] powerpc/code-patching: Use test_trampoline for prefixed patch test https://git.kernel.org/powerpc/c/ff14a9c09fe91a70bfc6381809877e5a19e38cdb [08/11] powerpc/code-patching: Move patch_exception() outside code-patching.c https://git.kernel.org/powerpc/c/29562a9da29478834e57f81e3804e9ec7a6b350b [09/11] powerpc/code-patching: Move instr_is_branch_{i/b}form() in code-patching.h https://git.kernel.org/powerpc/c/31acc599564120fa41f9df2c567842d003728dab [10/11] powerpc/code-patching: Move code patching selftests in its own file https://git.kernel.org/powerpc/c/f30a578d7653f7dbb253a20daad4bcd9f881d6c9 [11/11] powerpc/code-patching: Replace patch_instruction() by ppc_inst_write() in selftests https://git.kernel.org/powerpc/c/309a0a601864831510209531dd72da486225d8ae cheers
diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c index 312324a26df3..4fe4464b7a84 100644 --- a/arch/powerpc/lib/code-patching.c +++ b/arch/powerpc/lib/code-patching.c @@ -95,7 +95,6 @@ static int map_patch_area(void *addr, unsigned long text_poke_addr) err = map_kernel_page(text_poke_addr, (pfn << PAGE_SHIFT), PAGE_KERNEL); - pr_devel("Mapped addr %lx with pfn %lx:%d\n", text_poke_addr, pfn, err); if (err) return -1; @@ -130,8 +129,6 @@ static inline int unmap_patch_area(unsigned long addr) if (unlikely(!ptep)) return -EINVAL; - pr_devel("clearing mm %p, pte %p, addr %lx\n", &init_mm, ptep, addr); - /* * In hash, pte_clear flushes the tlb, in radix, we have to */ @@ -190,10 +187,9 @@ static int do_patch_instruction(u32 *addr, ppc_inst_t instr) int patch_instruction(u32 *addr, ppc_inst_t instr) { /* Make sure we aren't patching a freed init section */ - if (init_mem_is_free && init_section_contains(addr, 4)) { - pr_debug("Skipping init section patching addr: 0x%px\n", addr); + if (init_mem_is_free && init_section_contains(addr, 4)) return 0; - } + return do_patch_instruction(addr, instr); } NOKPROBE_SYMBOL(patch_instruction); @@ -411,8 +407,10 @@ static void __init test_trampoline(void) asm ("nop;\n"); } -#define check(x) \ - if (!(x)) printk("code-patching: test failed at line %d\n", __LINE__); +#define check(x) do { \ + if (!(x)) \ + pr_err("code-patching: test failed at line %d\n", __LINE__); \ +} while (0) static void __init test_branch_iform(void) { @@ -737,7 +735,7 @@ static inline void test_prefixed_patching(void) {} static int __init test_code_patching(void) { - printk(KERN_DEBUG "Running code patching self-tests ...\n"); + pr_info("Running code patching self-tests ...\n"); test_branch_iform(); test_branch_bform();
code-patching has been working for years now, time has come to remove debugging messages. Change useful message to KERN_INFO and remove other ones. Also add KERN_ERR to check() macro and change it into a do/while to make checkpatch happy. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> --- This series applies on top of series "[v5,1/5] powerpc/inst: Refactor ___get_user_instr()" https://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=274258 arch/powerpc/lib/code-patching.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)