Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp686991iog; Fri, 24 Jun 2022 11:44:34 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tgXkXvzdBpHJ+yMgxlgJqhoH0IzBb6d3FOCLHwhDOsnM9y1AzkeOn7ckzuOQVVd3sJhMK7 X-Received: by 2002:a63:3e08:0:b0:40c:9787:7a8b with SMTP id l8-20020a633e08000000b0040c97877a8bmr226683pga.364.1656096274586; Fri, 24 Jun 2022 11:44:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656096274; cv=none; d=google.com; s=arc-20160816; b=IdCqVPc/pnyUHY43+k4qxuquaWo4jMkIfJEU1KLCBlUih3JcXqfZQTL5Pj3gx3wf5M VuEev7Tqr2BtKs6IN8teW5QtDZJ/fjsmq09jGav90/mQiAe+kqOXxfpNjGhr4DNtfCoF MWaYd3Pin3lvAsTjA6vamm+RzpFWJBiqVLA6yCTOKARX37IB4QIVPrUBRZZEPuGp9R6X TP2L2WNeAORc2Wxf8NJHVZDqpuQY88PiFjGeVFyH/eyCRfPYWijQZtUf7j91XVD85fXv eWAfl/JQYThxQYR5w09FT5JNYZDL2DgAj+l+wrmI6vjp4AWJR4a/rkoZENcZG+eO3j2j 89oA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=duPQMO5ThdvFOzADAJfuZu8uTSbXRkrQpBFJBM0lmOo=; b=GYMjH5uUbVqUx3VWR1mbWleKIvu5ErQoIIc34g/SWALn4hAnnHRKsp9tMNGhk19i4q wC4ac3lYM1Eeodi9/uHFg/dqeuDMfH1t/cI2jtka9ivsTASGqyVzy60SvJDuXynP1MMb uMFtgj4wfC7adC1vUhKUlaywQRBLzGRuubaCL2JYUkZUHrJ0HxF4VzpYpKp4hAEoT1ah /0KDSi2DduSb/j//EEKHaVyjM7Xhk56CMmB8UIGPX3wxJdzzHqc8b0slcM1EmllRyQfZ IPCCii0rbAsGTpLtSb3guoEjoSBjfykr+9T5Hv1O7pyPWv1AByjQyCtsbfLHHpYQ2UTJ TCqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=HP5M4vv6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i9-20020a170902cf0900b0015bfd115dcesi3893467plg.455.2022.06.24.11.44.23; Fri, 24 Jun 2022 11:44:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=HP5M4vv6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231201AbiFXSex (ORCPT + 99 others); Fri, 24 Jun 2022 14:34:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229784AbiFXSeu (ORCPT ); Fri, 24 Jun 2022 14:34:50 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43ABD81258 for ; Fri, 24 Jun 2022 11:34:31 -0700 (PDT) Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25OIDZto002000; Fri, 24 Jun 2022 18:34:05 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=duPQMO5ThdvFOzADAJfuZu8uTSbXRkrQpBFJBM0lmOo=; b=HP5M4vv6QALVguqu93JUjNo229xQGTOadxRnSHyEOVdqS3a1NSQBBScvMNphJcui5lyA VA0aORICO/y/8K9xPJd3ZHgMxdcnvxXgTXTtJ2YkLmNClUbMeQ54MeuRFwE7wo/+SMjP wZHgX7orXXHcMXl4FYIqCddwWOLuMMlr4AJEG5JmYPS/PT4k21Cmddi3MPuTH0NjHOJU q7W2H8AyesVYiF3NzwO+tXVwjRVdengKUkEG874QZKuClQKLMdPAz4BIKEn+oJOfK181 C4qmYveJPaOYanC/IvCF2V3SAyf6SL+URN8HhwSoYqeRHE8QUyfzp0sFGFrD2tmCGzIi 2A== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3gwjbvrfdf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Jun 2022 18:34:05 +0000 Received: from m0098420.ppops.net (m0098420.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 25OIHwhf019818; Fri, 24 Jun 2022 18:34:04 GMT Received: from ppma04fra.de.ibm.com (6a.4a.5195.ip4.static.sl-reverse.com [149.81.74.106]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3gwjbvrfcc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Jun 2022 18:34:04 +0000 Received: from pps.filterd (ppma04fra.de.ibm.com [127.0.0.1]) by ppma04fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 25OILdH2017353; Fri, 24 Jun 2022 18:34:02 GMT Received: from b06avi18878370.portsmouth.uk.ibm.com (b06avi18878370.portsmouth.uk.ibm.com [9.149.26.194]) by ppma04fra.de.ibm.com with ESMTP id 3gs6b8ycvj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Jun 2022 18:34:02 +0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06avi18878370.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 25OIY61Y28967208 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 24 Jun 2022 18:34:06 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6D37052051; Fri, 24 Jun 2022 18:34:00 +0000 (GMT) Received: from li-c3569c4c-1ef8-11b2-a85c-ee139cda3133.ibm.com.com (unknown [9.43.0.85]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 7CD855204E; Fri, 24 Jun 2022 18:33:56 +0000 (GMT) From: Sathvika Vasireddy To: linuxppc-dev@lists.ozlabs.org Cc: jpoimboe@redhat.com, peterz@infradead.org, linux-kernel@vger.kernel.org, aik@ozlabs.ru, mpe@ellerman.id.au, christophe.leroy@csgroup.eu, mingo@redhat.com, rostedt@goodmis.org, naveen.n.rao@linux.vnet.ibm.com, sv@linux.ibm.com, mbenes@suse.cz, benh@kernel.crashing.org, paulus@samba.org Subject: [RFC PATCH v3 10/12] objtool/powerpc: Add --mcount specific implementation Date: Sat, 25 Jun 2022 00:02:36 +0530 Message-Id: <20220624183238.388144-11-sv@linux.ibm.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220624183238.388144-1-sv@linux.ibm.com> References: <20220624183238.388144-1-sv@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: SIFuR8uvbZMqJmvE9ALgV9rGF6mOM2L7 X-Proofpoint-GUID: USYx6SFmyGZ_Ea9djl-ufD50FPZVOI7m X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-06-24_08,2022-06-23_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 suspectscore=0 spamscore=0 lowpriorityscore=0 mlxlogscore=762 impostorscore=0 priorityscore=1501 bulkscore=0 adultscore=0 phishscore=0 mlxscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000 definitions=main-2206240072 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch enables objtool --mcount on powerpc, and adds implementation specific to powerpc. Signed-off-by: Sathvika Vasireddy --- arch/powerpc/Kconfig | 1 + tools/objtool/arch/powerpc/decode.c | 22 +++++++++++++++++++ tools/objtool/arch/powerpc/include/arch/elf.h | 2 ++ 3 files changed, 25 insertions(+) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 732a3f91ee5e..3373d44a1298 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -233,6 +233,7 @@ config PPC select HAVE_NMI if PERF_EVENTS || (PPC64 && PPC_BOOK3S) select HAVE_OPTPROBES select HAVE_OBJTOOL if PPC64 + select HAVE_OBJTOOL_MCOUNT if HAVE_OBJTOOL select HAVE_PERF_EVENTS select HAVE_PERF_EVENTS_NMI if PPC64 select HAVE_PERF_REGS diff --git a/tools/objtool/arch/powerpc/decode.c b/tools/objtool/arch/powerpc/decode.c index 8b6a14680da7..06fc0206bf8e 100644 --- a/tools/objtool/arch/powerpc/decode.c +++ b/tools/objtool/arch/powerpc/decode.c @@ -9,6 +9,14 @@ #include #include +bool arch_ftrace_match(char *name) +{ + if ((!strcmp(name, "_mcount")) || (!strcmp(name, "._mcount"))) + return true; + + return false; +} + unsigned long arch_dest_reloc_offset(int addend) { return addend; @@ -41,12 +49,26 @@ int arch_decode_instruction(struct objtool_file *file, const struct section *sec struct list_head *ops_list) { u32 insn; + unsigned int opcode; *immediate = 0; insn = bswap_if_needed(file->elf, *(u32 *)(sec->data->d_buf + offset)); *len = 4; *type = INSN_OTHER; + opcode = insn >> 26; + + switch (opcode) { + case 18: /* bl */ + if ((insn & 3) == 1) { + *type = INSN_CALL; + *immediate = insn & 0x3fffffc; + if (*immediate & 0x2000000) + *immediate -= 0x4000000; + } + break; + } + return 0; } diff --git a/tools/objtool/arch/powerpc/include/arch/elf.h b/tools/objtool/arch/powerpc/include/arch/elf.h index 3c8ebb7d2a6b..73f9ae172fe5 100644 --- a/tools/objtool/arch/powerpc/include/arch/elf.h +++ b/tools/objtool/arch/powerpc/include/arch/elf.h @@ -4,5 +4,7 @@ #define _OBJTOOL_ARCH_ELF #define R_NONE R_PPC_NONE +#define R_ABS64 R_PPC64_ADDR64 +#define R_ABS32 R_PPC_ADDR32 #endif /* _OBJTOOL_ARCH_ELF */ -- 2.25.1