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 7/8] x86: stacktrace: Make callbacks use new prototype with frame info
Date:   Mon, 18 Apr 2022 21:22:16 +0800
Message-Id: <20220418132217.1573072-8-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?Z6bkF825XZRbVG8kepe279GOl41l0xkH9o5ZKj5nZ/GZjrm+t18RnKCmweKR?=
 =?us-ascii?Q?vLnTmswTQYVj76PhJnjm0QrD1Uaf3JCHkGODcPPL1Ek9xrTl+LxNeRPqthJc?=
 =?us-ascii?Q?yHsLkPZVk4Fwhl8NMWeboQr4zHAgChH4rWpAA3GSesg9yTY9iwwhlytsvHFy?=
 =?us-ascii?Q?73GW8WGXOthKp1HRV0Uy96v65uBnJM8UgZgF1OKk18O7sgoBTBH2uBnjEuuJ?=
 =?us-ascii?Q?ygA9LX/g/4BCcSGkBdYfyWU1D4ZGRetpgz6ZSBDg6uXotOmivNpoJMMRFaEl?=
 =?us-ascii?Q?2MPTWbRcJGCYRE6Y5r5dvTj0Fu7N6axaCq0dpKfI5SxvZ1BWlszvlOf0VoBO?=
 =?us-ascii?Q?L+KZYLv5XQc3Bn8q0slCpSCewZfO6rMKWUYsHvUWNkJo1mcWP5J+JGohyzbs?=
 =?us-ascii?Q?yYL4/CE4erSCWyUNtRhGsHxgNC7okTfTcfmHQsa6f4/QTeHCZMK+lZ2ZroGl?=
 =?us-ascii?Q?G8DfOH6/jUzwSlahBp7LSymhRPiwIfKI3eVoY/AEeCATeIGA4A46GvImOAjQ?=
 =?us-ascii?Q?DqIdK7l5ZdyAr/pikJgQLD8a5lgmwvqUfw6E+lTJVr/ebQatljqVjrVL9R8A?=
 =?us-ascii?Q?D5kpDJe3ZhI42HyKUx1zdnTBSfzDqCKO9idMFlw5cpL2caiMWJeYgXYuLQl9?=
 =?us-ascii?Q?zm3nCXkt2WjRpO6OgHlzm9oen0TgcGVqiJCixGP7KMq/xv7KnUf3v4CzOJcN?=
 =?us-ascii?Q?0s2Rtuj1K6F/oZajy17qG0tTo9C1406AU8vAw7PpSHnSt8YNvT25/ssRBr13?=
 =?us-ascii?Q?k/1o12ZzY0s5RGbl6c7uCvCRxClYQJ+LlsRwzNOu0jEvpaJXdoZZGnqSnsec?=
 =?us-ascii?Q?jT4WB9JF7zxWXNwMVumjFHVF64LVvqs9toqWp/rXCa1x/fwJ0X0iaTBYQsp3?=
 =?us-ascii?Q?KoK5N+PEFYPWvnetKACDx304hsS++/0YXWTb5kmpQdIsxvnniXiSClXZhvr3?=
 =?us-ascii?Q?y5MjjSa4WNSU7CLjlx1vdvItsSclNp2Uxml9inzd+GkP10b/jMStwED+m3GB?=
 =?us-ascii?Q?+tGj43STRL8OnD5gXeE9MuZZe9Yd+koklvfLmH8QLN1/6SKiEx4BbDO8Fu7t?=
 =?us-ascii?Q?RJU62c+39MKGP21q/J5JYZA2L60iM8S15C9NJZRlm6bOXcIOSZes0plShneJ?=
 =?us-ascii?Q?/0JYO0xRhzn4oNVsoaFJ98+4PLki7tThMtPviKgTdCfIzfhx/uvDgkc8ZOrE?=
 =?us-ascii?Q?7umV84tnP9y7XfI4oxM0XBg9YcY5Ez3OD1ArEe6Zw8leWYfCH2NVI1YksfjY?=
 =?us-ascii?Q?odgpFu70xQmkGoDxpgtTt8yD2/OnzqqTfF6+OyZB5RlHw/PiIVyRReKlsbd1?=
 =?us-ascii?Q?fRqrmW3FXClHllL1biLdahR7fWCKwB9MGew4Rvmmq5oUeglCEciK+jtDtOjO?=
 =?us-ascii?Q?cCuGMGvkKdCOzvE9FpL4HOTJsUMB1JUhYmuu1Ut/3/EJvtN9dpGdJAWUC4Yz?=
 =?us-ascii?Q?OuJ9Nk38kVORPokmHqnL2CvtwEPhZoFmIKXNj3TyY8SpeOKLzS02QQJF/Ogf?=
 =?us-ascii?Q?bzuANk1qm7fsHqqA83tcQ4s1XdgGGxzPXhndXzSOh7BENmxcJTm34fXIGPPw?=
 =?us-ascii?Q?IWF3h4N2mNDpzjMMDKJUaPB6JmrGOpM0g4l/FqUewzbfQgvu7qU9h/OZME1a?=
 =?us-ascii?Q?8sfrwY4lRkP2FSsYlLIv0BOlE+OGocjGphOpWdtKLtpCOYvEfASBsp187KpY?=
 =?us-ascii?Q?nX751dIykeh5eHuzgBeam1TsIAEGP7xEYixGs/GxYrx1XY4R75nngnQOwT+Q?=
 =?us-ascii?Q?46IoXf2qMQ=3D=3D?=
