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;
MIME-Version: 1.0
References: <20230703092336.268371-1-zegao@tencent.com>
In-Reply-To: <20230703092336.268371-1-zegao@tencent.com>
From:   Yafang Shao <laoar.shao@gmail.com>
Date:   Mon, 3 Jul 2023 21:44:10 +0800
Message-ID: <CALOAHbDrHtBe5LDPUqT2SPtK9P3+a+mDxLYOwQc2ea8T605=2A@mail.gmail.com>
Subject: Re: [PATCH v2] fprobe: add unlock to match a succeeded ftrace_test_recursion_trylock
To:     Ze Gao <zegao2021@gmail.com>
Cc:     Masami Hiramatsu <mhiramat@kernel.org>,
        Steven Rostedt <rostedt@goodmis.org>,
        linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org,
        Ze Gao <zegao@tencent.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Mon, Jul 3, 2023 at 5:23=E2=80=AFPM Ze Gao <zegao2021@gmail.com> wrote:
>
> Unlock ftrace recursion lock when fprobe_kprobe_handler() is failed
> because of some running kprobe.
>
> Fixes: 3cc4e2c5fbae ("fprobe: make fprobe_kprobe_handler recursion free")
> Reported-by: Yafang <laoar.shao@gmail.com>
> Closes: https://lore.kernel.org/linux-trace-kernel/CALOAHbC6UpfFOOibdDiC7=
xFc5YFUgZnk3MZ=3D3Ny6we=3DAcrNbew@mail.gmail.com/
> Signed-off-by: Ze Gao <zegao@tencent.com>

Acked-by: Yafang Shao <laoar.shao@gmail.com>

> ---
>  kernel/trace/fprobe.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/kernel/trace/fprobe.c b/kernel/trace/fprobe.c
> index 18d36842faf5..93b3e361bb97 100644
> --- a/kernel/trace/fprobe.c
> +++ b/kernel/trace/fprobe.c
> @@ -102,12 +102,14 @@ static void fprobe_kprobe_handler(unsigned long ip,=
 unsigned long parent_ip,
>
>         if (unlikely(kprobe_running())) {
>                 fp->nmissed++;
> -               return;
> +               goto recursion_unlock;
>         }
>
>         kprobe_busy_begin();
>         __fprobe_handler(ip, parent_ip, ops, fregs);
>         kprobe_busy_end();
> +
> +recursion_unlock:
>         ftrace_test_recursion_unlock(bit);
>  }
>
> --
> 2.40.1
>


--=20
Regards
Yafang