Date:   Wed, 8 Dec 2021 10:20:08 -0500
From:   Steven Rostedt <rostedt@goodmis.org>
To:     "Jerome Marchand" <jmarchan@redhat.com>
Cc:     Ingo Molnar <mingo@redhat.com>,
        =?UTF-8?B?546L6LSH?= <yun.wang@linux.alibaba.com>,
        linux-kernel@vger.kernel.org, Heiko Carstens <hca@linux.ibm.com>,
        Vasily Gorbik <gor@linux.ibm.com>,
        Christian Borntraeger <borntraeger@linux.ibm.com>,
        Alexander Gordeev <agordeev@linux.ibm.com>,
        linux-s390@vger.kernel.org
Subject: Re: [PATCH] ftrace: disable preemption when recursion locked in
 arch/s390/kernel/ftrace.c
Message-ID: <20211208102008.197df008@gandalf.local.home>
In-Reply-To: <20211208151503.1510381-1-jmarchan@redhat.com>
References: <20211208151503.1510381-1-jmarchan@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Precedence: bulk


This really needs to go through the s390 tree.

-- Steve


On Wed,  8 Dec 2021 16:15:03 +0100
"Jerome Marchand" <jmarchan@redhat.com> wrote:

> It looks like commit ce5e48036c9e76a2 ("ftrace: disable preemption
> when recursion locked") missed a spot in kprobe_ftrace_handler() in
> arch/s390/kernel/ftrace.c.
> Removes the superfluous preempt_disable/enable_notrace() there too.
> 
> Fixes: ce5e48036c9e76a2 ("ftrace: disable preemption when recursion locked")
> Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
> ---
>  arch/s390/kernel/ftrace.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/arch/s390/kernel/ftrace.c b/arch/s390/kernel/ftrace.c
> index 5510c7d10ddc..21d62d8b6b9a 100644
> --- a/arch/s390/kernel/ftrace.c
> +++ b/arch/s390/kernel/ftrace.c
> @@ -290,7 +290,6 @@ void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip,
>  		return;
>  
>  	regs = ftrace_get_regs(fregs);
> -	preempt_disable_notrace();
>  	p = get_kprobe((kprobe_opcode_t *)ip);
>  	if (unlikely(!p) || kprobe_disabled(p))
>  		goto out;
> @@ -318,7 +317,6 @@ void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip,
>  	}
>  	__this_cpu_write(current_kprobe, NULL);
>  out:
> -	preempt_enable_notrace();
>  	ftrace_test_recursion_unlock(bit);
>  }
>  NOKPROBE_SYMBOL(kprobe_ftrace_handler);