Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp683362rwr; Fri, 5 May 2023 03:34:00 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4AjKbpEzcDjohM2gCd8+0NBWW3e0+MCpGIf+fIaOWFHBKH3vIyilgRfVmD9A1D2EvXVWa5 X-Received: by 2002:a05:6a20:9385:b0:ef:e240:b564 with SMTP id x5-20020a056a20938500b000efe240b564mr1156540pzh.47.1683282839923; Fri, 05 May 2023 03:33:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683282839; cv=none; d=google.com; s=arc-20160816; b=IqzmQmDX1faIcXHdBag71AB3a0vcVOkWWMFapV4M4sDtxtd2rTtL+VZzfnidwaA1ef 7pbIUL54jEe9zKuFoksWv/NFdZremtr21C3d6fWgiQhHIneK3+knRzDJp+8tvCv/Tuwh 4rs3g47zS8yp4oL3kAClOSX4oYSctD/5JgHreLwmlYxGgLTFPOx2NLDQ33J/rPmqjROC C7IM4ulI5io1YGAUUDeY8FE95G+GAFhmXTjMZJqfExhy3fQOnlSYQplbel4QYHIbhtXV RMUCbk6WxnEqsfYCiIL1Y/2+X5D4oTzRoX/tfVGAhAK5nagz29HliEeBy9NG/Cod8y6i ZOlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:subject :message-id:date:from:in-reply-to:references:mime-version :dkim-signature; bh=9lqJ1GHf+Opi0a9h84jvTQ/hrIPTcNx4tOioIR93HX4=; b=BepRp9Ji83ZeXQ6uddMJ9xcq+ye0L+u1Lr+WEB1BgnEFnWFi8ikStA4FFonnkCiHo0 1pwubrpqK8hG1lzGKVrM8Z4uOq+Hg0sv+k012OAl1jnsj7Mm8ukV9Jiin1Ab4E4A9Qji Qp0e6YVKobaxZFySlrOJ8nnJ4VxP8XRfX7YRodJoP5uDHrDl2yabnhKkSN/bVyfYjdYD 4wtlvcQI3RBMQleHgTWU+KlgJN6bcXFGwr4Ui4ZwiLijUyVIXrjantCKQhxxXhglA2kM KxYZhIGUD5dEjGpPWdLcukenmSe+e5m7kV1GQKy5ALlIZdKwYY9BE+2HWYLME3tZO3Bj udtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FJV0yXgx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x184-20020a6386c1000000b0051367d909efsi1813691pgd.106.2023.05.05.03.33.44; Fri, 05 May 2023 03:33:59 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FJV0yXgx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231365AbjEEKBn (ORCPT + 99 others); Fri, 5 May 2023 06:01:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230358AbjEEKBk (ORCPT ); Fri, 5 May 2023 06:01:40 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0FD851816A for ; Fri, 5 May 2023 03:01:40 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 989A263C33 for ; Fri, 5 May 2023 10:01:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00EDDC4339E for ; Fri, 5 May 2023 10:01:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683280899; bh=Ec2ll/P9tx8U/dBQxy3ZG+nUnHx39GhJcsKwfUcl+ek=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=FJV0yXgxVbxDUT5oHwfpctONYlQwh1inVw1hkoxqIIo7Xh7XU5qLGV96M88uSYps+ 80ePmkd9mKM0Ta/x82WIzmee0PJRCyknqJh9pvhhuX3AqENGJmm6gqOJpp7lpu9IrQ vX39SaZEKkZVfvL2UlYoUS7lLaxnA8G5TAIdNFWvy0Zln0jvRXeVf4MeGZ2AniAZFu XrN89rpEZ97kXZYAENJvyqcDkjq9NVrNmnBiDnhmExLluGn6BjmPp8qchvt9PM8FQt bRDRT0T9y79aB2p/sPFLSXGAnY5XaPKAsLWsX6Fc96a/76QWHKSKic8/DH39VCXcqO aR+f2BdJwb6uA== Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-50be0d835aaso2779489a12.3 for ; Fri, 05 May 2023 03:01:38 -0700 (PDT) X-Gm-Message-State: AC+VfDzHb60Mq+L3byLS6RAjzifkzIeg0l/GqLcv4l9zqFreCahxUIBo 5a0GHa5U/7VOks2CotIol6slSzOSRYkBFaiJ9vY= X-Received: by 2002:a17:907:2687:b0:961:a67:29c with SMTP id bn7-20020a170907268700b009610a67029cmr616582ejc.70.1683280897147; Fri, 05 May 2023 03:01:37 -0700 (PDT) MIME-Version: 1.0 References: <1682214146-3756-1-git-send-email-yangtiezhu@loongson.cn> In-Reply-To: <1682214146-3756-1-git-send-email-yangtiezhu@loongson.cn> From: Guo Ren Date: Fri, 5 May 2023 18:01:25 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH] riscv: uprobes: Restore thread.bad_cause To: Tiezhu Yang Cc: Paul Walmsley , Palmer Dabbelt , Albert Ou , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, loongson-kernel@lists.loongnix.cn Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Thx for fixup. Reviewed-by: Guo Ren On Sun, Apr 23, 2023 at 9:42=E2=80=AFAM Tiezhu Yang wrote: > > thread.bad_cause is saved in arch_uprobe_pre_xol(), it should be restored > in arch_uprobe_{post,abort}_xol() accordingly, otherwise the save operati= on > is meaningless, this change is similar with x86 and powerpc. > > Signed-off-by: Tiezhu Yang > --- > arch/riscv/kernel/probes/uprobes.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/riscv/kernel/probes/uprobes.c b/arch/riscv/kernel/probe= s/uprobes.c > index c976a21..194f166 100644 > --- a/arch/riscv/kernel/probes/uprobes.c > +++ b/arch/riscv/kernel/probes/uprobes.c > @@ -67,6 +67,7 @@ int arch_uprobe_post_xol(struct arch_uprobe *auprobe, s= truct pt_regs *regs) > struct uprobe_task *utask =3D current->utask; > > WARN_ON_ONCE(current->thread.bad_cause !=3D UPROBE_TRAP_NR); > + current->thread.bad_cause =3D utask->autask.saved_cause; > > instruction_pointer_set(regs, utask->vaddr + auprobe->insn_size); > > @@ -102,6 +103,7 @@ void arch_uprobe_abort_xol(struct arch_uprobe *auprob= e, struct pt_regs *regs) > { > struct uprobe_task *utask =3D current->utask; > > + current->thread.bad_cause =3D utask->autask.saved_cause; > /* > * Task has received a fatal signal, so reset back to probbed > * address. > -- > 2.1.0 > --=20 Best Regards Guo Ren