Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 24 Apr 2023 17:28:15 +0200
From:   Oleg Nesterov <oleg@redhat.com>
To:     Tiezhu Yang <yangtiezhu@loongson.cn>
Cc:     Guo Ren <guoren@kernel.org>, linux-csky@vger.kernel.org,
        linux-kernel@vger.kernel.org, loongson-kernel@lists.loongnix.cn,
        Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Subject: Re: [PATCH] csky: uprobes: Restore thread.trap_no
Message-ID: <20230424152815.GA32615@redhat.com>
References: <1682213987-3708-1-git-send-email-yangtiezhu@loongson.cn>
 <cdacf9d8-cf59-bf4e-5379-0b5bfc03a4e2@loongson.cn>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <cdacf9d8-cf59-bf4e-5379-0b5bfc03a4e2@loongson.cn>
User-Agent: Mutt/1.5.24 (2015-08-30)
Precedence: bulk

On 04/24, Tiezhu Yang wrote:
>
> >--- a/arch/csky/kernel/probes/uprobes.c
> >+++ b/arch/csky/kernel/probes/uprobes.c
> >@@ -64,6 +64,7 @@ int arch_uprobe_post_xol(struct arch_uprobe *auprobe, struct pt_regs *regs)
> > 	struct uprobe_task *utask = current->utask;
> >
> > 	WARN_ON_ONCE(current->thread.trap_no != UPROBE_TRAP_NR);
> >+	current->thread.trap_no = utask->autask.saved_trap_no;
> >
> > 	instruction_pointer_set(regs, utask->vaddr + auprobe->insn_size);
> >
> >@@ -101,6 +102,7 @@ void arch_uprobe_abort_xol(struct arch_uprobe *auprobe, struct pt_regs *regs)
> > {
> > 	struct uprobe_task *utask = current->utask;
> >
> >+	current->thread.trap_no = utask->autask.saved_trap_no;
> > 	/*
> > 	 * Task has received a fatal signal, so reset back to probed
> > 	 * address.

Acked-by: Oleg Nesterov <oleg@redhat.com>