Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp3341328pxb; Mon, 18 Apr 2022 23:36:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+2s9Sbhbg3vebvOl2sD74CVMcYdE5j/H7h6EDQSxAJ9wJieigBwWVlz0ODSZtPBK5Qo84 X-Received: by 2002:a05:6a00:124f:b0:50a:72ed:c924 with SMTP id u15-20020a056a00124f00b0050a72edc924mr9830513pfi.31.1650350175466; Mon, 18 Apr 2022 23:36:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650350175; cv=none; d=google.com; s=arc-20160816; b=ack5no+HZ2pg+NpH6vL32jtiWvNOtNHc0fdKmw+LFJJY/xAvjfSopWtlVWk6gh1tLi h7lhoGk0CA14+O4RWMLALcHD2eI6kBMZuh9BUHiuxbbzd+zyeSIPHpFJbXZc7Fr6wRYm QORd1KL++RYsq86yLrvNvk8Rfz7UmCn97XBg6mj6P3qolPDqxr/ADKMIXz/apPVfQpcf u9/60eetwro4cnBFp25PnDkcHVVddyBUIKKFTFboqsdE/8SYVmcqpHP27jSvDP0V2UxU E5EWkjY8vlfhn64BEBXdr0H1FC2FxWAvXza304vN3oEkIuBbG0Yd1nmOAeUbRwk9sQOE ryYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:message-id:user-agent :mime-version:in-reply-to:references:cc:to:subject:from:date :dkim-signature; bh=5VXAVkLMdiRAvnu6UsBA33RTxwDxudhMyjKEXGud+nY=; b=HnsznRneyxYNnq+uaR7d5EAXKPDDlAqhkyVhZoatgQ26or/LxxwsmCfIGyOB/8PmEF HsvsloBpPlq2+e7P9ydAFdrPMhd1IKB2fz9rsL30z8kfR9TaTGytXSPBjJhz+eozucAn JvBWBrh7M+93e4ShLHSuFdVHn4jS/1VeZFi+0Q+sQFW2l3gHUkSDxgQ7gqitPB8DOPC9 gfN6c6CF91vRKguxk5vwie2xtjOBSfyRSsHSXbyXF/1ok5FFis3RDPOrziR2jvafEjrv vQ9uIY6nVAepqoCNwbxotxRTuu9OXpU9GOAe42XD50l882aRWdF4tCbUISdSNtG8QRJ3 U2KA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=ViRaPF15; 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 194-20020a6300cb000000b003816043f10bsi10662817pga.768.2022.04.18.23.36.00; Mon, 18 Apr 2022 23:36:15 -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=ViRaPF15; 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 S237048AbiDRICe (ORCPT + 99 others); Mon, 18 Apr 2022 04:02:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232693AbiDRICZ (ORCPT ); Mon, 18 Apr 2022 04:02:25 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA920D99 for ; Mon, 18 Apr 2022 00:59:46 -0700 (PDT) Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 23I3NvRY008833; Mon, 18 Apr 2022 07:59:14 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=date : from : subject : to : cc : references : in-reply-to : mime-version : message-id : content-type : content-transfer-encoding; s=pp1; bh=5VXAVkLMdiRAvnu6UsBA33RTxwDxudhMyjKEXGud+nY=; b=ViRaPF156rq0vJpUbLZpLkCvy6tI+rguia4+E6vCcc2sS3Jk1lTl6nr19JunJB0aHGhf VlqX/63YmeGF+q6JypJ+RVHFKOpfIsDYlKe0UeHN4Z+GMiCJOrNWG3UjsZGRYEW7+2LK FAMPSw/OC5vPJr+4cXRMmkuElmnn+9vSC3U5cnXBv7/yKrqfSzxwnHptDc109BjBNLqh dd0DxVvRzlasdtEK9S+6xj2n/u+hIbuGHXzI+DSJm3rtQzaAjUHzN6wV+h85xlliRfUp NpLocSKLLkDKGFe7vJMuGGvgZmk4F7Ua16u1BMrqfZs1wc9qzH/QkhW3tFveX8rtbkU6 Hw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3fg7vmxs6p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 18 Apr 2022 07:59:13 +0000 Received: from m0098393.ppops.net (m0098393.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 23I7bvG4023451; Mon, 18 Apr 2022 07:59:13 GMT Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com with ESMTP id 3fg7vmxs62-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 18 Apr 2022 07:59:13 +0000 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 23I7lU5O030132; Mon, 18 Apr 2022 07:59:10 GMT Received: from b06avi18878370.portsmouth.uk.ibm.com (b06avi18878370.portsmouth.uk.ibm.com [9.149.26.194]) by ppma06ams.nl.ibm.com with ESMTP id 3ffn2htex4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 18 Apr 2022 07:59:10 +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 23I7xIGe45416738 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 18 Apr 2022 07:59:18 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3E9E652051; Mon, 18 Apr 2022 07:59:08 +0000 (GMT) Received: from localhost (unknown [9.43.2.186]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id BD5A35204F; Mon, 18 Apr 2022 07:59:07 +0000 (GMT) Date: Mon, 18 Apr 2022 13:29:06 +0530 From: "Naveen N. Rao" Subject: Re: [PATCH v1 16/22] powerpc/ftrace: Minimise number of #ifdefs To: Benjamin Herrenschmidt , Christophe Leroy , Ingo Molnar , Michael Ellerman , Paul Mackerras , Steven Rostedt Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org References: <7ef4015badd5f1861cfc327a7641c84e0e5630ca.1648131740.git.christophe.leroy@csgroup.eu> In-Reply-To: <7ef4015badd5f1861cfc327a7641c84e0e5630ca.1648131740.git.christophe.leroy@csgroup.eu> MIME-Version: 1.0 User-Agent: astroid/4d6b06ad (https://github.com/astroidmail/astroid) Message-Id: <1650267933.ewyj9l63lo.naveen@linux.ibm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: ajpjqq7weAvc-b88KW54bK1G566jtRwz X-Proofpoint-GUID: Hu6_LPa22Hn4S1YFSzTSU07868K2i3T0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.858,Hydra:6.0.486,FMLib:17.11.64.514 definitions=2022-04-18_02,2022-04-15_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 mlxscore=0 phishscore=0 suspectscore=0 bulkscore=0 lowpriorityscore=0 spamscore=0 priorityscore=1501 impostorscore=0 mlxlogscore=756 adultscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2204180045 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE,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 Christophe Leroy wrote: > A lot of #ifdefs can be replaced by IS_ENABLED() >=20 > Do so. >=20 > This requires to have kernel_toc_addr() defined at all time > and PPC_INST_LD_TOC as well. >=20 > Signed-off-by: Christophe Leroy > --- > arch/powerpc/include/asm/code-patching.h | 2 - > arch/powerpc/include/asm/module.h | 2 - > arch/powerpc/include/asm/sections.h | 24 +-- > arch/powerpc/kernel/trace/ftrace.c | 201 ++++++++++++----------- > 4 files changed, 113 insertions(+), 116 deletions(-) >=20 > diff --git a/arch/powerpc/include/asm/code-patching.h b/arch/powerpc/incl= ude/asm/code-patching.h > index 4260e89f62b1..071fcbec31c5 100644 > --- a/arch/powerpc/include/asm/code-patching.h > +++ b/arch/powerpc/include/asm/code-patching.h > @@ -217,7 +217,6 @@ static inline unsigned long ppc_kallsyms_lookup_name(= const char *name) > return addr; > } >=20 > -#ifdef CONFIG_PPC64 > /* > * Some instruction encodings commonly used in dynamic ftracing > * and function live patching. > @@ -234,6 +233,5 @@ static inline unsigned long ppc_kallsyms_lookup_name(= const char *name) >=20 > /* usually preceded by a mflr r0 */ > #define PPC_INST_STD_LR PPC_RAW_STD(_R0, _R1, PPC_LR_STKOFF) > -#endif /* CONFIG_PPC64 */ >=20 > #endif /* _ASM_POWERPC_CODE_PATCHING_H */ > diff --git a/arch/powerpc/include/asm/module.h b/arch/powerpc/include/asm= /module.h > index e6f5963fd96e..700d7ecd9012 100644 > --- a/arch/powerpc/include/asm/module.h > +++ b/arch/powerpc/include/asm/module.h > @@ -41,9 +41,7 @@ struct mod_arch_specific { >=20 > #ifdef CONFIG_FUNCTION_TRACER > unsigned long tramp; > -#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS > unsigned long tramp_regs; > -#endif > #endif >=20 > /* List of BUG addresses, source line numbers and filenames */ > diff --git a/arch/powerpc/include/asm/sections.h b/arch/powerpc/include/a= sm/sections.h > index 8be2c491c733..6980eaeb16fe 100644 > --- a/arch/powerpc/include/asm/sections.h > +++ b/arch/powerpc/include/asm/sections.h > @@ -29,18 +29,6 @@ extern char start_virt_trampolines[]; > extern char end_virt_trampolines[]; > #endif >=20 > -/* > - * This assumes the kernel is never compiled -mcmodel=3Dsmall or > - * the total .toc is always less than 64k. > - */ > -static inline unsigned long kernel_toc_addr(void) > -{ > - unsigned long toc_ptr; > - > - asm volatile("mr %0, 2" : "=3Dr" (toc_ptr)); > - return toc_ptr; > -} > - > static inline int overlaps_interrupt_vector_text(unsigned long start, > unsigned long end) > { > @@ -60,5 +48,17 @@ static inline int overlaps_kernel_text(unsigned long s= tart, unsigned long end) >=20 > #endif >=20 > +/* > + * This assumes the kernel is never compiled -mcmodel=3Dsmall or > + * the total .toc is always less than 64k. > + */ > +static inline unsigned long kernel_toc_addr(void) > +{ > + unsigned long toc_ptr; > + > + asm volatile("mr %0, 2" : "=3Dr" (toc_ptr)); > + return toc_ptr; > +} > + > #endif /* __KERNEL__ */ > #endif /* _ASM_POWERPC_SECTIONS_H */ > diff --git a/arch/powerpc/kernel/trace/ftrace.c b/arch/powerpc/kernel/tra= ce/ftrace.c > index ffedf8c82ea8..4dd30e396026 100644 > --- a/arch/powerpc/kernel/trace/ftrace.c > +++ b/arch/powerpc/kernel/trace/ftrace.c > @@ -150,55 +150,55 @@ __ftrace_make_nop(struct module *mod, > return -EINVAL; > } >=20 > - /* When using -mkernel_profile or PPC32 there is no load to jump over *= / > - pop =3D ppc_inst(PPC_RAW_NOP()); > + if (IS_ENABLED(CONFIG_MPROFILE_KERNEL)) { > + /* When using -mkernel_profile or PPC32 there is no load to jump over = */ > + pop =3D ppc_inst(PPC_RAW_NOP()); Why move this inside the if() statement? You can keep this out and drop=20 the else clause. - Naveen