From: Matthias Brugger <mbrugger@suse.com>
To: Pavel Tatashin <pasha.tatashin@soleen.com>,
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,
bhsharma@redhat.com, linux-mm@kvack.org, mark.rutland@arm.com
Subject: Re: [PATCH v4 04/17] arm64: hibernate: use get_safe_page directly
Date: Tue, 10 Sep 2019 10:03:44 +0200 [thread overview]
Message-ID: <e2ceb43a-d7bf-e0c6-c3ea-b83c95ba880d@suse.com> (raw)
In-Reply-To: <20190909181221.309510-5-pasha.tatashin@soleen.com>
On 09/09/2019 20:12, Pavel Tatashin wrote:
> create_safe_exec_page() uses hibernate's allocator to create a set of page
> table to map a single page that will contain the relocation code.
>
> Remove the allocator related arguments, and use get_safe_page directly, as
> it is done in other local functions in this file to simplify function
> prototype.
>
> Removing this function pointer makes it easier to refactor the code later.
>
> Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com>
Reviewed-by: Matthias Brugger <mbrugger@suse.com>
> ---
> arch/arm64/kernel/hibernate.c | 17 +++++++----------
> 1 file changed, 7 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c
> index 227cc26720f7..47a861e0cb0c 100644
> --- a/arch/arm64/kernel/hibernate.c
> +++ b/arch/arm64/kernel/hibernate.c
> @@ -196,9 +196,7 @@ EXPORT_SYMBOL(arch_hibernation_header_restore);
> */
> static int create_safe_exec_page(void *src_start, size_t length,
> unsigned long dst_addr,
> - phys_addr_t *phys_dst_addr,
> - void *(*allocator)(gfp_t mask),
> - gfp_t mask)
> + phys_addr_t *phys_dst_addr)
> {
> int rc = 0;
> pgd_t *trans_pgd;
> @@ -206,7 +204,7 @@ static int create_safe_exec_page(void *src_start, size_t length,
> pud_t *pudp;
> pmd_t *pmdp;
> pte_t *ptep;
> - unsigned long dst = (unsigned long)allocator(mask);
> + unsigned long dst = get_safe_page(GFP_ATOMIC);
>
> if (!dst) {
> rc = -ENOMEM;
> @@ -216,7 +214,7 @@ static int create_safe_exec_page(void *src_start, size_t length,
> memcpy((void *)dst, src_start, length);
> __flush_icache_range(dst, dst + length);
>
> - trans_pgd = allocator(mask);
> + trans_pgd = (void *)get_safe_page(GFP_ATOMIC);
> if (!trans_pgd) {
> rc = -ENOMEM;
> goto out;
> @@ -224,7 +222,7 @@ static int create_safe_exec_page(void *src_start, size_t length,
>
> pgdp = pgd_offset_raw(trans_pgd, dst_addr);
> if (pgd_none(READ_ONCE(*pgdp))) {
> - pudp = allocator(mask);
> + pudp = (void *)get_safe_page(GFP_ATOMIC);
> if (!pudp) {
> rc = -ENOMEM;
> goto out;
> @@ -234,7 +232,7 @@ static int create_safe_exec_page(void *src_start, size_t length,
>
> pudp = pud_offset(pgdp, dst_addr);
> if (pud_none(READ_ONCE(*pudp))) {
> - pmdp = allocator(mask);
> + pmdp = (void *)get_safe_page(GFP_ATOMIC);
> if (!pmdp) {
> rc = -ENOMEM;
> goto out;
> @@ -244,7 +242,7 @@ static int create_safe_exec_page(void *src_start, size_t length,
>
> pmdp = pmd_offset(pudp, dst_addr);
> if (pmd_none(READ_ONCE(*pmdp))) {
> - ptep = allocator(mask);
> + ptep = (void *)get_safe_page(GFP_ATOMIC);
> if (!ptep) {
> rc = -ENOMEM;
> goto out;
> @@ -530,8 +528,7 @@ int swsusp_arch_resume(void)
> */
> rc = create_safe_exec_page(__hibernate_exit_text_start, exit_size,
> (unsigned long)hibernate_exit,
> - &phys_hibernate_exit,
> - (void *)get_safe_page, GFP_ATOMIC);
> + &phys_hibernate_exit);
> if (rc) {
> pr_err("Failed to create safe executable page for hibernate_exit code.\n");
> goto out;
>
next prev parent reply other threads:[~2019-09-10 8:03 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-09 18:12 [PATCH v4 00/17] arm64: MMU enabled kexec relocation Pavel Tatashin
2019-09-09 18:12 ` [PATCH v4 01/17] kexec: quiet down kexec reboot Pavel Tatashin
2019-09-09 18:12 ` [PATCH v4 02/17] arm64: hibernate: pass the allocated pgdp to ttbr0 Pavel Tatashin
2019-09-09 18:12 ` [PATCH v4 03/17] arm64: hibernate: check pgd table allocation Pavel Tatashin
2019-09-09 18:12 ` [PATCH v4 04/17] arm64: hibernate: use get_safe_page directly Pavel Tatashin
2019-09-10 8:03 ` Matthias Brugger [this message]
2019-09-10 9:10 ` Pavel Tatashin
2019-09-09 18:12 ` [PATCH v4 05/17] arm64: hibernate: remove gotos in create_safe_exec_page Pavel Tatashin
2019-09-10 8:21 ` Matthias Brugger
2019-09-10 9:12 ` Pavel Tatashin
2019-09-09 18:12 ` [PATCH v4 06/17] arm64: hibernate: rename dst to page " Pavel Tatashin
2019-09-09 18:12 ` [PATCH v4 07/17] arm64: hibernate: add PUD_SECT_RDONLY Pavel Tatashin
2019-09-09 18:12 ` [PATCH v4 08/17] arm64: hibernate: add trans_pgd public functions Pavel Tatashin
2019-09-09 18:12 ` [PATCH v4 09/17] arm64: hibernate: move page handling function to new trans_pgd.c Pavel Tatashin
2019-09-09 18:12 ` [PATCH v4 10/17] arm64: trans_pgd: make trans_pgd_map_page generic Pavel Tatashin
2019-09-10 8:29 ` Matthias Brugger
2019-09-10 9:20 ` Pavel Tatashin
2019-09-09 18:12 ` [PATCH v4 11/17] arm64: trans_pgd: pass allocator trans_pgd_create_copy Pavel Tatashin
2019-09-09 18:12 ` [PATCH v4 12/17] arm64: trans_pgd: pass NULL instead of init_mm to *_populate functions Pavel Tatashin
2019-09-09 18:12 ` [PATCH v4 13/17] kexec: add machine_kexec_post_load() Pavel Tatashin
2019-09-09 18:12 ` [PATCH v4 14/17] arm64: kexec: move relocation function setup and clean up Pavel Tatashin
2019-09-09 18:12 ` [PATCH v4 15/17] arm64: kexec: add expandable argument to relocation function Pavel Tatashin
2019-09-09 18:12 ` [PATCH v4 16/17] arm64: kexec: configure trans_pgd page table for kexec Pavel Tatashin
2019-09-09 18:12 ` [PATCH v4 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=e2ceb43a-d7bf-e0c6-c3ea-b83c95ba880d@suse.com \
--to=mbrugger@suse.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=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).