From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99702C28CF6 for ; Sat, 28 Jul 2018 16:40:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3978020862 for ; Sat, 28 Jul 2018 16:40:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3978020862 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=perches.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729378AbeG1SHF (ORCPT ); Sat, 28 Jul 2018 14:07:05 -0400 Received: from smtprelay0150.hostedemail.com ([216.40.44.150]:59675 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729059AbeG1SHF (ORCPT ); Sat, 28 Jul 2018 14:07:05 -0400 Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay06.hostedemail.com (Postfix) with ESMTP id 719A0180033B9; Sat, 28 Jul 2018 16:40:00 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-HE-Tag: silk27_916c550ab772a X-Filterd-Recvd-Size: 6362 Received: from joe-laptop.perches.com (unknown [47.151.153.53]) (Authenticated sender: joe@perches.com) by omf05.hostedemail.com (Postfix) with ESMTPA; Sat, 28 Jul 2018 16:39:59 +0000 (UTC) From: Joe Perches To: Oleg Nesterov , Palmer Dabbelt , Albert Ou Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH V2] riscv: Convert uses of REG_FMT to %p Date: Sat, 28 Jul 2018 09:39:57 -0700 Message-Id: X-Mailer: git-send-email 2.15.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use %p pointer output instead of REG_FMT and cast the unsigned longs to (void *) to avoid exposing kernel addresses. Miscellanea: o Convert pr_cont to printk(KERN_DEFAULT as these uses are new logging lines and not previous line continuations o Remove the now unused REG_FMT defines Signed-off-by: Joe Perches --- v2: sigh: Add missing fault.c arch/riscv/include/asm/ptrace.h | 6 ----- arch/riscv/kernel/process.c | 52 +++++++++++++++++++++-------------------- arch/riscv/kernel/traps.c | 4 ++-- arch/riscv/mm/fault.c | 6 ++--- 4 files changed, 32 insertions(+), 36 deletions(-) diff --git a/arch/riscv/include/asm/ptrace.h b/arch/riscv/include/asm/ptrace.h index 2c5df945d43c..b123e723f8fa 100644 --- a/arch/riscv/include/asm/ptrace.h +++ b/arch/riscv/include/asm/ptrace.h @@ -60,12 +60,6 @@ struct pt_regs { unsigned long orig_a0; }; -#ifdef CONFIG_64BIT -#define REG_FMT "%016lx" -#else -#define REG_FMT "%08lx" -#endif - #define user_mode(regs) (((regs)->sstatus & SR_SPP) == 0) diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index d7c6ca7c95ae..7223f6715ff3 100644 --- a/arch/riscv/kernel/process.c +++ b/arch/riscv/kernel/process.c @@ -36,7 +36,7 @@ extern asmlinkage void ret_from_fork(void); extern asmlinkage void ret_from_kernel_thread(void); -void arch_cpu_idle(void) +void arch_yycpu_idle(void) { wait_for_interrupt(); local_irq_enable(); @@ -46,31 +46,33 @@ void show_regs(struct pt_regs *regs) { show_regs_print_info(KERN_DEFAULT); - pr_cont("sepc: " REG_FMT " ra : " REG_FMT " sp : " REG_FMT "\n", - regs->sepc, regs->ra, regs->sp); - pr_cont(" gp : " REG_FMT " tp : " REG_FMT " t0 : " REG_FMT "\n", - regs->gp, regs->tp, regs->t0); - pr_cont(" t1 : " REG_FMT " t2 : " REG_FMT " s0 : " REG_FMT "\n", - regs->t1, regs->t2, regs->s0); - pr_cont(" s1 : " REG_FMT " a0 : " REG_FMT " a1 : " REG_FMT "\n", - regs->s1, regs->a0, regs->a1); - pr_cont(" a2 : " REG_FMT " a3 : " REG_FMT " a4 : " REG_FMT "\n", - regs->a2, regs->a3, regs->a4); - pr_cont(" a5 : " REG_FMT " a6 : " REG_FMT " a7 : " REG_FMT "\n", - regs->a5, regs->a6, regs->a7); - pr_cont(" s2 : " REG_FMT " s3 : " REG_FMT " s4 : " REG_FMT "\n", - regs->s2, regs->s3, regs->s4); - pr_cont(" s5 : " REG_FMT " s6 : " REG_FMT " s7 : " REG_FMT "\n", - regs->s5, regs->s6, regs->s7); - pr_cont(" s8 : " REG_FMT " s9 : " REG_FMT " s10: " REG_FMT "\n", - regs->s8, regs->s9, regs->s10); - pr_cont(" s11: " REG_FMT " t3 : " REG_FMT " t4 : " REG_FMT "\n", - regs->s11, regs->t3, regs->t4); - pr_cont(" t5 : " REG_FMT " t6 : " REG_FMT "\n", - regs->t5, regs->t6); + printk(KERN_DEFAULT "sepc: %p ra : %p sp : %p\n", + (void *)regs->sepc, (void *)regs->ra, (void *)regs->sp); + printk(KERN_DEFAULT " gp : %p tp : %p t0 : %p\n", + (void *)regs->gp, (void *)regs->tp, (void *)regs->t0); + printk(KERN_DEFAULT " t1 : %p t2 : %p s0 : %p\n", + (void *)regs->t1, (void *)regs->t2, (void *)regs->s0); + printk(KERN_DEFAULT " s1 : %p a0 : %p a1 : %p\n", + (void *)regs->s1, (void *)regs->a0, (void *)regs->a1); + printk(KERN_DEFAULT " a2 : %p a3 : %p a4 : %p\n", + (void *)regs->a2, (void *)regs->a3, (void *)regs->a4); + printk(KERN_DEFAULT " a5 : %p a6 : %p a7 : %p\n", + (void *)regs->a5, (void *)regs->a6, (void *)regs->a7); + printk(KERN_DEFAULT " s2 : %p s3 : %p s4 : %p\n", + (void *)regs->s2, (void *)regs->s3, (void *)regs->s4); + printk(KERN_DEFAULT " s5 : %p s6 : %p s7 : %p\n", + (void *)regs->s5, (void *)regs->s6, (void *)regs->s7); + printk(KERN_DEFAULT " s8 : %p s9 : %p s10: %p\n", + (void *)regs->s8, (void *)regs->s9, (void *)regs->s10); + printk(KERN_DEFAULT " s11: %p t3 : %p t4 : %p\n", + (void *)regs->s11, (void *)regs->t3, (void *)regs->t4); + printk(KERN_DEFAULT " t5 : %p t6 : %p\n", + (void *)regs->t5, (void *)regs->t6); - pr_cont("sstatus: " REG_FMT " sbadaddr: " REG_FMT " scause: " REG_FMT "\n", - regs->sstatus, regs->sbadaddr, regs->scause); + printk(KERN_DEFAULT "sstatus: %p sbadaddr: %p scause: %p\n", + (void *)regs->sstatus, + (void *)regs->sbadaddr, + (void *)regs->scause); } void start_thread(struct pt_regs *regs, unsigned long pc, diff --git a/arch/riscv/kernel/traps.c b/arch/riscv/kernel/traps.c index 81a1952015a6..ba1942befa6a 100644 --- a/arch/riscv/kernel/traps.c +++ b/arch/riscv/kernel/traps.c @@ -68,8 +68,8 @@ void do_trap(struct pt_regs *regs, int signo, int code, { if (show_unhandled_signals && unhandled_signal(tsk, signo) && printk_ratelimit()) { - pr_info("%s[%d]: unhandled signal %d code 0x%x at 0x" REG_FMT, - tsk->comm, task_pid_nr(tsk), signo, code, addr); + pr_info("%s[%d]: unhandled signal %d code 0x%x at 0x%p", + tsk->comm, task_pid_nr(tsk), signo, code, (void *)addr); print_vma_addr(KERN_CONT " in ", GET_IP(regs)); pr_cont("\n"); show_regs(regs); diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c index 88401d5125bc..f258a58fe9fc 100644 --- a/arch/riscv/mm/fault.c +++ b/arch/riscv/mm/fault.c @@ -195,9 +195,9 @@ asmlinkage void do_page_fault(struct pt_regs *regs) * terminate things with extreme prejudice. */ bust_spinlocks(1); - pr_alert("Unable to handle kernel %s at virtual address " REG_FMT "\n", - (addr < PAGE_SIZE) ? "NULL pointer dereference" : - "paging request", addr); + pr_alert("Unable to handle kernel %s at virtual address %p\n", + (addr < PAGE_SIZE) ? "NULL pointer dereference" : + "paging request", (void *)addr); die(regs, "Oops"); do_exit(SIGKILL); -- 2.15.0