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;
From:   He Zhe <zhe.he@windriver.com>
To:     catalin.marinas@arm.com, will@kernel.org, mark.rutland@arm.com,
        tglx@linutronix.de, bp@alien8.de, dave.hansen@linux.intel.com,
        keescook@chromium.org, alexander.shishkin@linux.intel.com,
        jolsa@kernel.org, namhyung@kernel.org, benh@kernel.crashing.org,
        paulus@samba.org, borntraeger@linux.ibm.com, svens@linux.ibm.com,
        hpa@zytor.com
Cc:     x86@kernel.org, linux-arm-kernel@lists.infradead.org,
        linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org,
        linux-s390@vger.kernel.org, linux-perf-users@vger.kernel.org,
        linux-kernel@vger.kernel.org, zhe.he@windriver.com
Subject: [PATCH RFC 3/8] arm64: stacktrace: Make callbacks use new prototype with frame info
Date:   Mon, 18 Apr 2022 21:22:12 +0800
Message-Id: <20220418132217.1573072-4-zhe.he@windriver.com>
In-Reply-To: <20220418132217.1573072-1-zhe.he@windriver.com>
References: <20220418132217.1573072-1-zhe.he@windriver.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ibstF8u78mMOLkjC+DkMbtk6BeGVIf2sN4/j11j5t9C07J8ntkXQNdwmng22?=
 =?us-ascii?Q?9DnBAV5IWnDMfoqQkSSEC8uHaK/9kJjR0tpGrP8aViDjMsAbrmPOMTc59anO?=
 =?us-ascii?Q?O1jS0NBNpwilMQZIUJCdJyWzT5htH/81jkty/zBVwDMz1V3GrIayD3QWCiO+?=
 =?us-ascii?Q?X9gFBhdeFi2UbH5GGfm3YJsLaw5BdePN9XhVOqZXo+hvQkq2WY0Zll3JHXqR?=
 =?us-ascii?Q?LCWWk3Sr/XMZMMoYEd+nprSvmVuMfr1R6BIxinMvkMcgpFcSq1/FiEfkMMU0?=
 =?us-ascii?Q?37EmsZbG3gdG2DS3rqJ2RmTBi2zRJFWsCCw/TyDBu1wdNyswPRen6A6jbUsU?=
 =?us-ascii?Q?7WDXIyDGL4XHDB1lhzmc/dcJfC5zhQShHRNrEGd6v1xtpeAB3qtAHBA7/Yug?=
 =?us-ascii?Q?EHBYvRc1tps18LV6TopqTtVI6juRv1TvXTA2mmwHPUrAtVi3nyVpL5GLcb0u?=
 =?us-ascii?Q?FoqJzHZvJAW/REZAxx/eYTqE/jQI7oi7L5GMSp7Ij3GoSw5dNSTWPg0bzRCJ?=
 =?us-ascii?Q?6s6QRGQeBgrwTYnMT+7UEFuR1vW9LY9bIjLCfdD5fj/Zjc2T/dJ7qCBJX/dT?=
 =?us-ascii?Q?D5oyULXCjLjFLkB2cYCj3G0mbINKet13c5ma9g7c4b5lSGOZ/mE4SX4FxiWP?=
 =?us-ascii?Q?MxMc86P35lVanGri/LDnPgcfgxOIbDEmRpaRMlnFpldxnybIXbkrqpFelOt8?=
 =?us-ascii?Q?c8sqzvxmZrCWw2MIg429izz2Bv1mEfIxQGSrpxwHLd+dR0P14dFs+k/R0EiR?=
 =?us-ascii?Q?XSrD0wbYewpQYwwvtwQf2RcQp/0so3cMl3ye/PDUVG1qYqYWJ5lSuJHt6ldg?=
 =?us-ascii?Q?HsnGvgV6fv+5yt8LVTTn86IAZlBywbbtY3ZSQowdEJyjuU5fNWEoErmTYCTM?=
 =?us-ascii?Q?AS4ZJhUFfIJ7BbuL5Duj3Mq6TUz3knsWd8qcH7HhAoRq8XWT1NWT/aTHwE5M?=
 =?us-ascii?Q?xEWK1aNeC9wAhplvRJsgTQc/pDE31oGPw0XEC44J7njhreTU4+K0HYdny9P7?=
 =?us-ascii?Q?xylx2haCRAIWkVOKM0alzjKhevlBTwOBhtxIye9DDgZqog6QWv+rm+w9BX79?=
 =?us-ascii?Q?e3baZJgF0C2qAL7PYrF3n0gNO3IMaNlGqAwGFLY2nOdiki21KZ96EoDoXQt3?=
 =?us-ascii?Q?eAlJuUUVbackzHrKtXeHr05r1iaF1hq6j2vKCg31Hd4rVH4WTPnRJ7WqxkBS?=
 =?us-ascii?Q?YWb+VeqUrr7kVGMGpFqah9EKx39RBKifffkuqPzNpe+9q7Xq0hR3HkX4U+Lm?=
 =?us-ascii?Q?JpI+y98o+6BQm1n+l6iZ/RtTGDlfaCSviEAmMvsrXtqbEBBBLtvF5gIHCvtA?=
 =?us-ascii?Q?Jl2ESLO2JfZcR681l7poou7w4xN/YAqMkobb9zL+vt59CBp8t1PLpRnXLN3E?=
 =?us-ascii?Q?ZqPkGuEcnqF0STt6DvO03XNKE4wPPM74/LgVy7dZWtc0N6yJoHgpzDEtz6A9?=
 =?us-ascii?Q?WaOzSsmxAFDdwhFQJ2wCHjmJcuza2h1E0W8fmulWWUAuGfMl9oL3uH56N4S+?=
 =?us-ascii?Q?9Hlq2rxsWvvbdRzg50ejLz4cyhhrxP5zQLr4QrjqvrgUaMVVkacisxAYrwCv?=
 =?us-ascii?Q?sYn5yEdrZqjIcXSO0jEyVTnWIraqy3q67sSlah6U1Wq/msR7ATZ+wWzm5Ui1?=
 =?us-ascii?Q?sfe0FD1BTU4bmsNV1hwqWC0rzYaAmnxPoIpS6z+8SJYQy3yzWR8Vb27DfN8E?=
 =?us-ascii?Q?qdrO6Dqf5iS4C1Jj20p96av7PKf/+qYdsyxZ5pPqhkf07UQnObvpriXv3KF3?=
 =?us-ascii?Q?QGlZtV2vwA=3D=3D?=
