From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751312AbaLRPuU (ORCPT ); Thu, 18 Dec 2014 10:50:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60828 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751062AbaLRPuO (ORCPT ); Thu, 18 Dec 2014 10:50:14 -0500 Date: Thu, 18 Dec 2014 09:49:35 -0600 From: Josh Poimboeuf To: Masami Hiramatsu Cc: Seth Jennings , Jiri Kosina , Vojtech Pavlik , Steven Rostedt , Petr Mladek , Miroslav Benes , Christoph Hellwig , Greg KH , Andy Lutomirski , live-patching@vger.kernel.org, x86@kernel.org, kpatch@redhat.com, linux-kernel@vger.kernel.org Subject: [PATCH] livepatch: use FTRACE_OPS_FL_IPMODIFY Message-ID: <20141218154935.GA6887@treble.redhat.com> References: <1418752700-14649-1-git-send-email-sjenning@redhat.com> <5492C0A9.3080303@hitachi.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <5492C0A9.3080303@hitachi.com> User-Agent: Mutt/1.5.23.1-rc1 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Dec 18, 2014 at 08:55:21PM +0900, Masami Hiramatsu wrote: > (2014/12/17 2:58), Seth Jennings wrote: > > changes in v7: > > - TODO: set IPMODIFY (not a blocker to moving forward) > > Why don't you set this? > IPMODIFY series are not completely applied yet, but you can already > use the flag. All you need is just set it :) Yeah, I don't see any reason why we can't start using this flag now. How about we add this patch to the queue? -->8-- Subject: livepatch: use FTRACE_OPS_FL_IPMODIFY Use the FTRACE_OPS_FL_IPMODIFY flag to prevent conflicts with other ftrace users who also modify regs->ip. Signed-off-by: Josh Poimboeuf --- kernel/livepatch/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c index 0004a71..bdd99975 100644 --- a/kernel/livepatch/core.c +++ b/kernel/livepatch/core.c @@ -640,7 +640,8 @@ static int klp_init_func(struct klp_object *obj, struct klp_func *func) ops->private = func; ops->func = klp_ftrace_handler; - ops->flags = FTRACE_OPS_FL_SAVE_REGS | FTRACE_OPS_FL_DYNAMIC; + ops->flags = FTRACE_OPS_FL_SAVE_REGS | FTRACE_OPS_FL_DYNAMIC | + FTRACE_FL_IPMODIFY; func->fops = ops; func->state = KLP_DISABLED; -- 2.1.0