From: Miroslav Benes <mbenes@suse.cz>
To: Petr Mladek <pmladek@suse.com>
Cc: Jessica Yu <jeyu@redhat.com>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Seth Jennings <sjenning@redhat.com>,
Jiri Kosina <jikos@kernel.org>, Vojtech Pavlik <vojtech@suse.com>,
Rusty Russell <rusty@rustcorp.com.au>,
Steven Rostedt <rostedt@goodmis.org>,
Ingo Molnar <mingo@redhat.com>,
live-patching@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 2/2] livepatch/module: remove livepatch module notifier
Date: Thu, 4 Feb 2016 17:47:57 +0100 (CET) [thread overview]
Message-ID: <alpine.LNX.2.00.1602041742120.4407@pobox.suse.cz> (raw)
In-Reply-To: <20160204143934.GZ3305@pathway.suse.cz>
On Thu, 4 Feb 2016, Petr Mladek wrote:
> On Mon 2016-02-01 20:17:36, Jessica Yu wrote:
> >
> >
> > - if (patch->state == KLP_DISABLED)
> > - goto disabled;
> > + ret = klp_init_object_loaded(patch, obj);
> > + if (ret) {
> > + pr_warn("failed to initialize patch '%s' for module '%s' (%d)\n",
> > + patch->mod->name, obj->mod->name, ret);
> > + goto err;
> > + }
> > +
> > + if (patch->state == KLP_DISABLED)
> > + break;
> >
> > - pr_notice("reverting patch '%s' on unloading module '%s'\n",
> > - pmod->name, mod->name);
> > + pr_notice("applying patch '%s' to loading module '%s'\n",
> > + patch->mod->name, obj->mod->name);
> >
> > - klp_disable_object(obj);
> > + ret = klp_enable_object(obj);
> > + if (ret) {
> > + pr_warn("failed to apply patch '%s' to module '%s' (%d)\n",
> > + patch->mod->name, obj->mod->name, ret);
> > + goto err;
> > + }
> > +
> > + break;
> > + }
> > + }
> > +
> > + mutex_unlock(&klp_mutex);
> >
> > -disabled:
> > - klp_free_object_loaded(obj);
> > + return 0;
> > +
> > +err:
> > + /*
> > + * If a patch is unsuccessfully applied, return
> > + * error to the module loader.
> > + */
> > + obj->mod = NULL;
> > + pr_warn("patch '%s' is in an inconsistent state!\n", patch->mod->name);
>
> This message is not correct. The module will not get loaded
> when the patch is not applied.
Yes, because we are in a better situation with this patch. We actually
return an error and refuse to load the module. Message should take that
into account.
> Instead, we need to revert all the operations that has already
> been done for this module. Note that the module stayed loaded
> before, so we did not need to release any memory or revert
> any ftrace call registration but we need to do so now!
Actually, I think the code is correct. If klp_init_object_loaded() there
is no problem because we only write relocations there (which are written
to the module being loaded) and resolve symbols via kallsyms. Nothing to
revert there and it could be done again.
If klp_enable_object() fails, all the relevant error handling was already
done there. See the call to klp_disable_object() if klp_enable_function()
fails there.
Miroslav
next prev parent reply other threads:[~2016-02-04 16:48 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-02 1:17 [PATCH v2 0/2] Fix ordering of ftrace/livepatch calls on module load and unload Jessica Yu
2016-02-02 1:17 ` [PATCH v2 1/2] ftrace/module: remove ftrace module notifier Jessica Yu
2016-02-04 13:27 ` Petr Mladek
2016-02-04 14:18 ` Steven Rostedt
2016-02-04 15:21 ` Petr Mladek
2016-02-04 15:33 ` Steven Rostedt
2016-02-02 1:17 ` [PATCH v2 2/2] livepatch/module: remove livepatch " Jessica Yu
2016-02-04 14:39 ` Petr Mladek
2016-02-04 14:56 ` Steven Rostedt
2016-02-04 16:47 ` Miroslav Benes [this message]
2016-02-05 4:11 ` Jessica Yu
2016-02-05 9:15 ` Miroslav Benes
2016-02-05 10:06 ` Petr Mladek
2016-02-08 0:34 ` Rusty Russell
2016-02-04 17:29 ` [PATCH v2 2/2] " Miroslav Benes
2016-02-04 20:55 ` Josh Poimboeuf
2016-02-05 8:59 ` Miroslav Benes
2016-02-04 10:43 ` [PATCH v2 0/2] Fix ordering of ftrace/livepatch calls on module load and unload Jiri Kosina
2016-02-04 13:29 ` Steven Rostedt
2016-02-05 1:17 ` Rusty Russell
-- strict thread matches above, loose matches on Subject: below --
2016-03-11 20:03 [PATCH v2 0/2] Livepatch module notifier cleanup Jessica Yu
2016-03-11 20:03 ` [PATCH v2 2/2] livepatch/module: remove livepatch module notifier Jessica Yu
2016-03-14 15:06 ` Petr Mladek
2016-03-14 20:01 ` Josh Poimboeuf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LNX.2.00.1602041742120.4407@pobox.suse.cz \
--to=mbenes@suse.cz \
--cc=jeyu@redhat.com \
--cc=jikos@kernel.org \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=live-patching@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pmladek@suse.com \
--cc=rostedt@goodmis.org \
--cc=rusty@rustcorp.com.au \
--cc=sjenning@redhat.com \
--cc=vojtech@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).