X-OriginatorOrg: windriver.com
X-MS-Exchange-CrossTenant-Network-Message-Id: eaefada3-48a3-4032-b805-08da213e961a
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:23:11.7618
 (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: QHl/7ZXaMtJW3Ru3c5CDGsxc5u3mlO4FUaPoSsJ6xxxAcUrTXBQKPf9om8+ghL6xmvzqTRPjI5Sk1zWMJgZXxg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1473
X-Proofpoint-ORIG-GUID: gq7Q_ToLEqTuYqJWrR4GtxPdVbJYAin0
X-Proofpoint-GUID: gq7Q_ToLEqTuYqJWrR4GtxPdVbJYAin0
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
 mlxlogscore=559 phishscore=0 lowpriorityscore=0 spamscore=0 suspectscore=0
 priorityscore=1501 malwarescore=0 adultscore=0 impostorscore=0 bulkscore=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/x86/kernel/stacktrace.c | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/arch/x86/kernel/stacktrace.c b/arch/x86/kernel/stacktrace.c
index ee117fcf46ed..c88bfbb5f157 100644
--- a/arch/x86/kernel/stacktrace.c
+++ b/arch/x86/kernel/stacktrace.c
@@ -16,15 +16,18 @@ void arch_stack_walk(stack_trace_consume_fn consume_entry, void *cookie,
 		     struct task_struct *task, struct pt_regs *regs)
 {
 	struct unwind_state state;
-	unsigned long addr;
+	struct frame_info fi;
 
-	if (regs && !consume_entry(cookie, regs->ip))
-		return;
+	if (regs) {
+		fi.pc = regs->ip;
+		if (!consume_entry(cookie, &fi))
+			return;
+	}
 
 	for (unwind_start(&state, task, regs, NULL); !unwind_done(&state);
 	     unwind_next_frame(&state)) {
-		addr = unwind_get_return_address(&state);
-		if (!addr || !consume_entry(cookie, addr))
+		fi.pc = unwind_get_return_address(&state);
+		if (!fi.pc || !consume_entry(cookie, &fi))
 			break;
 	}
 }
@@ -34,7 +37,7 @@ int arch_stack_walk_reliable(stack_trace_consume_fn consume_entry,
 {
 	struct unwind_state state;
 	struct pt_regs *regs;
-	unsigned long addr;
+	struct frame_info fi;
 
 	for (unwind_start(&state, task, NULL, NULL);
 	     !unwind_done(&state) && !unwind_error(&state);
@@ -56,17 +59,17 @@ int arch_stack_walk_reliable(stack_trace_consume_fn consume_entry,
 				return -EINVAL;
 		}
 
-		addr = unwind_get_return_address(&state);
+		fi.pc = unwind_get_return_address(&state);
 
 		/*
 		 * A NULL or invalid return address probably means there's some
 		 * generated code which __kernel_text_address() doesn't know
 		 * about.
 		 */
-		if (!addr)
+		if (!fi.pc)
 			return -EINVAL;
 
-		if (!consume_entry(cookie, addr))
+		if (!consume_entry(cookie, &fi))
 			return -EINVAL;
 	}
 
@@ -107,8 +110,10 @@ void arch_stack_walk_user(stack_trace_consume_fn consume_entry, void *cookie,
 			  const struct pt_regs *regs)
 {
 	const void __user *fp = (const void __user *)regs->bp;
+	struct frame_info fi;
 
-	if (!consume_entry(cookie, regs->ip))
+	fi.pc = regs->ip;
+	if (!consume_entry(cookie, &fi))
 		return;
 
 	while (1) {
@@ -122,7 +127,8 @@ void arch_stack_walk_user(stack_trace_consume_fn consume_entry, void *cookie,
 			break;
 		if (!frame.ret_addr)
 			break;
-		if (!consume_entry(cookie, frame.ret_addr))
+		fi.pc = frame.ret_addr;
+		if (!consume_entry(cookie, &fi))
 			break;
 		fp = frame.next_fp;
 	}
-- 
2.25.1