From patchwork Fri Nov 16 10:44:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugeniy Paltsev X-Patchwork-Id: 998847 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-snps-arc-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=synopsys.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="fxwXjM33"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="EQYhojPd"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=synopsys.com header.i=@synopsys.com header.b="Btn2ISmj"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42xFHG0QWcz9sBn for ; Fri, 16 Nov 2018 21:44:58 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=TBbaBC8tQBblCZem0AU97nBcgmoSiKI6R3RVaz/PHCc=; b=fxwXjM332naD8EGPRHeD4o5i7H FGSnIAolPmO6WSEoztbvhr71ch+6uVIpsE3aLZfd3RtmnvGyrkchtDSTLDIEqerCrYtQJrArguVMa QIuR1gaVVIKde6AAsiVywmpBUYPvt1xuRqMsHnvjQY5m1CSM+XII4bymTNnDLcJbxZ6yLe3ZAava3 sctNw9XjwIe2ToPeUgHhYCEc/r+DWh/fdMekC9sA6+n8v6XBDc7K82gef9xwRVUMPODhuYcl2LFNz HA5MoH2n+kmIcZ/qLEOzr6+ZZXU72wFfiyGVf1gdsptoOAVj+Gn2kfuX7rXIcpwzHvNBrcSquHdIs tI4uwVeA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gNbcO-0002wd-0l; Fri, 16 Nov 2018 10:44:56 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gNbcM-0002vh-GJ for linux-snps-arc@bombadil.infradead.org; Fri, 16 Nov 2018 10:44:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Xs7j+jEZ/YMIDKSKhe4O5rhf4z5DiAKqDjeji2PY/Fc=; b=EQYhojPdwBwmOlKANShK1+e1s sq+iKjiYLik4vln10EzzsNIJaDODVYIUQ7+NsYf4ODIuzI+uPIuxofaskKD5AYAkAm3TcP91y9Pyi SXNVIEU7rflDt/dLE9aZGjQj9+u0UhYc4dgujxgWHm0RQm2RhfV/Aw7tw5zoxbx2qh7PQ1hJgeQ91 2VfbwYPg8CIrbjb22Ak+xFQPvsOkjEoOgfc/VJiVy6knPJFKRLsz6yozl1vXegwjoTR7+/QkSkgdc D+GBmHcRiitmbEsTUn8yWWJrSJ9uXnniMjc9ILUHRmbzbwuGq+Quo7b1qbBg/cAgC6Aa9qT0/ThZl gOvv0hZIw==; Received: from us01smtprelay-2.synopsys.com ([198.182.47.9] helo=smtprelay.synopsys.com) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gNbcK-0007Vc-25 for linux-snps-arc@lists.infradead.org; Fri, 16 Nov 2018 10:44:52 +0000 Received: from mailhost.synopsys.com (mailhost1.synopsys.com [10.12.238.239]) by smtprelay.synopsys.com (Postfix) with ESMTP id 1189624E1146; Fri, 16 Nov 2018 02:44:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synopsys.com; s=mail; t=1542365075; bh=5pkZrd6kJ3caL9OXjHwvJuw9JnzWH4BYk+kQM13Wlb0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Btn2ISmjfQGzBPQDSgOWxYE7T8rsf67eVS0O8jWjQmHNRll9z5qsPsra5fTaYGJH3 R5flgujOx5wN/ZKUglexR7TcciSaRnoARmissbHC2neKHl/xUPz8pAwaP77GMGm6kN Aljk5kJv0jDqEgitu1aN8jeS/gbBHKrFzCXsxifiR8F4kElVwMiY7R6xdFV519aqjM eW5aaU7Sb35J8GMbjLThnurDpnxtJ6/W/18Ne0Xviuz0TfEmrUDdb6DK4maEO3h8dl /1xCAJO+gkRpb8tmH/8cvODKOaU3qPXpNfOkO0GvihQ1BgrLZGadZJyA94PdeHL8dl qh29SQv50L4zw== Received: from paltsev-e7480.internal.synopsys.com (paltsev-e7480.internal.synopsys.com [10.121.3.66]) by mailhost.synopsys.com (Postfix) with ESMTP id 7340A55A2; Fri, 16 Nov 2018 02:44:32 -0800 (PST) From: Eugeniy Paltsev To: linux-snps-arc@lists.infradead.org, Vineet Gupta Subject: [PATCH 1/3] ARC: split show_faulting_vma for logic and representation parts Date: Fri, 16 Nov 2018 13:44:25 +0300 Message-Id: <20181116104427.25264-2-Eugeniy.Paltsev@synopsys.com> X-Mailer: git-send-email 2.14.5 In-Reply-To: <20181116104427.25264-1-Eugeniy.Paltsev@synopsys.com> References: <20181116104427.25264-1-Eugeniy.Paltsev@synopsys.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181116_054452_264278_B543F613 X-CRM114-Status: GOOD ( 11.82 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [198.182.47.9 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-snps-arc@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux on Synopsys ARC Processors List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexey Brodkin , Eugeniy Paltsev , linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-snps-arc" Errors-To: linux-snps-arc-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org In preparation for introduncing SmaRT support for ARC split show_faulting_vma() for logic and representation parts to be able to use logic part in SmaRT code. Signed-off-by: Eugeniy Paltsev --- arch/arc/include/asm/bug.h | 9 +++++++++ arch/arc/kernel/troubleshoot.c | 43 ++++++++++++++++++++++++++++++------------ 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/arch/arc/include/asm/bug.h b/arch/arc/include/asm/bug.h index b68f7f82f2d8..064391646d38 100644 --- a/arch/arc/include/asm/bug.h +++ b/arch/arc/include/asm/bug.h @@ -15,6 +15,15 @@ struct task_struct; +struct faulting_vma_info { + char *file_path; + unsigned long offset; + unsigned long vm_start; + unsigned long vm_end; +}; + +int get_faulting_vma_info(unsigned long address, char *buf, int buflen, + struct faulting_vma_info *fvma); void show_regs(struct pt_regs *regs); void show_exception_mesg(struct pt_regs *regs); void show_stacktrace(struct task_struct *tsk, struct pt_regs *regs); diff --git a/arch/arc/kernel/troubleshoot.c b/arch/arc/kernel/troubleshoot.c index fdfba1942a06..00efcdfde0ee 100644 --- a/arch/arc/kernel/troubleshoot.c +++ b/arch/arc/kernel/troubleshoot.c @@ -80,11 +80,14 @@ static void print_task_path_n_nm(struct task_struct *tsk, char *buf) pr_info("Path: %s\n", !IS_ERR(path_nm) ? path_nm : "?"); } -static void show_faulting_vma(unsigned long address, char *buf) +int get_faulting_vma_info(unsigned long address, char *buf, int buflen, + struct faulting_vma_info *fvma) { struct vm_area_struct *vma; - char *nm = buf; struct mm_struct *active_mm = current->active_mm; + int ret = -ENOENT; + + fvma->file_path = "?"; /* can't use print_vma_addr() yet as it doesn't check for * non-inclusive vma @@ -97,19 +100,35 @@ static void show_faulting_vma(unsigned long address, char *buf) */ if (vma && (vma->vm_start <= address)) { if (vma->vm_file) { - nm = file_path(vma->vm_file, buf, PAGE_SIZE - 1); - if (IS_ERR(nm)) - nm = "?"; + fvma->file_path = file_path(vma->vm_file, buf, buflen); + if (IS_ERR(fvma->file_path)) + fvma->file_path = "?"; } - pr_cont("[off 0x%lx in %s, VMA: %08lx:%08lx] ", - vma->vm_start < TASK_UNMAPPED_BASE ? - address : address - vma->vm_start, - nm, vma->vm_start, vma->vm_end); - } else - pr_cont("[No matching VMA found] "); + fvma->vm_start = vma->vm_start; + fvma->vm_end = vma->vm_end; + fvma->offset = vma->vm_start < TASK_UNMAPPED_BASE ? + address : address - vma->vm_start; + + ret = 0; + } up_read(&active_mm->mmap_sem); + + return ret; +} + +static void show_faulting_vma(unsigned long address, char *buf, int buflen) +{ + struct faulting_vma_info fvma; + int ret; + + ret = get_faulting_vma_info(address, buf, buflen, &fvma); + if (ret) + pr_cont("[No matching VMA found] "); + else + pr_cont("[off 0x%lx in %s, VMA: %08lx:%08lx] ", fvma.offset, + fvma.file_path, fvma.vm_start, fvma.vm_end); } static void show_ecr_verbose(struct pt_regs *regs) @@ -175,7 +194,7 @@ static inline void show_exception_mesg_u(struct pt_regs *regs) buf = (char *)__get_free_page(GFP_NOWAIT); if (buf) { - show_faulting_vma(regs->ret, buf); + show_faulting_vma(regs->ret, buf, PAGE_SIZE - 1); free_page((unsigned long)buf); }