From patchwork Wed Apr 5 18:02:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florent Revest X-Patchwork-Id: 13202346 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4FDCAC77B6E for ; Wed, 5 Apr 2023 18:03:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=twuzCGlBN6KOq9uUBMN67kza2jmM0MWSZM8zKR1RseU=; b=Xd34IKeNs3Ft25 whj1dq+cc8elI0ZIQO0MVf6DJeCV2huAtUmDVCQj08mAnF3ndeVHajDYifULwFDGQDNp4LUl4YlPt XpccDAsEZ7xxX19sXtvg76Lck9jkELkZOyQ0ztIa8IALQojh1zhAG4CFB7jjDVSvZGz71mpxm9vgL j0Mi3KW/ZY6c7DK5O0xWVcQboYldff/hb20oVPa/ZO49FBz7+WspyNKKZ2Zwb4eHoixjPaS2NE18e i89U+YFXCcvVLfLrOIFR3O2Y3+u/yjgxjYX7QmFdMBU/BFjckdLSEUaqPfarSiMd6BEgdNmjkivTQ WEzVSBin1m6ytXQPkb7Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pk7TN-005Kfi-28; Wed, 05 Apr 2023 18:03:05 +0000 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pk7TJ-005KaW-1B for linux-arm-kernel@lists.infradead.org; Wed, 05 Apr 2023 18:03:02 +0000 Received: by mail-wm1-x32c.google.com with SMTP id v6-20020a05600c470600b003f034269c96so12251699wmo.4 for ; Wed, 05 Apr 2023 11:02:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1680717777; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DBVm5Zb8SvFMICocd9qO1ZxlhdAx1c4kialWJuW3JL8=; b=mYZ2ebBFhZzuxU4cNfsqpAqCqhwJKdWklj5QOg1NUs875jkf+Nq8raj8nf0ExLPfXx A+KwVuhrQts+hLJdZT7w7vB6vOUvrB5GOSiNb9/Ptd4Pe88bZsFbBbPfQSkUbBx9xmz9 8EOqRXufDXqb0Qb8OWiM1dC3ab7+7DBIVEVYA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680717777; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DBVm5Zb8SvFMICocd9qO1ZxlhdAx1c4kialWJuW3JL8=; b=fcwnU1geOewHawDVlJ29GBKYOyQLw/xtG6aWepvxJ1nRrefYn0QccH3Ny2JHw7xXU6 G42kfD9Yeo7e1WN4qudRKQW9krOB0nNbT7H8OEkRHDas3yzg6j/ba1J0IjerQq9t0VFq GCpOR+/4OHit2keP+cxPzxpyI89SeSrWvQarZHzApS/CUuCTHiGOLY2EJichS1Y7qd4z j7Hmmbl3LigtuR/Gdre1cY3nQWbtpXfUy+3F8991sHXkl+y6xfOCA3KJTBFwJyrrw92k lkiew92EKk1mLFe5t/u8mkxrltdD+q0FdRIMfodV9HISv5nhLYKWaD+onwDvWeUDvib/ dWlQ== X-Gm-Message-State: AAQBX9ftQH7URAVhXLSxPlot4i7PduomH0bQzZKc4/WjRHMFIT+6unuE /FWge1FfcMicZZTffhAIZKFR8y+f0gVT7/bA0uE= X-Google-Smtp-Source: AKy350b+VOJrpQCtIjiBgZCLLaeGb2jZlDW7aZI8+QWO3odmUBexZoH9aajPLjpmANeBSzetMX5/fA== X-Received: by 2002:a1c:f20d:0:b0:3ea:e582:48dd with SMTP id s13-20020a1cf20d000000b003eae58248ddmr5383281wmc.34.1680717777383; Wed, 05 Apr 2023 11:02:57 -0700 (PDT) Received: from revest.zrh.corp.google.com ([2a00:79e0:9d:6:cf6a:9ae6:15f1:4213]) by smtp.gmail.com with ESMTPSA id bd5-20020a05600c1f0500b003f0472ffc7csm2913233wmb.11.2023.04.05.11.02.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Apr 2023 11:02:57 -0700 (PDT) From: Florent Revest To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, bpf@vger.kernel.org Cc: catalin.marinas@arm.com, will@kernel.org, rostedt@goodmis.org, mhiramat@kernel.org, mark.rutland@arm.com, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, kpsingh@kernel.org, jolsa@kernel.org, xukuohai@huaweicloud.com, lihuafei1@huawei.com, Florent Revest Subject: [PATCH v6 2/5] arm64: ftrace: Simplify get_ftrace_plt Date: Wed, 5 Apr 2023 20:02:47 +0200 Message-Id: <20230405180250.2046566-3-revest@chromium.org> X-Mailer: git-send-email 2.40.0.577.gac1e443424-goog In-Reply-To: <20230405180250.2046566-1-revest@chromium.org> References: <20230405180250.2046566-1-revest@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230405_110301_405260_F81E0709 X-CRM114-Status: GOOD ( 12.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Following recent refactorings, the get_ftrace_plt function only ever gets called with addr = FTRACE_ADDR so its code can be simplified to always return the ftrace trampoline plt. Signed-off-by: Florent Revest Acked-by: Mark Rutland --- arch/arm64/kernel/ftrace.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kernel/ftrace.c b/arch/arm64/kernel/ftrace.c index 758436727fba..432626c866a8 100644 --- a/arch/arm64/kernel/ftrace.c +++ b/arch/arm64/kernel/ftrace.c @@ -195,15 +195,15 @@ int ftrace_update_ftrace_func(ftrace_func_t func) return ftrace_modify_code(pc, 0, new, false); } -static struct plt_entry *get_ftrace_plt(struct module *mod, unsigned long addr) +static struct plt_entry *get_ftrace_plt(struct module *mod) { #ifdef CONFIG_ARM64_MODULE_PLTS struct plt_entry *plt = mod->arch.ftrace_trampolines; - if (addr == FTRACE_ADDR) - return &plt[FTRACE_PLT_IDX]; -#endif + return &plt[FTRACE_PLT_IDX]; +#else return NULL; +#endif } static bool reachable_by_bl(unsigned long addr, unsigned long pc) @@ -270,7 +270,7 @@ static bool ftrace_find_callable_addr(struct dyn_ftrace *rec, if (WARN_ON(!mod)) return false; - plt = get_ftrace_plt(mod, *addr); + plt = get_ftrace_plt(mod); if (!plt) { pr_err("ftrace: no module PLT for %ps\n", (void *)*addr); return false;