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=-13.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_MUTT 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 49102C48BD7 for ; Thu, 27 Jun 2019 10:24:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1E4DA20828 for ; Thu, 27 Jun 2019 10:24:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726563AbfF0KYJ (ORCPT ); Thu, 27 Jun 2019 06:24:09 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:29020 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726187AbfF0KYJ (ORCPT ); Thu, 27 Jun 2019 06:24:09 -0400 Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x5RANGcF013966 for ; Thu, 27 Jun 2019 06:24:07 -0400 Received: from e06smtp03.uk.ibm.com (e06smtp03.uk.ibm.com [195.75.94.99]) by mx0b-001b2d01.pphosted.com with ESMTP id 2tcuaca9f0-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 27 Jun 2019 06:24:06 -0400 Received: from localhost by e06smtp03.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 27 Jun 2019 11:24:05 +0100 Received: from b06avi18626390.portsmouth.uk.ibm.com (9.149.26.192) by e06smtp03.uk.ibm.com (192.168.101.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 27 Jun 2019 11:24:03 +0100 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06avi18626390.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x5RANqUD35455340 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Jun 2019 10:23:52 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 61AC9A405F; Thu, 27 Jun 2019 10:24:02 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 15D07A405C; Thu, 27 Jun 2019 10:24:01 +0000 (GMT) Received: from sathnaga86 (unknown [9.122.211.233]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Thu, 27 Jun 2019 10:24:00 +0000 (GMT) Date: Thu, 27 Jun 2019 15:53:58 +0530 From: Satheesh Rajendran To: "Naveen N. Rao" Cc: Michael Ellerman , Steven Rostedt , Christophe Leroy , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] recordmcount: Fix spurious mcount entries on powerpc Reply-To: Satheesh Rajendran References: <20190626183801.31247-1-naveen.n.rao@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190626183801.31247-1-naveen.n.rao@linux.vnet.ibm.com> User-Agent: Mutt/1.12.0 (2019-05-25) X-TM-AS-GCONF: 00 x-cbid: 19062710-0012-0000-0000-0000032CDCAE X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19062710-0013-0000-0000-000021661A1E Message-Id: <20190627102358.GA5974@sathnaga86> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-06-27_06:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906270120 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jun 27, 2019 at 12:08:01AM +0530, Naveen N. Rao wrote: > The recent change enabling HAVE_C_RECORDMCOUNT on powerpc started > showing the following issue: > > # modprobe kprobe_example > ftrace-powerpc: Not expected bl: opcode is 3c4c0001 > WARNING: CPU: 0 PID: 227 at kernel/trace/ftrace.c:2001 ftrace_bug+0x90/0x318 > Modules linked in: > CPU: 0 PID: 227 Comm: modprobe Not tainted 5.2.0-rc6-00678-g1c329100b942 #2 > NIP: c000000000264318 LR: c00000000025d694 CTR: c000000000f5cd30 > REGS: c000000001f2b7b0 TRAP: 0700 Not tainted (5.2.0-rc6-00678-g1c329100b942) > MSR: 900000010282b033 CR: 28228222 XER: 00000000 > CFAR: c0000000002642fc IRQMASK: 0 > > NIP [c000000000264318] ftrace_bug+0x90/0x318 > LR [c00000000025d694] ftrace_process_locs+0x4f4/0x5e0 > Call Trace: > [c000000001f2ba40] [0000000000000004] 0x4 (unreliable) > [c000000001f2bad0] [c00000000025d694] ftrace_process_locs+0x4f4/0x5e0 > [c000000001f2bb90] [c00000000020ff10] load_module+0x25b0/0x30c0 > [c000000001f2bd00] [c000000000210cb0] sys_finit_module+0xc0/0x130 > [c000000001f2be20] [c00000000000bda4] system_call+0x5c/0x70 > Instruction dump: > 419e0018 2f83ffff 419e00bc 2f83ffea 409e00cc 4800001c 0fe00000 3c62ff96 > 39000001 39400000 386386d0 480000c4 <0fe00000> 3ce20003 39000001 3c62ff96 > ---[ end trace 4c438d5cebf78381 ]--- > ftrace failed to modify > [] 0xc0080000012a0008 > actual: 01:00:4c:3c > Initializing ftrace call sites > ftrace record flags: 2000000 > (0) > expected tramp: c00000000006af4c > > Looking at the relocation records in __mcount_loc showed a few spurious > entries: > RELOCATION RECORDS FOR [__mcount_loc]: > OFFSET TYPE VALUE > 0000000000000000 R_PPC64_ADDR64 .text.unlikely+0x0000000000000008 > 0000000000000008 R_PPC64_ADDR64 .text.unlikely+0x0000000000000014 > 0000000000000010 R_PPC64_ADDR64 .text.unlikely+0x0000000000000060 > 0000000000000018 R_PPC64_ADDR64 .text.unlikely+0x00000000000000b4 > 0000000000000020 R_PPC64_ADDR64 .init.text+0x0000000000000008 > 0000000000000028 R_PPC64_ADDR64 .init.text+0x0000000000000014 > > The first entry in each section is incorrect. Looking at the relocation > records, the spurious entries correspond to the R_PPC64_ENTRY records: > RELOCATION RECORDS FOR [.text.unlikely]: > OFFSET TYPE VALUE > 0000000000000000 R_PPC64_REL64 .TOC.-0x0000000000000008 > 0000000000000008 R_PPC64_ENTRY *ABS* > 0000000000000014 R_PPC64_REL24 _mcount > > > The problem is that we are not validating the return value from > get_mcountsym() in sift_rel_mcount(). With this entry, mcountsym is 0, > but Elf_r_sym(relp) also ends up being 0. Fix this by ensuring mcountsym > is valid before processing the entry. > > Fixes: c7d64b560ce80 ("powerpc/ftrace: Enable C Version of recordmcount") > Signed-off-by: Naveen N. Rao > --- > scripts/recordmcount.h | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Hi, linuxppc/merge branch latest commit 850f6274c5b5 was failing to boot IBM Power8 Box, and the failure got resolved with this patch. https://github.com/linuxppc/issues/issues/254 # git log -2 --oneline 0e0f55b31ea8 (HEAD -> issue_254) recordmcount: Fix spurious mcount entries on powerpc 850f6274c5b5 (origin/merge, merge) Automatic merge of branches 'master', 'next' and 'fixes' into merge # uname -r 5.2.0-rc6-00123-g0e0f55b31ea8 Tested-by: Satheesh Rajendran Regards, -Satheesh > > diff --git a/scripts/recordmcount.h b/scripts/recordmcount.h > index 13c5e6c8829c..47fca2c69a73 100644 > --- a/scripts/recordmcount.h > +++ b/scripts/recordmcount.h > @@ -325,7 +325,8 @@ static uint_t *sift_rel_mcount(uint_t *mlocp, > if (!mcountsym) > mcountsym = get_mcountsym(sym0, relp, str0); > > - if (mcountsym == Elf_r_sym(relp) && !is_fake_mcount(relp)) { > + if (mcountsym && mcountsym == Elf_r_sym(relp) && > + !is_fake_mcount(relp)) { > uint_t const addend = > _w(_w(relp->r_offset) - recval + mcount_adjust); > mrelp->r_offset = _w(offbase > -- > 2.22.0 >