From: Dave Young <dyoung@redhat.com>
To: Pavel Tatashin <pasha.tatashin@soleen.com>
Cc: jmorris@namei.org, sashal@kernel.org, ebiederm@xmission.com,
kexec@lists.infradead.org, linux-kernel@vger.kernel.org,
corbet@lwn.net, catalin.marinas@arm.com, will@kernel.org,
linux-arm-kernel@lists.infradead.org, marc.zyngier@arm.com,
james.morse@arm.com, vladimir.murzin@arm.com,
matthias.bgg@gmail.com, bhsharma@redhat.com, linux-mm@kvack.org,
mark.rutland@arm.com
Subject: Re: [PATCH v5 13/17] kexec: add machine_kexec_post_load()
Date: Wed, 25 Sep 2019 14:05:33 +0800 [thread overview]
Message-ID: <20190925060533.GB30921@dhcp-128-65.nay.redhat.com> (raw)
In-Reply-To: <20190923203427.294286-14-pasha.tatashin@soleen.com>
On 09/23/19 at 04:34pm, Pavel Tatashin wrote:
> It is the same as machine_kexec_prepare(), but is called after segments are
> loaded. This way, can do processing work with already loaded relocation
> segments. One such example is arm64: it has to have segments loaded in
> order to create a page table, but it cannot do it during kexec time,
> because at that time allocations won't be possible anymore.
>
> Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com>
> ---
> kernel/kexec.c | 4 ++++
> kernel/kexec_core.c | 6 ++++++
> kernel/kexec_file.c | 4 ++++
> kernel/kexec_internal.h | 2 ++
> 4 files changed, 16 insertions(+)
>
> diff --git a/kernel/kexec.c b/kernel/kexec.c
> index 1b018f1a6e0d..27b71dc7b35a 100644
> --- a/kernel/kexec.c
> +++ b/kernel/kexec.c
> @@ -159,6 +159,10 @@ static int do_kexec_load(unsigned long entry, unsigned long nr_segments,
>
> kimage_terminate(image);
>
> + ret = machine_kexec_post_load(image);
> + if (ret)
> + goto out;
> +
> /* Install the new kernel and uninstall the old */
> image = xchg(dest_image, image);
>
> diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c
> index 2c5b72863b7b..8360645d1bbe 100644
> --- a/kernel/kexec_core.c
> +++ b/kernel/kexec_core.c
> @@ -587,6 +587,12 @@ static void kimage_free_extra_pages(struct kimage *image)
> kimage_free_page_list(&image->unusable_pages);
>
> }
> +
> +int __weak machine_kexec_post_load(struct kimage *image)
> +{
> + return 0;
> +}
> +
> void kimage_terminate(struct kimage *image)
> {
> if (*image->entry != 0)
> diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
> index b8cc032d5620..cb531d768114 100644
> --- a/kernel/kexec_file.c
> +++ b/kernel/kexec_file.c
> @@ -391,6 +391,10 @@ SYSCALL_DEFINE5(kexec_file_load, int, kernel_fd, int, initrd_fd,
>
> kimage_terminate(image);
>
> + ret = machine_kexec_post_load(image);
> + if (ret)
> + goto out;
> +
> /*
> * Free up any temporary buffers allocated which are not needed
> * after image has been loaded
> diff --git a/kernel/kexec_internal.h b/kernel/kexec_internal.h
> index 48aaf2ac0d0d..39d30ccf8d87 100644
> --- a/kernel/kexec_internal.h
> +++ b/kernel/kexec_internal.h
> @@ -13,6 +13,8 @@ void kimage_terminate(struct kimage *image);
> int kimage_is_destination_range(struct kimage *image,
> unsigned long start, unsigned long end);
>
> +int machine_kexec_post_load(struct kimage *image);
> +
> extern struct mutex kexec_mutex;
>
> #ifdef CONFIG_KEXEC_FILE
> --
> 2.23.0
>
>
> _______________________________________________
> kexec mailing list
> kexec@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/kexec
Acked-by: Dave Young <dyoung@redhat.com>
Thanks
Dave
next prev parent reply other threads:[~2019-09-25 6:05 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-23 20:34 [PATCH v5 00/17] arm64: MMU enabled kexec relocation Pavel Tatashin
2019-09-23 20:34 ` [PATCH v5 01/17] kexec: quiet down kexec reboot Pavel Tatashin
2019-09-25 6:04 ` Dave Young
2019-09-25 15:33 ` Pavel Tatashin
2019-09-23 20:34 ` [PATCH v5 02/17] arm64: hibernate: pass the allocated pgdp to ttbr0 Pavel Tatashin
2019-09-23 20:34 ` [PATCH v5 03/17] arm64: hibernate: check pgd table allocation Pavel Tatashin
2019-09-23 20:34 ` [PATCH v5 04/17] arm64: hibernate: use get_safe_page directly Pavel Tatashin
2019-09-23 20:34 ` [PATCH v5 05/17] arm64: hibernate: remove gotos as they are not needed Pavel Tatashin
2019-09-23 20:34 ` [PATCH v5 06/17] arm64: hibernate: rename dst to page in create_safe_exec_page Pavel Tatashin
2019-09-23 20:34 ` [PATCH v5 07/17] arm64: hibernate: add PUD_SECT_RDONLY Pavel Tatashin
2019-09-23 20:34 ` [PATCH v5 08/17] arm64: hibernate: add trans_pgd public functions Pavel Tatashin
2019-09-23 20:34 ` [PATCH v5 09/17] arm64: hibernate: move page handling function to new trans_pgd.c Pavel Tatashin
2019-09-23 20:34 ` [PATCH v5 10/17] arm64: trans_pgd: make trans_pgd_map_page generic Pavel Tatashin
2019-09-23 20:34 ` [PATCH v5 11/17] arm64: trans_pgd: pass allocator trans_pgd_create_copy Pavel Tatashin
2019-09-23 20:34 ` [PATCH v5 12/17] arm64: trans_pgd: pass NULL instead of init_mm to *_populate functions Pavel Tatashin
2019-09-23 20:34 ` [PATCH v5 13/17] kexec: add machine_kexec_post_load() Pavel Tatashin
2019-09-25 6:05 ` Dave Young [this message]
2019-09-25 15:33 ` Pavel Tatashin
2019-09-23 20:34 ` [PATCH v5 14/17] arm64: kexec: move relocation function setup and clean up Pavel Tatashin
2019-09-23 20:34 ` [PATCH v5 15/17] arm64: kexec: add expandable argument to relocation function Pavel Tatashin
2019-09-23 20:34 ` [PATCH v5 16/17] arm64: kexec: configure trans_pgd page table for kexec Pavel Tatashin
2019-09-23 20:34 ` [PATCH v5 17/17] arm64: kexec: enable MMU during kexec relocation Pavel Tatashin
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=20190925060533.GB30921@dhcp-128-65.nay.redhat.com \
--to=dyoung@redhat.com \
--cc=bhsharma@redhat.com \
--cc=catalin.marinas@arm.com \
--cc=corbet@lwn.net \
--cc=ebiederm@xmission.com \
--cc=james.morse@arm.com \
--cc=jmorris@namei.org \
--cc=kexec@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=marc.zyngier@arm.com \
--cc=mark.rutland@arm.com \
--cc=matthias.bgg@gmail.com \
--cc=pasha.tatashin@soleen.com \
--cc=sashal@kernel.org \
--cc=vladimir.murzin@arm.com \
--cc=will@kernel.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).