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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED 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 E9A5DC04EBF for ; Thu, 6 Dec 2018 03:55:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 96D9F2082D for ; Thu, 6 Dec 2018 03:55:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 96D9F2082D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=goodmis.org 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 S1728959AbeLFDz3 (ORCPT ); Wed, 5 Dec 2018 22:55:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:34222 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727940AbeLFDz3 (ORCPT ); Wed, 5 Dec 2018 22:55:29 -0500 Received: from vmware.local.home (unknown [184.48.106.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5292720645; Thu, 6 Dec 2018 03:55:28 +0000 (UTC) Date: Wed, 5 Dec 2018 22:55:26 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton , Namhyung Kim , Masami Hiramatsu , Tom Zanussi , Ravi Bangoria , Catalin Marinas , Will Deacon , 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: <20181205225526.470a6e42@vmware.local.home> In-Reply-To: <20181205234829.164618323@goodmis.org> References: <20181205234749.372720574@goodmis.org> <20181205234829.164618323@goodmis.org> X-Mailer: Claws Mail 3.15.1 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 05 Dec 2018 18:47:54 -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 I haven't pushed this to Linux next yet. I tested the entire tree as well as crossed compiled it against arm64. Can you give me an ack for this patch? Thanks! -- Steve > 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; > - > /* > * This is a case where function graph tracer has > * modified a return address (LR) in a stack frame