X-OriginatorOrg: windriver.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d60d8851-3b6b-4b3d-a9a4-08da213e89e7
X-MS-Exchange-CrossTenant-AuthSource: MWHPR11MB1358.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2022 13:22:51.2789
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 5AM5bRFD8rqvRXLZ7tVS2yBZbLqXJMSQywW/01BsmIw3f7qLzsRtbDgsYtppCpm+bTtovIYSWNYU7gazJIHSVA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB2857
X-Proofpoint-ORIG-GUID: A3MrDu8cp4c8-4S824gXgQ6jMmsr-U6w
X-Proofpoint-GUID: A3MrDu8cp4c8-4S824gXgQ6jMmsr-U6w
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 suspectscore=0
 priorityscore=1501 lowpriorityscore=0 mlxlogscore=795 mlxscore=0
 adultscore=0 clxscore=1015 spamscore=0 bulkscore=0 malwarescore=0
 impostorscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx
 scancount=1 engine=8.12.0-2202240000 definitions=main-2204180078
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

stack_trace_consume_fn has been changed to
bool (*stack_trace_consume_fn)(void *cookie, struct frame_info *fi);
to be able to pass more information.

Turn to use pc in struct frame_info in arch_stack_walk callbacks without
functinoal change.

Signed-off-by: He Zhe <zhe.he@windriver.com>
---
 arch/arm64/kernel/perf_callchain.c | 4 ++--
 arch/arm64/kernel/process.c        | 6 +++---
 arch/arm64/kernel/return_address.c | 4 ++--
 arch/arm64/kernel/time.c           | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/arm64/kernel/perf_callchain.c b/arch/arm64/kernel/perf_callchain.c
index 65b196e3ca6c..d32918b34c0c 100644
--- a/arch/arm64/kernel/perf_callchain.c
+++ b/arch/arm64/kernel/perf_callchain.c
@@ -132,10 +132,10 @@ void perf_callchain_user(struct perf_callchain_entry_ctx *entry,
 	}
 }
 
-static bool callchain_trace(void *data, unsigned long pc)
+static bool callchain_trace(void *data, struct frame_info *fi)
 {
 	struct perf_callchain_entry_ctx *entry = data;
-	return perf_callchain_store(entry, pc) == 0;
+	return perf_callchain_store(entry, fi->pc) == 0;
 }
 
 void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry,
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index 7fa97df55e3a..e96a8a614a1a 100644
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -527,12 +527,12 @@ struct wchan_info {
 	int		count;
 };
 
-static bool get_wchan_cb(void *arg, unsigned long pc)
+static bool get_wchan_cb(void *arg, struct frame_info *fi)
 {
 	struct wchan_info *wchan_info = arg;
 
-	if (!in_sched_functions(pc)) {
-		wchan_info->pc = pc;
+	if (!in_sched_functions(fi->pc)) {
+		wchan_info->pc = fi->pc;
 		return false;
 	}
 	return wchan_info->count++ < 16;
diff --git a/arch/arm64/kernel/return_address.c b/arch/arm64/kernel/return_address.c
index 68330017d04f..ec9be91623c4 100644
--- a/arch/arm64/kernel/return_address.c
+++ b/arch/arm64/kernel/return_address.c
@@ -18,12 +18,12 @@ struct return_address_data {
 	void *addr;
 };
 
-static bool save_return_addr(void *d, unsigned long pc)
+static bool save_return_addr(void *d, struct frame_info *fi)
 {
 	struct return_address_data *data = d;
 
 	if (!data->level) {
-		data->addr = (void *)pc;
+		data->addr = (void *)fi->pc;
 		return false;
 	} else {
 		--data->level;
diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c
index b5855eb7435d..6b1a9de7c852 100644
--- a/arch/arm64/kernel/time.c
+++ b/arch/arm64/kernel/time.c
@@ -32,13 +32,13 @@
 #include <asm/thread_info.h>
 #include <asm/paravirt.h>
 
-static bool profile_pc_cb(void *arg, unsigned long pc)
+static bool profile_pc_cb(void *arg, struct frame_info *fi)
 {
 	unsigned long *prof_pc = arg;
 
-	if (in_lock_functions(pc))
+	if (in_lock_functions(fi->pc))
 		return true;
-	*prof_pc = pc;
+	*prof_pc = fi->pc;
 	return false;
 }
 
-- 
2.25.1