From: Miroslav Benes <mbenes@suse.cz>
To: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: live-patching@vger.kernel.org, linux-kernel@vger.kernel.org,
Peter Zijlstra <peterz@infradead.org>,
Jessica Yu <jeyu@kernel.org>,
Joe Lawrence <joe.lawrence@redhat.com>
Subject: Re: [PATCH v3 02/10] livepatch: Apply vmlinux-specific KLP relocations early
Date: Tue, 28 Apr 2020 11:20:13 +0200 (CEST) [thread overview]
Message-ID: <alpine.LSU.2.21.2004281118160.27039@pobox.suse.cz> (raw)
In-Reply-To: <8c9f86b3a44bdcc9b350e41301df7f61c7587cf6.1587812518.git.jpoimboe@redhat.com>
> @@ -738,18 +765,23 @@ static int klp_init_object_loaded(struct klp_patch *patch,
> int ret;
>
> mutex_lock(&text_mutex);
> -
> module_disable_ro(patch->mod);
> - ret = klp_write_object_relocations(patch->mod, obj);
> - if (ret) {
> - module_enable_ro(patch->mod, true);
> - mutex_unlock(&text_mutex);
> - return ret;
> +
> + if (klp_is_module(obj)) {
> + /*
> + * Only write module-specific relocations here
> + * (.klp.rela.{module}.*). vmlinux-specific relocations were
> + * written earlier during the initialization of the klp module
> + * itself.
> + */
> + ret = klp_apply_object_relocs(patch, obj);
> + if (ret)
+ module_enable_ro(patch->mod, true);
+ mutex_unlock(&text_mutex);
is missing here, I think. Probably lost during rebase. It is fine after
the next patch.
> + return ret;
> }
>
> arch_klp_init_object_loaded(patch, obj);
> - module_enable_ro(patch->mod, true);
>
> + module_enable_ro(patch->mod, true);
> mutex_unlock(&text_mutex);
Miroslav
next prev parent reply other threads:[~2020-04-28 9:20 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-25 11:07 [PATCH v3 00/10] livepatch,module: Remove .klp.arch and module_disable_ro() Josh Poimboeuf
2020-04-25 11:07 ` [PATCH v3 01/10] livepatch: Disallow vmlinux.ko Josh Poimboeuf
2020-04-25 11:07 ` [PATCH v3 02/10] livepatch: Apply vmlinux-specific KLP relocations early Josh Poimboeuf
2020-04-28 9:20 ` Miroslav Benes [this message]
2020-04-25 11:07 ` [PATCH v3 03/10] livepatch: Remove .klp.arch Josh Poimboeuf
2020-04-25 11:07 ` [PATCH v3 04/10] livepatch: Prevent module-specific KLP rela sections from referencing vmlinux symbols Josh Poimboeuf
2020-04-25 11:07 ` [PATCH v3 05/10] s390: Change s390_kernel_write() return type to match memcpy() Josh Poimboeuf
2020-04-25 11:07 ` [PATCH v3 06/10] s390/module: Use s390_kernel_write() for late relocations Josh Poimboeuf
2020-04-25 11:14 ` Josh Poimboeuf
2020-04-25 11:07 ` [PATCH v3 07/10] x86/module: Use text_poke() " Josh Poimboeuf
2020-04-25 11:07 ` [PATCH v3 08/10] livepatch: Remove module_disable_ro() usage Josh Poimboeuf
2020-04-25 11:07 ` [PATCH v3 09/10] module: Remove module_disable_ro() Josh Poimboeuf
2020-04-28 16:25 ` Jessica Yu
2020-04-28 16:36 ` Josh Poimboeuf
2020-04-28 16:41 ` Jessica Yu
2020-04-28 17:03 ` Josh Poimboeuf
2020-04-28 18:56 ` Jessica Yu
2020-04-25 11:07 ` [PATCH v3 10/10] x86/module: Use text_mutex in apply_relocate_add() Josh Poimboeuf
2020-04-27 12:22 ` [PATCH v3 00/10] livepatch,module: Remove .klp.arch and module_disable_ro() Joe Lawrence
2020-04-27 12:32 ` Miroslav Benes
2020-04-27 16:52 ` Joe Lawrence
2020-04-28 13:48 ` Miroslav Benes
2020-04-28 14:35 ` 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.LSU.2.21.2004281118160.27039@pobox.suse.cz \
--to=mbenes@suse.cz \
--cc=jeyu@kernel.org \
--cc=joe.lawrence@redhat.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=live-patching@vger.kernel.org \
--cc=peterz@infradead.org \
/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 NNTP newsgroup(s).