Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: OthRJxWbN2NaEVEJ4Zq6/bd0ctj77ucWi3Rleq4VlT30DcsEx0YMaYVdP4B/xE8yL1vICdn0ed
 /X9UMdwpGnd8VN+Ht2Vxt+WVaWMpmVOun5ZXZp09H9VbITTb4gxfrxQIuwCQBtP8kx2DZzq+rC
 UuW3tbBMtZziwG345TRTmR4fMybzdhSVTodUZPtTVnd3laSjI6fVsC27CNmZJxF/NRbFAgcRtD
 Hf6HBWtaN4Xifu5rUWVpOHDRHS6atnLkdxcrdrsMdEz2xtda9AcrHyCtePoVsvU8rMqt9QRrnG
 u+U=
IronPort-SDR: mjx4IV6Uru6SI19YqzAouKHDbIRGsZ6vL7/a7EepeG2atLz43ARc1jH2d1/9j0lijkir0z0waS
 RaK9LBF2ll6O7rKLKhrD9ejxilwL8oel0=
IronPort-SDR: xVA/OvRNrOCIBdNknR7Np4B7Tvs3ve6yyRRphKpCpJjMAqy+BGHqKT+u8VUC3AUIe5DSUL/KtF
 M6BleKmT80Rw==
WDCIronportException: Internal
Date:   Thu, 4 Jun 2020 02:17:47 +0100 (BST)
From:   "Maciej W. Rozycki" <macro@wdc.com>
To:     WANG Xuerui <kernel@xen0n.name>
cc:     yuanjunqing <yuanjunqing66@163.com>, tsbogend@alpha.franken.de,
        linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org,
        liulichao@loongson.cn, "Maciej W. Rozycki" <macro@linux-mips.org>
Subject: Re: [PATCH] function:stacktrace/mips: Fix function:stacktrace for
 mips
In-Reply-To: <43f35844-f78a-74a2-0e3d-184c3567d74f@xen0n.name>
Message-ID: <alpine.LFD.2.21.2006040212460.9519@redsun52.ssa.fujisawa.hgst.com>
References: <20200528123640.4285-1-yuanjunqing66@163.com> <11c90f15-0a25-e628-c8db-53343c351085@163.com> <43f35844-f78a-74a2-0e3d-184c3567d74f@xen0n.name>
User-Agent: Alpine 2.21 (LFD 202 2017-01-01)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Fri, 29 May 2020, WANG Xuerui wrote:

> On 2020/5/29 17:29, yuanjunqing wrote:
> 
> >> diff --git a/arch/mips/kernel/mcount.S b/arch/mips/kernel/mcount.S
> >> index cff52b283e03..cd5545764e5f 100644
> >> --- a/arch/mips/kernel/mcount.S
> >> +++ b/arch/mips/kernel/mcount.S
> >> @@ -87,8 +87,15 @@ EXPORT_SYMBOL(_mcount)
> >>   	PTR_LA   t1, _etext
> >>   	sltu     t3, t1, a0	/* t3 = (a0 > _etext) */
> >>   	or       t1, t2, t3
> >> +	PTR_LA	 t2, stlab-4 	/* t2: "function:stacktrace" return address */
> >> +	move	 a1, AT		/* arg2: parent's return address */
> >>   	beqz     t1, ftrace_call
> >> -	 nop
> >> +	 nop			/* "function:stacktrace" return address */
> >> +stlab:
> >> +	PTR_LA	t2, stlab-4
> >> +	/* ftrace_call_end: ftrace_call return address */
> >> +	beq	t2,ra, ftrace_call_end
> >> +	nop

 Broken delay slot indentation.

> >>   #if defined(KBUILD_MCOUNT_RA_ADDRESS) && defined(CONFIG_32BIT)
> >>   	PTR_SUBU a0, a0, 16	/* arg1: adjust to module's recorded callsite */
> >>   #else
> >> @@ -98,7 +105,9 @@ EXPORT_SYMBOL(_mcount)
> >>   	.globl ftrace_call
> >>   ftrace_call:
> >>   	nop	/* a placeholder for the call to a real tracing function */
> >> -	 move	a1, AT		/* arg2: parent's return address */
> >> +	move	ra, t2		/* t2: "function:stacktrace" return address */

 Likewise.  NB I haven't investigated if the change makes sense.  A more 
detailed explanation in the change description is certainly needed.

  Maciej