From patchwork Wed Dec 5 21:50:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 10714973 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 41CB415A6 for ; Wed, 5 Dec 2018 21:50:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 32B612E6C8 for ; Wed, 5 Dec 2018 21:50:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 308032E6D1; Wed, 5 Dec 2018 21:50:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8C1702E6FB for ; Wed, 5 Dec 2018 21:50:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=olphE3gEY5et9k/z3NqPTba5VXfDBf5PCKB7jmBCQvo=; b=exyOKD+J8rPkTn xk5eAFrJHqJzbkVPtpw/x2cuDdYIImGbaf9qU9R2QseO2EJ0jn0Q3DBuvkAvDxkLY2FMiOqs4BVrY I/GV86sRFb2U2ho5BN0akJo8VRNQnlUitzKh0kuKxxY4TSGki+M8zXD9z7dux9nPRjdLMWUdGl/wz 9+LDQLuLKrmPd26tPFymm/DuSI2d5bmnTImFgVFF0++qMygIG/M53btFE9MjlJREGfSjPf6Bs2T+m 6C1EAPuIZtIVxsmPKUIdw16osW4iZ1lDx1ZAjOEciNBuZcwGZfPUU8IzsetHRTQMGztASEgxvaOsR gAyJ31m7lEE0VzQQlO4A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gUf3l-0002VD-O1; Wed, 05 Dec 2018 21:50:21 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gUf3h-00027S-5j for linux-arm-kernel@lists.infradead.org; Wed, 05 Dec 2018 21:50:19 +0000 Received: from vmware.local.home (unknown [208.91.3.26]) (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 DADA020879; Wed, 5 Dec 2018 21:50:05 +0000 (UTC) Date: Wed, 5 Dec 2018 16:50:03 -0500 From: Steven Rostedt To: Will Deacon Subject: [PATCH 03/14 v2] arm64: function_graph: Remove use of FTRACE_NOTRACE_DEPTH Message-ID: <20181205165003.1b892aee@vmware.local.home> In-Reply-To: <20181127145044.53ddb58a@gandalf.local.home> References: <20181122012708.491151844@goodmis.org> <20181122012803.040221352@goodmis.org> <20181127193149.GJ5641@arm.com> <20181127145044.53ddb58a@gandalf.local.home> X-Mailer: Claws Mail 3.15.1 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181205_135017_231828_8B2734A7 X-CRM114-Status: GOOD ( 12.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Peter Zijlstra , Catalin Marinas , Frederic Weisbecker , linux-kernel@vger.kernel.org, Ingo Molnar , Masami Hiramatsu , Andy Lutomirski , Josh Poimboeuf , Joel Fernandes , Andrew Morton , Thomas Gleixner , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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) --- Changes since v1: A better change log. The patch itself is the same. 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