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=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,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 F1981C4BA24 for ; Thu, 27 Feb 2020 08:49:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B77BA24683 for ; Thu, 27 Feb 2020 08:49:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="Dqqxuaya" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B77BA24683 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 5D3596B0003; Thu, 27 Feb 2020 03:49:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5A97F6B0010; Thu, 27 Feb 2020 03:49:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4BF1F6B0032; Thu, 27 Feb 2020 03:49:46 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0027.hostedemail.com [216.40.44.27]) by kanga.kvack.org (Postfix) with ESMTP id 351A06B0003 for ; Thu, 27 Feb 2020 03:49:46 -0500 (EST) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id D33D3180ACF62 for ; Thu, 27 Feb 2020 08:49:45 +0000 (UTC) X-FDA: 76535283930.03.cars54_38191dca3dd12 X-HE-Tag: cars54_38191dca3dd12 X-Filterd-Recvd-Size: 5773 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf40.hostedemail.com (Postfix) with ESMTP for ; Thu, 27 Feb 2020 08:49:45 +0000 (UTC) Received: from aquarius.haifa.ibm.com (nesher1.haifa.il.ibm.com [195.110.40.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 791282468E; Thu, 27 Feb 2020 08:49:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582793384; bh=GA7NOKUteHjazd0omlCrZ7LB67zWZrKKvz+PdqlHU1A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dqqxuayacp6kUBvoz6Ep0WwbORX+x52ZATH9VbgId12KNRaV+YCpOWSUJX/p2ye8L XgBNf6QAAH1JPV4NZsT2o7+iAe9f+vpuLHkuXWnuAcXicPWeqdHJrc39pBQX2CLodv XIt+PNhD1CezRM6zy/o5J3hHby0EBCFMyoIokpFQ= From: Mike Rapoport To: linux-kernel@vger.kernel.org Cc: Andrew Morton , Arnd Bergmann , Benjamin Herrenschmidt , Brian Cain , Catalin Marinas , Christophe Leroy , Fenghua Yu , Geert Uytterhoeven , Guan Xuetao , James Morse , Jonas Bonn , Julien Thierry , Ley Foon Tan , Marc Zyngier , Michael Ellerman , Paul Mackerras , Rich Felker , Russell King , Stafford Horne , Stefan Kristiansson , Suzuki K Poulose , Tony Luck , Will Deacon , Yoshinori Sato , kvmarm@lists.cs.columbia.edu, kvm-ppc@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, nios2-dev@lists.rocketboards.org, openrisc@lists.librecores.org, uclinux-h8-devel@lists.sourceforge.jp, Mike Rapoport , Mike Rapoport Subject: [PATCH v3 09/14] sh: fault: Modernize printing of kernel messages Date: Thu, 27 Feb 2020 10:46:03 +0200 Message-Id: <20200227084608.18223-10-rppt@kernel.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20200227084608.18223-1-rppt@kernel.org> References: <20200227084608.18223-1-rppt@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Geert Uytterhoeven - Convert from printk() to pr_*(), - Add missing continuations, - Use "%llx" to format u64, - Join multiple prints in show_fault_oops() into a single print. Signed-off-by: Geert Uytterhoeven Signed-off-by: Mike Rapoport --- arch/sh/mm/fault.c | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/arch/sh/mm/fault.c b/arch/sh/mm/fault.c index 5f51456f4fc7..a2b0275413e8 100644 --- a/arch/sh/mm/fault.c +++ b/arch/sh/mm/fault.c @@ -47,10 +47,10 @@ static void show_pte(struct mm_struct *mm, unsigned l= ong addr) pgd =3D swapper_pg_dir; } =20 - printk(KERN_ALERT "pgd =3D %p\n", pgd); + pr_alert("pgd =3D %p\n", pgd); pgd +=3D pgd_index(addr); - printk(KERN_ALERT "[%08lx] *pgd=3D%0*Lx", addr, - (u32)(sizeof(*pgd) * 2), (u64)pgd_val(*pgd)); + pr_alert("[%08lx] *pgd=3D%0*llx", addr, (u32)(sizeof(*pgd) * 2), + (u64)pgd_val(*pgd)); =20 do { pud_t *pud; @@ -61,33 +61,33 @@ static void show_pte(struct mm_struct *mm, unsigned l= ong addr) break; =20 if (pgd_bad(*pgd)) { - printk("(bad)"); + pr_cont("(bad)"); break; } =20 pud =3D pud_offset(pgd, addr); if (PTRS_PER_PUD !=3D 1) - printk(", *pud=3D%0*Lx", (u32)(sizeof(*pud) * 2), - (u64)pud_val(*pud)); + pr_cont(", *pud=3D%0*llx", (u32)(sizeof(*pud) * 2), + (u64)pud_val(*pud)); =20 if (pud_none(*pud)) break; =20 if (pud_bad(*pud)) { - printk("(bad)"); + pr_cont("(bad)"); break; } =20 pmd =3D pmd_offset(pud, addr); if (PTRS_PER_PMD !=3D 1) - printk(", *pmd=3D%0*Lx", (u32)(sizeof(*pmd) * 2), - (u64)pmd_val(*pmd)); + pr_cont(", *pmd=3D%0*llx", (u32)(sizeof(*pmd) * 2), + (u64)pmd_val(*pmd)); =20 if (pmd_none(*pmd)) break; =20 if (pmd_bad(*pmd)) { - printk("(bad)"); + pr_cont("(bad)"); break; } =20 @@ -96,11 +96,11 @@ static void show_pte(struct mm_struct *mm, unsigned l= ong addr) break; =20 pte =3D pte_offset_kernel(pmd, addr); - printk(", *pte=3D%0*Lx", (u32)(sizeof(*pte) * 2), - (u64)pte_val(*pte)); + pr_cont(", *pte=3D%0*llx", (u32)(sizeof(*pte) * 2), + (u64)pte_val(*pte)); } while (0); =20 - printk("\n"); + pr_cont("\n"); } =20 static inline pmd_t *vmalloc_sync_one(pgd_t *pgd, unsigned long address) @@ -188,14 +188,11 @@ show_fault_oops(struct pt_regs *regs, unsigned long= address) if (!oops_may_print()) return; =20 - printk(KERN_ALERT "BUG: unable to handle kernel "); - if (address < PAGE_SIZE) - printk(KERN_CONT "NULL pointer dereference"); - else - printk(KERN_CONT "paging request"); - - printk(KERN_CONT " at %08lx\n", address); - printk(KERN_ALERT "PC:"); + pr_alert("BUG: unable to handle kernel %s at %08lx\n", + address < PAGE_SIZE ? "NULL pointer dereference" + : "paging request", + address); + pr_alert("PC:"); printk_address(regs->pc, 1); =20 show_pte(NULL, address); --=20 2.24.0