From patchwork Wed Nov 9 06:49:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Ren X-Patchwork-Id: 17355 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp182721wru; Tue, 8 Nov 2022 22:51:56 -0800 (PST) X-Google-Smtp-Source: AMsMyM7fjPKma+IdDLKGphPABl880nX2LGPjRJ8QtNQdu9hotvl2OvHFM/6CgMNVYVuw5jwxAcbN X-Received: by 2002:a63:187:0:b0:43b:cf3c:c64d with SMTP id 129-20020a630187000000b0043bcf3cc64dmr50805610pgb.359.1667976716177; Tue, 08 Nov 2022 22:51:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667976716; cv=none; d=google.com; s=arc-20160816; b=q7WapAUfwA5dybPPsa5SQjiMMwbpturoGfUbXVKQQKITQJvoqyF2e0ueNNOzF2mM67 JXhH5EFfKgrIyqt9vTkgIhOihky6yNHhfVmMqRBNQjQveUkDEdVeawDxPgn20z+4TgDg siOs530Vue0Vi4hENMTnbznIvQjLmmmXZdPIm0E7tYGRrqBlSHdOurYbtsEP9ONs9GTs NZ6oQg9kPgRQJTsH44T0icFP6Dzb5d8ymrAZ0lJwiGvN/78tKzjl31VSwdG4Lt0/G9zl Kz6FJ5WKFvyRjRJrXyfzUja+VU77NKYjQ2E3bjEiq1qVGEglLrOzHoKM6REvBvzCwt/W X1dw== 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 :dkim-signature; bh=L9xnxKTIHrSl7NTj/eitGl8c6TEi315k5a0dcadRiqw=; b=d/c3jEoTr2asHF8TNWUe57kLwcIuPC4e03xElZ9XFjMNU2oMBrWhS9jxWAsGX9ZZ+3 tEBZyMi6plnNHY+TpJ6Y3Vjs3wp4vkwdCQp1XnFTJCoPYFnZPZePrdZSSDy2GxGVdXx2 IVF2ACrcJuQDhie2VcAW957HYglHpla74O62K9lu+xkyeyWtqLHwk9WEsHYuGTae6cS7 9ThlQ59gHAsC6roJSlptM6tqzw204AeGo27vjJcUmt/2v3ec6TFfjV/Xp9Yq1C2ojovB ZiIQNX5pBWnr4vubLdgGZCfw6IySlEs9CdUc1eRaTO+oWPP9S6yIenOG4RYTMIJtReLs jFOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TeF4Rhte; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n12-20020a170902d2cc00b001868277386dsi19954855plc.192.2022.11.08.22.51.43; Tue, 08 Nov 2022 22:51:56 -0800 (PST) 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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TeF4Rhte; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229731AbiKIGuG (ORCPT + 99 others); Wed, 9 Nov 2022 01:50:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229715AbiKIGuD (ORCPT ); Wed, 9 Nov 2022 01:50:03 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DD6717590; Tue, 8 Nov 2022 22:50:02 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id F10D9618CA; Wed, 9 Nov 2022 06:50:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A875C43470; Wed, 9 Nov 2022 06:49:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1667976601; bh=DwVEaVj4L6g3T9BDJpJF+Y6rdkgMq0eaBMuAtX/lkSY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TeF4RhteKOWuXuKRiJsMMup1NYGJlKSOB0M8riRuaSJ9l1KjDZexIIra2gr/DeioW GveugXwtOp3eOgr7ELI9Jc9G5moMoT+lxavZb9T8sWa2OVnUF4o2oY6IJQTrS44yF9 REsxjvMBCeR+uE7W376P2ZdV4oPA3QmzQD9bIEbsM6WRHwSRjxjHt0TK9c3RYzEO+D /CZGS2NRO+SymjGNQQa4fhJ2bvzxpGc8EzZCaEl8h78oHyNw035IpqefXPX+SDSFg8 FJvjvPA+scgY++BQiHeEWG+U9i2K33uHnrQcgIFVx9AEZWtDlmAkS7Uy5sFzxj38qP 24Le0jfL2r1sA== From: guoren@kernel.org To: anup@brainfault.org, paul.walmsley@sifive.com, palmer@dabbelt.com, conor.dooley@microchip.com, heiko@sntech.de, peterz@infradead.org, arnd@arndb.de, linux-arch@vger.kernel.org, keescook@chromium.org, paulmck@kernel.org, frederic@kernel.org, nsaenzju@redhat.com, changbin.du@intel.com, vincent.chen@sifive.com Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Guo Ren , Guo Ren , Alan Kao , Palmer Dabbelt Subject: [PATCH 1/2] riscv: stacktrace: Fixup ftrace_graph_ret_addr retp argument Date: Wed, 9 Nov 2022 01:49:36 -0500 Message-Id: <20221109064937.3643993-2-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221109064937.3643993-1-guoren@kernel.org> References: <20221109064937.3643993-1-guoren@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749000353158296262?= X-GMAIL-MSGID: =?utf-8?q?1749000353158296262?= From: Guo Ren The 'retp' is a pointer to the return address on the stack, so we must pass the current return address pointer as the 'retp' argument to ftrace_push_return_trace(). Not parent function's return address on the stack. Fixes: b785ec129bd9 ("riscv/ftrace: Add HAVE_FUNCTION_GRAPH_RET_ADDR_PTR support") Signed-off-by: Guo Ren Signed-off-by: Guo Ren Cc: Alan Kao Cc: Palmer Dabbelt --- arch/riscv/kernel/stacktrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/kernel/stacktrace.c b/arch/riscv/kernel/stacktrace.c index 08d11a53f39e..bcfe9eb55f80 100644 --- a/arch/riscv/kernel/stacktrace.c +++ b/arch/riscv/kernel/stacktrace.c @@ -58,7 +58,7 @@ void notrace walk_stackframe(struct task_struct *task, struct pt_regs *regs, } else { fp = frame->fp; pc = ftrace_graph_ret_addr(current, NULL, frame->ra, - (unsigned long *)(fp - 8)); + &frame->ra); } }