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:   Sat, 24 Sep 2022 11:01:13 -0400
From:   Steven Rostedt <rostedt@goodmis.org>
To:     Song Liu <song@kernel.org>
Cc:     <linux-kernel@vger.kernel.org>, <kernel-team@fb.com>,
        "Naveen N . Rao" <naveen.n.rao@linux.vnet.ibm.com>
Subject: Re: [PATCH] ftrace: fix recursive locking direct_mutex in
 ftrace_modify_direct_caller
Message-ID: <20220924110113.64c6701b@rorschach.local.home>
In-Reply-To: <20220919172955.1196326-1-song@kernel.org>
References: <20220919172955.1196326-1-song@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Precedence: bulk

On Mon, 19 Sep 2022 10:29:55 -0700
Song Liu <song@kernel.org> wrote:

> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
> index 439e2ab6905e..d308d0674805 100644
> --- a/kernel/trace/ftrace.c
> +++ b/kernel/trace/ftrace.c
> @@ -5461,7 +5461,7 @@ int __weak ftrace_modify_direct_caller(struct ftrace_func_entry *entry,
>  	if (ret)
>  		goto out_lock;
>  
> -	ret = register_ftrace_function(&stub_ops);
> +	ret = register_ftrace_function_nolock(&stub_ops);
>  	if (ret) {
>  		ftrace_set_filter_ip(&stub_ops, ip, 1, 0);
>  		goto out_lock;
> -- 

We need to update the comments to this function, as well add an:

#define lock_direct_assert_held()	lockdep_assert_held(&direct_mutex);

And call that in this function. Otherwise, we can be calling this code
without it held and cause races.

-- Steve