From patchwork Mon Oct 21 16:34:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 177126 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp3647190ill; Mon, 21 Oct 2019 09:35:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqz+ABBES2PbuQpRQ3kQWrsA/xPAj1dl8sY/EDUPk6LJa/t8ju0dEzKck+ekTEl8xADbBrM5 X-Received: by 2002:aa7:d1d2:: with SMTP id g18mr3288398edp.269.1571675734177; Mon, 21 Oct 2019 09:35:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571675734; cv=none; d=google.com; s=arc-20160816; b=rF9+EUQRPebScT0z3ht+vDDg7dwqNm02+LS449Mn8r0CpvvNzUNNP0EMwVakl5nsD3 3qPznlijUMppBYHKz9shQro6SkZ/kj5JearCcofNLNRQsO0TIMMCzRq3qLN+I38RJ2do jgBe5OqPy22kn8Fhd2wd2Pdgd8CY304m76TGWUrrkohbzImd9I9FClwtfiM5rLru2mrr v+wMU2xE5taoNTCsQhR/TTCBszU15EEZh6PZ9exfYyrRhBciZNJxYmsgl7Es4AQdmYsP TwX+nWb8qrRIe/6pEvE08pVZRJNLiP0zdA+Fmu43HtUk8OtswLajhwPfZSxujuOiKMf9 ZycQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=KXiH/tRYNt4KmLTmMk1buZZJSrhUv92Yx6lPn7Gk3SM=; b=UP2lt1XCR7Idceh22nISuHR1yS7xwIEEpU00rvy+NkmqLvdb6T3niqj6mIY1aeQ3Kp UTq/pe7WRtI1GowpT73Zkqf0tQhY2KdJs3VIq0npbrARm9pothG1rkws+OJ87KGqP/DV ku+7uURKaG/o1YS+9imRdoH6/805J/pFGJ8Ly2k1D2vCYVRHO0S8plkKM1DXN81qcPCF nowqYTwHiq96L/5k1xjA/VwHoqVLQM/RdNL9E5OL76rL8b9OAoMZTpJd2dZLV7/8PUmN VaOGwkKzGOSNoeMgDQKtExmjk9p16hFnlb+ZvRDacmLRkjQGGrNpX0+uMXI9QXUsFmyC Pj7w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pw26si4495835ejb.88.2019.10.21.09.35.33; Mon, 21 Oct 2019 09:35:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726332AbfJUQfa (ORCPT + 26 others); Mon, 21 Oct 2019 12:35:30 -0400 Received: from [217.140.110.172] ([217.140.110.172]:57700 "EHLO foss.arm.com" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1729736AbfJUQfX (ORCPT ); Mon, 21 Oct 2019 12:35:23 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 21ABE1758; Mon, 21 Oct 2019 09:35:00 -0700 (PDT) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id DD6703F71F; Mon, 21 Oct 2019 09:34:57 -0700 (PDT) From: Mark Rutland To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: amit.kachhap@arm.com, ard.biesheuvel@linaro.org, catalin.marinas@arm.com, deller@gmx.de, duwe@suse.de, james.morse@arm.com, jeyu@kernel.org, jpoimboe@redhat.com, jthierry@redhat.com, mark.rutland@arm.com, mingo@redhat.com, peterz@infradead.org, rostedt@goodmis.org, svens@stackframe.org, takahiro.akashi@linaro.org, will@kernel.org Subject: [PATCH 8/8] arm64: ftrace: minimize ifdeffery Date: Mon, 21 Oct 2019 17:34:26 +0100 Message-Id: <20191021163426.9408-9-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191021163426.9408-1-mark.rutland@arm.com> References: <20191021163426.9408-1-mark.rutland@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that we no longer refer to mod->arch.ftrace_trampolines in the body of ftrace_make_call(), we can use IS_ENABLED() rather than ifdeffery, and make the code easier to follow. Likewise in ftrace_make_nop(). Let's do so. Signed-off-by: Mark Rutland Cc: Ard Biesheuvel Cc: Catalin Marinas Cc: Will Deacon --- arch/arm64/kernel/ftrace.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) -- 2.11.0 diff --git a/arch/arm64/kernel/ftrace.c b/arch/arm64/kernel/ftrace.c index aea652c33a38..8618faa82e6d 100644 --- a/arch/arm64/kernel/ftrace.c +++ b/arch/arm64/kernel/ftrace.c @@ -62,18 +62,18 @@ int ftrace_update_ftrace_func(ftrace_func_t func) return ftrace_modify_code(pc, 0, new, false); } -#ifdef CONFIG_ARM64_MODULE_PLTS static struct plt_entry *get_ftrace_plt(struct module *mod, unsigned long addr) { +#ifdef CONFIG_ARM64_MODULE_PLTS struct plt_entry *plt = mod->arch.ftrace_trampolines; if (addr == FTRACE_ADDR) return &plt[FTRACE_PLT_IDX]; if (addr == FTRACE_REGS_ADDR && IS_ENABLED(CONFIG_FTRACE_WITH_REGS)) return &plt[FTRACE_REGS_PLT_IDX]; +#endif return NULL; } -#endif /* * Turn on the call to ftrace_caller() in instrumented function @@ -85,10 +85,12 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) long offset = (long)pc - (long)addr; if (offset < -SZ_128M || offset >= SZ_128M) { -#ifdef CONFIG_ARM64_MODULE_PLTS struct module *mod; struct plt_entry *plt; + if (!IS_ENABLED(CONFIG_ARM64_MODULE_PLTS)) + return -EINVAL; + /* * On kernels that support module PLTs, the offset between the * branch instruction and its target may legally exceed the @@ -113,9 +115,6 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) } addr = (unsigned long)plt; -#else /* CONFIG_ARM64_MODULE_PLTS */ - return -EINVAL; -#endif /* CONFIG_ARM64_MODULE_PLTS */ } old = aarch64_insn_gen_nop(); @@ -185,9 +184,11 @@ int ftrace_make_nop(struct module *mod, struct dyn_ftrace *rec, long offset = (long)pc - (long)addr; if (offset < -SZ_128M || offset >= SZ_128M) { -#ifdef CONFIG_ARM64_MODULE_PLTS u32 replaced; + if (!IS_ENABLED(CONFIG_ARM64_MODULE_PLTS)) + return -EINVAL; + /* * 'mod' is only set at module load time, but if we end up * dealing with an out-of-range condition, we can assume it @@ -218,9 +219,6 @@ int ftrace_make_nop(struct module *mod, struct dyn_ftrace *rec, return -EINVAL; validate = false; -#else /* CONFIG_ARM64_MODULE_PLTS */ - return -EINVAL; -#endif /* CONFIG_ARM64_MODULE_PLTS */ } else { old = aarch64_insn_gen_branch_imm(pc, addr, AARCH64_INSN_BRANCH_LINK);