From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23722C4321A for ; Thu, 27 Jun 2019 23:12:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EB12E2133F for ; Thu, 27 Jun 2019 23:12:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726672AbfF0XMr (ORCPT ); Thu, 27 Jun 2019 19:12:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:41676 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726599AbfF0XMr (ORCPT ); Thu, 27 Jun 2019 19:12:47 -0400 Received: from gandalf.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F0D732086D; Thu, 27 Jun 2019 23:12:44 +0000 (UTC) Date: Thu, 27 Jun 2019 19:12:43 -0400 From: Steven Rostedt To: Thomas Gleixner Cc: Josh Poimboeuf , Petr Mladek , Miroslav Benes , Jessica Yu , Jiri Kosina , Joe Lawrence , linux-kernel@vger.kernel.org, live-patching@vger.kernel.org, Johannes Erdfelt , Ingo Molnar , mhiramat@kernel.org, torvalds@linux-foundation.org Subject: Re: [PATCH] ftrace: Remove possible deadlock between register_kprobe() and ftrace_run_update_code() Message-ID: <20190627191243.1d701443@gandalf.local.home> In-Reply-To: References: <20190627081334.12793-1-pmladek@suse.com> <20190627224729.tshtq4bhzhneq24w@treble> <20190627190457.703a486e@gandalf.local.home> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 28 Jun 2019 01:09:08 +0200 (CEST) Thomas Gleixner wrote: > On Thu, 27 Jun 2019, Steven Rostedt wrote: > > On Thu, 27 Jun 2019 17:47:29 -0500 > > > Releasing the lock in a separate function seems a bit surprising and > > > fragile, would it be possible to do something like this instead? > > > > > > diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c > > > index b38c388d1087..89ea1af6fd13 100644 > > > --- a/arch/x86/kernel/ftrace.c > > > +++ b/arch/x86/kernel/ftrace.c > > > @@ -37,15 +37,21 @@ > > > int ftrace_arch_code_modify_prepare(void) > > > { > > > mutex_lock(&text_mutex); > > > + > > > set_kernel_text_rw(); > > > set_all_modules_text_rw(); > > > + > > > + mutex_unlock(&text_mutex); > > > return 0; > > > } > > > > > > int ftrace_arch_code_modify_post_process(void) > > > { > > > + mutex_lock(&text_mutex); > > > + > > > set_all_modules_text_ro(); > > > set_kernel_text_ro(); > > > + > > > mutex_unlock(&text_mutex); > > > return 0; > > > } > > > > I agree with Josh on this. As the original bug was the race between > > ftrace and live patching / modules changing the text from ro to rw and > > vice versa. Just protecting the update to the text permissions is more > > robust, and should be more self documenting when we need to handle > > other architectures for this. > > How is that supposed to work? > > ftrace > prepare() > setrw() > setro() > patch <- FAIL > Good point. I guess we the original patch is fine. Josh? -- Steve