Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp1324812rwb; Fri, 19 Aug 2022 01:22:25 -0700 (PDT) X-Google-Smtp-Source: AA6agR4sf5a1ToPGMEu9sQlVTrRjKpfyv3MVS+sesHV0OBPg4RoliwWFt2E2XQFjUtt7ZqXhnFbr X-Received: by 2002:a05:6402:3881:b0:445:f8bf:5a1c with SMTP id fd1-20020a056402388100b00445f8bf5a1cmr5284217edb.13.1660897345501; Fri, 19 Aug 2022 01:22:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660897345; cv=none; d=google.com; s=arc-20160816; b=krjyePn+3Uu3v5bsg3ECNIMWTHr4h0JjOSsyMWRdhuvvX6fyN9uj0Z6591Pa+5QMKp RLE/Gk7FO8uMeKH4Hk6EGVs6NZFR1hv2WU/Xh/rTlOuSVdS/A+FP8HQp0dDCPIYN6ym0 wrP/0lDO4Npu72X6tXqFUlQ/8kZrq3xq3KB3BmbKKCKi3AIUncqLgOqrw1CV3Vh3uWfz SpB3Go1jAAksZo75i/MVBtFONjDBChzTnVTK2dumIigEsSlHNJDxQanQHi2wFY8ZLOaY 9hyZA4eN7XwG6QvvRyAPtp3H3Q9nwXRGghPthp0anQVS8FsUVO2l0xS2iathoGLKh+2w uyZg== 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; bh=uC8Z3RSh0FCbRLmg/ZuDMl5Xtkt8a2dBrZfy5hoFWlU=; b=ga4OhamYZCUqDlxKLwBSlsFF1RwB0h4y1ZPXOAVQKKT54Pvr6MDgogEIM6l3SdpFYj H7Hfm6DCpQguQiUTOASUvlacmR1OrB8tDZnbZQ61l1hKDuB9Y51T4MrwX0/2QHu8dUmM Q5OUjIbUX9TzZehjojeF26Yy42f+YaVgs37Kdo4P7Rt62c4a7dYeQfoawbNVIWTQ4EL0 SWDFskUZecEhPZZEJm5Ow5M4Hw2QNAaBv4HLnJ+uowwo9E+1uVrmT+PpZdbLFHT62E5+ 0bWuOUyfcnbxYZG4s47hVqspk4jy5mXqmFtyWoLQAE4f34VKtZYl4g4jQehKGYAUuXCM TzRA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t5-20020a50ab45000000b0043c12e736c7si2559863edc.485.2022.08.19.01.21.59; Fri, 19 Aug 2022 01:22:25 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347006AbiHSISA (ORCPT + 99 others); Fri, 19 Aug 2022 04:18:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346622AbiHSIRI (ORCPT ); Fri, 19 Aug 2022 04:17:08 -0400 Received: from loongson.cn (mail.loongson.cn [114.242.206.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id BE69EB274B; Fri, 19 Aug 2022 01:17:06 -0700 (PDT) Received: from localhost.localdomain (unknown [113.200.148.30]) by localhost.localdomain (Coremail) with SMTP id AQAAf8Bx32v5Rv9isI4EAA--.18159S4; Fri, 19 Aug 2022 16:16:58 +0800 (CST) From: Qing Zhang To: Huacai Chen , Steven Rostedt , Ingo Molnar Cc: WANG Xuerui , loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Jiaxun Yang , hejinyang@loongson.cn, zhangqing@loongson.cn Subject: [PATCH 8/9] LoongArch: ftrace: Add CALLER_ADDRx macros Date: Fri, 19 Aug 2022 16:16:56 +0800 Message-Id: <20220819081657.7254-3-zhangqing@loongson.cn> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220819081657.7254-1-zhangqing@loongson.cn> References: <20220819081657.7254-1-zhangqing@loongson.cn> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: AQAAf8Bx32v5Rv9isI4EAA--.18159S4 X-Coremail-Antispam: 1UD129KBjvJXoWxWFW8Cr4DZF18JrWftFy7KFg_yoWrJryxpF 97ArZ3GrW0kwn7trZrXr15ur15AFn7Gw12ga129a45Ar12qr17uw1kZ34qqFn5tayxG3yI qFWrCrWayF4DJaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUmj14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jryl82xGYIkIc2 x26xkF7I0E14v26r4j6ryUM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw A2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1l e2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI 8IcVAFwI0_Jrv_JF1lYx0Ex4A2jsIE14v26r4j6F4UMcvjeVCFs4IE7xkEbVWUJVW8JwAC jcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lFIxGxcIEc7CjxVA2Y2ka0x kIwI1lc2xSY4AK67AK6r43MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4U MI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67 AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26ryj6F1UMIIF0xvE2Ix0 cI8IcVCY1x0267AKxVW8Jr0_Cr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I 8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4UJVWxJrUvcSsGvfC2Kfnx nUUI43ZEXa7sRRD73JUUUUU== X-CM-SenderInfo: x2kd0wptlqwqxorr0wxvrqhubq/ X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_PASS, 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 CALLER_ADDRx returns caller's address at specified level in call stacks. They are used for several tracers like irqsoff and preemptoff. do_vint irqentry_exit trace_hardirqs_on tracer_hardirqs_on(CALLER_ADDR0, CALLER_ADDR1) Signed-off-by: Qing Zhang --- arch/loongarch/include/asm/ftrace.h | 2 ++ arch/loongarch/include/asm/processor.h | 2 -- arch/loongarch/kernel/Makefile | 4 +-- arch/loongarch/kernel/return_address.c | 45 ++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 arch/loongarch/kernel/return_address.c diff --git a/arch/loongarch/include/asm/ftrace.h b/arch/loongarch/include/asm/ftrace.h index f96adef0e4a5..6afc9fc712f4 100644 --- a/arch/loongarch/include/asm/ftrace.h +++ b/arch/loongarch/include/asm/ftrace.h @@ -16,6 +16,8 @@ #define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */ #ifndef __ASSEMBLY__ +extern void *return_address(unsigned int); +#define ftrace_return_address(n) return_address(n) #ifndef CONFIG_DYNAMIC_FTRACE extern void _mcount(void); #define mcount _mcount diff --git a/arch/loongarch/include/asm/processor.h b/arch/loongarch/include/asm/processor.h index 1c4b4308378d..5eb45e55f3c7 100644 --- a/arch/loongarch/include/asm/processor.h +++ b/arch/loongarch/include/asm/processor.h @@ -201,8 +201,6 @@ unsigned long __get_wchan(struct task_struct *p); #define KSTK_EUEN(tsk) (task_pt_regs(tsk)->csr_euen) #define KSTK_ECFG(tsk) (task_pt_regs(tsk)->csr_ecfg) -#define return_address() ({__asm__ __volatile__("":::"$1"); __builtin_return_address(0);}) - #ifdef CONFIG_CPU_HAS_PREFETCH #define ARCH_HAS_PREFETCH diff --git a/arch/loongarch/kernel/Makefile b/arch/loongarch/kernel/Makefile index a73599619466..9a3df7c1f6e8 100644 --- a/arch/loongarch/kernel/Makefile +++ b/arch/loongarch/kernel/Makefile @@ -6,8 +6,8 @@ extra-y := head.o vmlinux.lds obj-y += cpu-probe.o cacheinfo.o env.o setup.o entry.o genex.o \ - traps.o irq.o idle.o process.o dma.o mem.o io.o reset.o switch.o \ - elf.o syscall.o signal.o time.o topology.o inst.o ptrace.o vdso.o + traps.o irq.o idle.o process.o dma.o mem.o io.o reset.o return_address.o \ + switch.o elf.o syscall.o signal.o time.o topology.o inst.o ptrace.o vdso.o obj-$(CONFIG_ACPI) += acpi.o obj-$(CONFIG_EFI) += efi.o diff --git a/arch/loongarch/kernel/return_address.c b/arch/loongarch/kernel/return_address.c new file mode 100644 index 000000000000..ed8121dd2b0f --- /dev/null +++ b/arch/loongarch/kernel/return_address.c @@ -0,0 +1,45 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2022 Loongson Technology Corporation Limited + */ + +#include +#include +#include +#include + +struct return_address_data { + unsigned int level; + void *addr; +}; + +static bool save_return_addr(void *d, unsigned long pc) +{ + struct return_address_data *data = d; + + if (!data->level) { + data->addr = (void *)pc; + return false; + } else { + --data->level; + return true; + } +} +NOKPROBE_SYMBOL(save_return_addr); + +void *return_address(unsigned int level) +{ + struct return_address_data data; + + data.level = level + 2; + data.addr = NULL; + + arch_stack_walk(save_return_addr, &data, current, NULL); + + if (!data.level) + return data.addr; + else + return NULL; +} +EXPORT_SYMBOL_GPL(return_address); +NOKPROBE_SYMBOL(return_address); -- 2.36.1