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.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,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 9BE9DC43613 for ; Fri, 21 Jun 2019 15:51:10 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6FAE620673 for ; Fri, 21 Jun 2019 15:51:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="kknnoekK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6FAE620673 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-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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:In-Reply-To:MIME-Version:References: 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=JFtHPLNUkguZ1uORjx5rbncUlxVL7j8s15tQlqo2SjE=; b=kknnoekKQzeZ1A Jc38rcKBwRn2HhoeCHvv49rM+6+EvZ9xXZEWYSSFfpN6tuWRS+r1jEgxsfMXwxbHorDXjo6ATwuQO Si2kavmpZ0U/ltVioxf5TMptNw8q/DWr1L78CRoFatbrnVGrVi2FnS8TYiegLvjE5mMnG5SsXBQ6m V4ahklBH7oCKfV0PeufLY4VgYmn7GKvDNw9YD8nK2XuNTs/0m0TDLGT7rpwn9Gfgw2nPDnl6DyF0y T8zJfPTs7SLtsLuDgFlIORsnFrQlDYKLVGWi5fu8Dy+HRAs+BPuxoETkYwVm66gPYnHT/PCn0jNxG ZPEJo2rCdjNkFZNeXWZA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1heLoc-0002kU-IV; Fri, 21 Jun 2019 15:51:02 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1heLoR-0002Z0-S3 for linux-arm-kernel@lists.infradead.org; Fri, 21 Jun 2019 15:50:53 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 47F1E344; Fri, 21 Jun 2019 08:50:51 -0700 (PDT) Received: from e103592.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5FB123F575; Fri, 21 Jun 2019 08:50:50 -0700 (PDT) Date: Fri, 21 Jun 2019 16:50:48 +0100 From: Dave Martin To: Mark Rutland Subject: Re: [PATCH 2/3] arm64: stacktrace: Factor out backtrace initialisation Message-ID: <20190621155047.GE2790@e103592.cambridge.arm.com> References: <20190606125402.10229-1-mark.rutland@arm.com> <20190606125402.10229-3-mark.rutland@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190606125402.10229-3-mark.rutland@arm.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190621_085052_080030_B02AAB95 X-CRM114-Status: GOOD ( 20.24 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: catalin.marinas@arm.com, tengfeif@codeaurora.org, will.deacon@arm.com, james.morse@arm.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Jun 06, 2019 at 01:54:01PM +0100, Mark Rutland wrote: > From: Dave Martin > > Some common code is required by each stacktrace user to initialise > struct stackframe before the first call to unwind_frame(). > > In preparation for adding to the common code, this patch factors it > out into a separate function start_backtrace(), and modifies the > stacktrace callers appropriately. > > No functional change. > > Signed-off-by: Dave Martin > Signed-off-by: Mark Rutland Ack (from memory you just added the CONFIG_FUNCTION_GRAPH_TRACER stuff, the lack of which was causing build failures in my original version). Have you added any new calls to start_backtrace() here? Cheers ---Dave > --- > arch/arm64/include/asm/stacktrace.h | 10 ++++++++++ > arch/arm64/kernel/process.c | 6 +----- > arch/arm64/kernel/time.c | 6 +----- > arch/arm64/kernel/traps.c | 13 ++++++------- > 4 files changed, 18 insertions(+), 17 deletions(-) > > diff --git a/arch/arm64/include/asm/stacktrace.h b/arch/arm64/include/asm/stacktrace.h > index 4dd569592e65..18f90bf1385c 100644 > --- a/arch/arm64/include/asm/stacktrace.h > +++ b/arch/arm64/include/asm/stacktrace.h > @@ -142,4 +142,14 @@ static inline bool on_accessible_stack(const struct task_struct *tsk, > return false; > } > > +static inline void start_backtrace(struct stackframe *frame, > + unsigned long fp, unsigned long pc) > +{ > + frame->fp = fp; > + frame->pc = pc; > +#ifdef CONFIG_FUNCTION_GRAPH_TRACER > + frame->graph = 0; > +#endif > +} > + > #endif /* __ASM_STACKTRACE_H */ > diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c > index 3767fb21a5b8..122d88fccd13 100644 > --- a/arch/arm64/kernel/process.c > +++ b/arch/arm64/kernel/process.c > @@ -509,11 +509,7 @@ unsigned long get_wchan(struct task_struct *p) > if (!stack_page) > return 0; > > - frame.fp = thread_saved_fp(p); > - frame.pc = thread_saved_pc(p); > -#ifdef CONFIG_FUNCTION_GRAPH_TRACER > - frame.graph = 0; > -#endif > + start_backtrace(&frame, thread_saved_fp(p), thread_saved_pc(p)); > do { > if (unwind_frame(p, &frame)) > goto out; > diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c > index a777ae90044d..aa3489f3a452 100644 > --- a/arch/arm64/kernel/time.c > +++ b/arch/arm64/kernel/time.c > @@ -49,11 +49,7 @@ unsigned long profile_pc(struct pt_regs *regs) > if (!in_lock_functions(regs->pc)) > return regs->pc; > > - frame.fp = regs->regs[29]; > - frame.pc = regs->pc; > -#ifdef CONFIG_FUNCTION_GRAPH_TRACER > - frame.graph = 0; > -#endif > + start_backtrace(&frame, regs->regs[29], regs->pc); > do { > int ret = unwind_frame(NULL, &frame); > if (ret < 0) > diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c > index ade32046f3fe..8053bbed8776 100644 > --- a/arch/arm64/kernel/traps.c > +++ b/arch/arm64/kernel/traps.c > @@ -119,18 +119,17 @@ void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk) > return; > > if (tsk == current) { > - frame.fp = (unsigned long)__builtin_frame_address(0); > - frame.pc = (unsigned long)dump_backtrace; > + start_backtrace(&frame, > + (unsigned long)__builtin_frame_address(0), > + (unsigned long)dump_backtrace); > } else { > /* > * task blocked in __switch_to > */ > - frame.fp = thread_saved_fp(tsk); > - frame.pc = thread_saved_pc(tsk); > + start_backtrace(&frame, > + thread_saved_fp(tsk), > + thread_saved_pc(tsk)); > } > -#ifdef CONFIG_FUNCTION_GRAPH_TRACER > - frame.graph = 0; > -#endif > > printk("Call trace:\n"); > do { > -- > 2.11.0 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel