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: <20220502184050.1792743-1-jcmvbkbc@gmail.com> <165163539094.74407.3838114721073251225.stgit@devnote2>
In-Reply-To: <165163539094.74407.3838114721073251225.stgit@devnote2>
From:   Max Filippov <jcmvbkbc@gmail.com>
Date:   Wed, 4 May 2022 10:53:42 -0700
Message-ID: <CAMo8BfJF_HTZc-PUrK4y5yLEdwWPmpKu2NyzJusjGd1Ste0b3g@mail.gmail.com>
Subject: Re: [PATCH] kprobes: Fix build errors with CONFIG_KRETPROBES=n
To:     Masami Hiramatsu <mhiramat@kernel.org>
Cc:     Steven Rostedt <rostedt@goodmis.org>,
        "Naveen N . Rao" <naveen.n.rao@linux.ibm.com>,
        Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>,
        "David S . Miller" <davem@davemloft.net>,
        Peter Zijlstra <peterz@infradead.org>,
        LKML <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Tue, May 3, 2022 at 8:36 PM Masami Hiramatsu <mhiramat@kernel.org> wrote=
:
>
> Max Filippov reported:
>
> When building kernel with CONFIG_KRETPROBES=3Dn kernel/kprobes.c
> compilation fails with the following messages:
>
>   kernel/kprobes.c: In function =E2=80=98recycle_rp_inst=E2=80=99:
>   kernel/kprobes.c:1273:32: error: implicit declaration of function
>                                    =E2=80=98get_kretprobe=E2=80=99
>
>   kernel/kprobes.c: In function =E2=80=98kprobe_flush_task=E2=80=99:
>   kernel/kprobes.c:1299:35: error: =E2=80=98struct task_struct=E2=80=99 h=
as no member
>                                    named =E2=80=98kretprobe_instances=E2=
=80=99
>
> This came from the commit d741bf41d7c7 ("kprobes: Remove
> kretprobe hash") which introduced get_kretprobe() and
> kretprobe_instances member in task_struct when CONFIG_KRETPROBES=3Dy,
> but did not make recycle_rp_inst() and kprobe_flush_task()
> depending on CONFIG_KRETPORBES.
>
> Since those functions are only used for kretprobe, move those
> functions into #ifdef CONFIG_KRETPROBE area.
>
> Reported-by: Max Filippov <jcmvbkbc@gmail.com>
> Fixes: d741bf41d7c7 ("kprobes: Remove kretprobe hash")
> Cc: stable@vger.kernel.org
> Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
> ---
>  include/linux/kprobes.h |    2 -
>  kernel/kprobes.c        |  144 +++++++++++++++++++++++------------------=
------
>  2 files changed, 72 insertions(+), 74 deletions(-)

Tested-by: Max Filippov <jcmvbkbc@gmail.com>

--=20
Thanks.
-- Max