From: Miroslav Benes <mbenes@suse.cz>
To: Joe Lawrence <joe.lawrence@redhat.com>
Cc: Petr Mladek <pmladek@suse.com>, Jiri Kosina <jikos@kernel.org>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Jason Baron <jbaron@akamai.com>, Jessica Yu <jeyu@kernel.org>,
Evgenii Shatokhin <eshatokhin@virtuozzo.com>,
live-patching@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v8 7/8] livepatch: Correctly handle atomic replace for not yet loaded modules
Date: Mon, 5 Mar 2018 10:54:16 +0100 (CET) [thread overview]
Message-ID: <alpine.LSU.2.21.1803051050330.26605@pobox.suse.cz> (raw)
In-Reply-To: <7f920ec3-dfe0-6a4d-dd25-5d5c4fa75714@redhat.com>
On Fri, 2 Mar 2018, Joe Lawrence wrote:
> On 03/01/2018 05:28 AM, Petr Mladek wrote:
> > On Thu 2018-02-22 22:00:28, Miroslav Benes wrote:
> >> On Wed, 21 Feb 2018, Petr Mladek wrote:
> >>> This patch allows the late initialization.
> >>>
> >>> diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
> >>> index ad508a86b2f9..da1438d47d83 100644
> >>> --- a/kernel/livepatch/core.c
> >>> +++ b/kernel/livepatch/core.c
> >>> @@ -984,7 +988,12 @@ static void klp_free_patch(struct klp_patch *patch)
> >>>
> >>> static int klp_init_func(struct klp_object *obj, struct klp_func *func)
> >>> {
> >>> - if (!func->old_name || !func->new_func)
> >>> + if (!func->old_name)
> >>> + return -EINVAL;
> >>> +
> >>> + /* NOPs do not know the address until the patched module is loaded. */
> >>> + if (!func->new_func &&
> >>> + (!klp_is_func_type(func, KLP_FUNC_NOP) || klp_is_object_loaded(obj)))
> >>> return -EINVAL;
> >>
> >> If we changed the order of klp_init_func() and klp_init_object_loaded()
> >> calls in klp_init_object(), the hunk would not be needed. Is that correct?
> >
> > Not really. klp_init_object_loaded() would set func->new_func only
> > when the object was loaded. But we want to proceed here and create
> > the kobject for NOPs even when it was not loaded.
> >
> >
> >>> INIT_LIST_HEAD(&func->stack_node);
> >>> @@ -1039,6 +1048,9 @@ static int klp_init_object_loaded(struct klp_patch *patch,
> >>> return -ENOENT;
> >>> }
> >>>
> >>> + if (klp_is_func_type(func, KLP_FUNC_NOP))
> >>> + func->new_func = (void *)func->old_addr;
> >>
> >> Is there a reason why you left the same assignment in
> >> klp_alloc_func_nop()? This one is enough, no?
> >
> > Good point! I am going to replace the obsolete assignment
> > with a comment in v8.
>
> Hi Petr, Miroslav,
>
> I don't think the assignment in klp_alloc_func_nop() was necessarily
> redundant. It was removed in v9 and that breaks my atomic replace
> sample module when I try to load it. (Perhaps the sample patch has
> issues, but here are my debug notes):
>
> To recap:
>
> patch 1 - modifies cmdline_proc_show()
> patch 2 - modifies only meminfo_proc_show()
>
> when I load patch 2 with .replace=1, klp_add_nops() is called and this
> adds a nop function to patch 2 so it reverts cmdline_proc_show():
>
> klp_init_patch()
> if (patch->replace)
> klp_add_nops()
> list_for_each_entry(old_patch, &klp_patches, list) {
> klp_for_each_object(old_patch, old_obj) {
> klp_add_object_nops()
> klp_add_func_nop()
> klp_alloc_func_nop()
>
> the patch continues initialization and I hit the second -EINVAL
> condition on that nop function in klp_init_func():
>
> klp_init_object
> klp_init_func
>
> (from added debug):
> [ 48.456980] livepatch: func->old_name=cmdline_proc_show
> [ 48.457620] livepatch: func->new_func= (null)
> [ 48.458042] livepatch: klp_is_func_type(func, KLP_FUNC_NOP)=1
> [ 48.458573] livepatch: klp_is_object_loaded(obj)=1
>
> If I restore the assignment of func->new_func to klp_alloc_func_nop()
> then the replacement patch properly loads. (Reordering the code may
> have similar effect?)
Ok, so it was not redundant. Or... I think it should be redundant, but we
need to define the if condition in klp_init_func() properly.
> I think this problem is contained to only replacement patches that need
> the nop-revert feature... if the replacement patch provides a new
> function definition, then it shouldn't be affected.
>
> Man, we need a regression test suite for all these cases :)
Any volunteer?
Miroslav
next prev parent reply other threads:[~2018-03-05 9:54 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-21 13:29 [PATCH v8 0/8] livepatch: Atomic replace feature Petr Mladek
2018-02-21 13:29 ` [PATCH v8 1/8] livepatch: Use lists to manage patches, objects and functions Petr Mladek
2018-02-21 13:29 ` [PATCH v8 2/8] livepatch: Free only structures with initialized kobject Petr Mladek
2018-02-21 13:29 ` [PATCH v8 3/8] livepatch: Initial support for dynamic structures Petr Mladek
2018-02-21 13:29 ` [PATCH v8 4/8] livepatch: Allow to unpatch only functions of the given type Petr Mladek
2018-02-22 15:25 ` Miroslav Benes
2018-02-21 13:29 ` [PATCH v8 5/8] livepatch: Support separate list for replaced patches Petr Mladek
2018-02-21 13:29 ` [PATCH v8 6/8] livepatch: Add atomic replace Petr Mladek
2018-02-21 13:29 ` [PATCH v8 7/8] livepatch: Correctly handle atomic replace for not yet loaded modules Petr Mladek
2018-02-22 21:00 ` Miroslav Benes
2018-03-01 10:28 ` Petr Mladek
2018-03-02 22:00 ` Joe Lawrence
2018-03-05 9:54 ` Miroslav Benes [this message]
2018-03-05 14:42 ` Josh Poimboeuf
2018-03-06 14:10 ` Petr Mladek
2018-02-21 13:29 ` [PATCH v8 8/8] livepatch: Atomic replace and cumulative patches documentation Petr Mladek
2018-02-23 10:41 ` Miroslav Benes
2018-02-23 16:55 ` Joe Lawrence
2018-02-23 20:40 ` Miroslav Benes
2018-02-22 15:23 ` [PATCH v8 0/8] livepatch: Atomic replace feature Miroslav Benes
2018-03-05 10:56 ` Evgenii Shatokhin
2018-03-05 12:54 ` Miroslav Benes
2018-03-06 15:32 ` Petr Mladek
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.LSU.2.21.1803051050330.26605@pobox.suse.cz \
--to=mbenes@suse.cz \
--cc=eshatokhin@virtuozzo.com \
--cc=jbaron@akamai.com \
--cc=jeyu@kernel.org \
--cc=jikos@kernel.org \
--cc=joe.lawrence@redhat.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=live-patching@vger.kernel.org \
--cc=pmladek@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
all inboxes | Powered by JetHome®