From: Ming Lei <ming.lei@redhat.com>
To: Josh Poimboeuf <jpoimboe@redhat.com>,
Jiri Kosina <jikos@kernel.org>, Miroslav Benes <mbenes@suse.cz>,
Petr Mladek <pmladek@suse.com>,
live-patching@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Luis Chamberlain <mcgrof@kernel.org>,
Joe Lawrence <joe.lawrence@redhat.com>,
Ming Lei <ming.lei@redhat.com>
Subject: [PATCH V3 1/3] livepatch: remove 'struct completion finish' from klp_patch
Date: Mon, 1 Nov 2021 19:25:46 +0800 [thread overview]
Message-ID: <20211101112548.3364086-2-ming.lei@redhat.com> (raw)
In-Reply-To: <20211101112548.3364086-1-ming.lei@redhat.com>
The completion finish is just for waiting release of the klp_patch
object, then releases module refcnt. We can simply drop the module
refcnt in the kobject release handler of klp_patch.
This way also helps to support allocating klp_patch from heap.
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
include/linux/livepatch.h | 1 -
kernel/livepatch/core.c | 12 +++---------
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/include/linux/livepatch.h b/include/linux/livepatch.h
index 2614247a9781..9712818997c5 100644
--- a/include/linux/livepatch.h
+++ b/include/linux/livepatch.h
@@ -170,7 +170,6 @@ struct klp_patch {
bool enabled;
bool forced;
struct work_struct free_work;
- struct completion finish;
};
#define klp_for_each_object_static(patch, obj) \
diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
index 335d988bd811..b967b4b0071b 100644
--- a/kernel/livepatch/core.c
+++ b/kernel/livepatch/core.c
@@ -551,10 +551,10 @@ static int klp_add_nops(struct klp_patch *patch)
static void klp_kobj_release_patch(struct kobject *kobj)
{
- struct klp_patch *patch;
+ struct klp_patch *patch = container_of(kobj, struct klp_patch, kobj);
- patch = container_of(kobj, struct klp_patch, kobj);
- complete(&patch->finish);
+ if (!patch->forced)
+ module_put(patch->mod);
}
static struct kobj_type klp_ktype_patch = {
@@ -678,11 +678,6 @@ static void klp_free_patch_finish(struct klp_patch *patch)
* cannot get enabled again.
*/
kobject_put(&patch->kobj);
- wait_for_completion(&patch->finish);
-
- /* Put the module after the last access to struct klp_patch. */
- if (!patch->forced)
- module_put(patch->mod);
}
/*
@@ -876,7 +871,6 @@ static int klp_init_patch_early(struct klp_patch *patch)
patch->enabled = false;
patch->forced = false;
INIT_WORK(&patch->free_work, klp_free_patch_work_fn);
- init_completion(&patch->finish);
klp_for_each_object_static(patch, obj) {
if (!obj->funcs)
--
2.31.1
next prev parent reply other threads:[~2021-11-01 11:26 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-01 11:25 [PATCH V3 0/3] livepatch: cleanup kpl_patch kobject release Ming Lei
2021-11-01 11:25 ` Ming Lei [this message]
2021-11-01 11:25 ` [PATCH V3 2/3] livepatch: free klp_patch object without holding klp_mutex Ming Lei
2021-11-03 15:18 ` [livepatch] 442831987f: WARNING:at_kernel/livepatch/core.c:#klp_enable_patch.cold kernel test robot
2021-11-01 11:25 ` [PATCH V3 3/3] livepatch: free klp_patch object synchronously Ming Lei
2021-11-01 16:44 ` [PATCH V3 0/3] livepatch: cleanup kpl_patch kobject release Joe Lawrence
2021-11-02 4:17 ` Ming Lei
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=20211101112548.3364086-2-ming.lei@redhat.com \
--to=ming.lei@redhat.com \
--cc=gregkh@linuxfoundation.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=mbenes@suse.cz \
--cc=mcgrof@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;
as well as URLs for NNTP newsgroup(s).