From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16030C04EB8 for ; Thu, 6 Dec 2018 15:49:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D82B3214C1 for ; Thu, 6 Dec 2018 15:49:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D82B3214C1 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726056AbeLFPtM (ORCPT ); Thu, 6 Dec 2018 10:49:12 -0500 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:53818 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725862AbeLFPtM (ORCPT ); Thu, 6 Dec 2018 10:49:12 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 67B3580D; Thu, 6 Dec 2018 07:49:11 -0800 (PST) Received: from edgewater-inn.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 3692D3F59C; Thu, 6 Dec 2018 07:49:11 -0800 (PST) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id 4B68A1AE0BD1; Thu, 6 Dec 2018 15:49:32 +0000 (GMT) Date: Thu, 6 Dec 2018 15:49:32 +0000 From: Will Deacon To: Steven Rostedt Cc: linux-kernel@vger.kernel.org, Ingo Molnar , Andrew Morton , Namhyung Kim , Masami Hiramatsu , Tom Zanussi , Ravi Bangoria , Catalin Marinas , linux-arm-kernel@lists.infradead.org, "Joel Fernandes (Google)" Subject: Re: [for-next][PATCH 05/30] arm64: function_graph: Remove use of FTRACE_NOTRACE_DEPTH Message-ID: <20181206154931.GA4327@arm.com> References: <20181205234749.372720574@goodmis.org> <20181205234829.164618323@goodmis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181205234829.164618323@goodmis.org> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Dec 05, 2018 at 06:47:54PM -0500, Steven Rostedt wrote: > From: "Steven Rostedt (VMware)" > > Functions in the set_graph_notrace no longer subtract FTRACE_NOTRACE_DEPTH > from curr_ret_stack, as that is now implemented via the trace_recursion > flags. Access to curr_ret_stack no longer needs to worry about checking for > this. curr_ret_stack is still initialized to -1, when there's not a shadow > stack allocated. > > Cc: Catalin Marinas > Cc: Will Deacon > Cc: linux-arm-kernel@lists.infradead.org > Reviewed-by: Joel Fernandes (Google) > Signed-off-by: Steven Rostedt (VMware) > --- > arch/arm64/kernel/stacktrace.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/arch/arm64/kernel/stacktrace.c b/arch/arm64/kernel/stacktrace.c > index 4989f7ea1e59..7723dadf25be 100644 > --- a/arch/arm64/kernel/stacktrace.c > +++ b/arch/arm64/kernel/stacktrace.c > @@ -61,9 +61,6 @@ int notrace unwind_frame(struct task_struct *tsk, struct stackframe *frame) > (frame->pc == (unsigned long)return_to_handler)) { > if (WARN_ON_ONCE(frame->graph == -1)) > return -EINVAL; > - if (frame->graph < -1) > - frame->graph += FTRACE_NOTRACE_DEPTH; > - Acked-by: Will Deacon Will