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:   Thu, 5 May 2022 09:31:40 +0900
From:   Masami Hiramatsu <mhiramat@kernel.org>
To:     Max Filippov <jcmvbkbc@gmail.com>
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>
Subject: Re: [PATCH] kprobes: Fix build errors with CONFIG_KRETPROBES=n
Message-Id: <20220505093140.9a0500813b8d529442c76933@kernel.org>
In-Reply-To: <CAMo8BfJF_HTZc-PUrK4y5yLEdwWPmpKu2NyzJusjGd1Ste0b3g@mail.gmail.com>
References: <20220502184050.1792743-1-jcmvbkbc@gmail.com>
        <165163539094.74407.3838114721073251225.stgit@devnote2>
        <CAMo8BfJF_HTZc-PUrK4y5yLEdwWPmpKu2NyzJusjGd1Ste0b3g@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

On Wed, 4 May 2022 10:53:42 -0700
Max Filippov <jcmvbkbc@gmail.com> wrote:

> On Tue, May 3, 2022 at 8:36 PM Masami Hiramatsu <mhiramat@kernel.org> wrote:
> >
> > Max Filippov reported:
> >
> > When building kernel with CONFIG_KRETPROBES=n kernel/kprobes.c
> > compilation fails with the following messages:
> >
> >   kernel/kprobes.c: In function ‘recycle_rp_inst’:
> >   kernel/kprobes.c:1273:32: error: implicit declaration of function
> >                                    ‘get_kretprobe’
> >
> >   kernel/kprobes.c: In function ‘kprobe_flush_task’:
> >   kernel/kprobes.c:1299:35: error: ‘struct task_struct’ has no member
> >                                    named ‘kretprobe_instances’
> >
> > This came from the commit d741bf41d7c7 ("kprobes: Remove
> > kretprobe hash") which introduced get_kretprobe() and
> > kretprobe_instances member in task_struct when CONFIG_KRETPROBES=y,
> > 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>

Thank you!

Steve, can you pick this fix?

Thanks,

-- 
Masami Hiramatsu <mhiramat@kernel.org>