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: <20230703071640.106204-1-zegao@tencent.com> <20230703171905.ef83b1a7f4db82012db471fc@kernel.org>
In-Reply-To: <20230703171905.ef83b1a7f4db82012db471fc@kernel.org>
From:   Ze Gao <zegao2021@gmail.com>
Date:   Mon, 3 Jul 2023 17:26:45 +0800
Message-ID: <CAD8CoPBRQ1cU1+DngGd5wyvAxZgk78zmfMUM9WeuUZ2S-UHdYw@mail.gmail.com>
Subject: Re: [PATCH] fprobe: add unlock to match a succeeded ftrace_test_recursion_trylock
To:     Masami Hiramatsu <mhiramat@kernel.org>
Cc:     Steven Rostedt <rostedt@goodmis.org>, linux-kernel@vger.kernel.org,
        linux-trace-kernel@vger.kernel.org, Ze Gao <zegao@tencent.com>,
        Yafang <laoar.shao@gmail.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Good suggestion! Will amend and push v2 ASAP.

Thanks,
Ze

On Mon, Jul 3, 2023 at 4:19=E2=80=AFPM Masami Hiramatsu <mhiramat@kernel.or=
g> wrote:
>
> On Mon,  3 Jul 2023 15:16:40 +0800
> Ze Gao <zegao2021@gmail.com> wrote:
>
> Good catch! but please add description here, something like;
>
> ----
> Unlock ftrace recursion lock when fprobe_kprobe_handler() is failed
> because another kprobe is running.
> ----
>
> The code itself is OK to me.
>
>
> > Fixes: 3cc4e2c5fbae ("fprobe: make fprobe_kprobe_handler recursion free=
")
> > Reported-by: Yafang <laoar.shao@gmail.com>
> > Closes: https://lore.kernel.org/linux-trace-kernel/CALOAHbC6UpfFOOibdDi=
C7xFc5YFUgZnk3MZ=3D3Ny6we=3DAcrNbew@mail.gmail.com/
> > Signed-off-by: Ze Gao <zegao@tencent.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 i=
p, 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
> >
>
>
> --
> Masami Hiramatsu (Google) <mhiramat@kernel.org>