From: Pavel Tatashin <pasha.tatashin@soleen.com>
To: 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,
matthias.bgg@gmail.com, bhsharma@redhat.com, linux-mm@kvack.org,
mark.rutland@arm.com
Subject: [PATCH v5 05/17] arm64: hibernate: remove gotos as they are not needed
Date: Mon, 23 Sep 2019 16:34:15 -0400 [thread overview]
Message-ID: <20190923203427.294286-6-pasha.tatashin@soleen.com> (raw)
In-Reply-To: <20190923203427.294286-1-pasha.tatashin@soleen.com>
Usually, gotos are used to handle cleanup after exception, but in case of
create_safe_exec_page and swsusp_arch_resume there are no clean-ups. So,
simply return the errors directly.
Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com>
Reviewed-by: James Morse <james.morse@arm.com>
---
arch/arm64/kernel/hibernate.c | 49 ++++++++++++-----------------------
1 file changed, 17 insertions(+), 32 deletions(-)
diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c
index 34297716643f..83c41a2f8400 100644
--- a/arch/arm64/kernel/hibernate.c
+++ b/arch/arm64/kernel/hibernate.c
@@ -198,7 +198,6 @@ static int create_safe_exec_page(void *src_start, size_t length,
unsigned long dst_addr,
phys_addr_t *phys_dst_addr)
{
- int rc = 0;
pgd_t *trans_pgd;
pgd_t *pgdp;
pud_t *pudp;
@@ -206,47 +205,37 @@ static int create_safe_exec_page(void *src_start, size_t length,
pte_t *ptep;
unsigned long dst = get_safe_page(GFP_ATOMIC);
- if (!dst) {
- rc = -ENOMEM;
- goto out;
- }
+ if (!dst)
+ return -ENOMEM;
memcpy((void *)dst, src_start, length);
__flush_icache_range(dst, dst + length);
trans_pgd = (void *)get_safe_page(GFP_ATOMIC);
- if (!trans_pgd) {
- rc = -ENOMEM;
- goto out;
- }
+ if (!trans_pgd)
+ return -ENOMEM;
pgdp = pgd_offset_raw(trans_pgd, dst_addr);
if (pgd_none(READ_ONCE(*pgdp))) {
pudp = (void *)get_safe_page(GFP_ATOMIC);
- if (!pudp) {
- rc = -ENOMEM;
- goto out;
- }
+ if (!pudp)
+ return -ENOMEM;
pgd_populate(&init_mm, pgdp, pudp);
}
pudp = pud_offset(pgdp, dst_addr);
if (pud_none(READ_ONCE(*pudp))) {
pmdp = (void *)get_safe_page(GFP_ATOMIC);
- if (!pmdp) {
- rc = -ENOMEM;
- goto out;
- }
+ if (!pmdp)
+ return -ENOMEM;
pud_populate(&init_mm, pudp, pmdp);
}
pmdp = pmd_offset(pudp, dst_addr);
if (pmd_none(READ_ONCE(*pmdp))) {
ptep = (void *)get_safe_page(GFP_ATOMIC);
- if (!ptep) {
- rc = -ENOMEM;
- goto out;
- }
+ if (!ptep)
+ return -ENOMEM;
pmd_populate_kernel(&init_mm, pmdp, ptep);
}
@@ -272,8 +261,7 @@ static int create_safe_exec_page(void *src_start, size_t length,
*phys_dst_addr = virt_to_phys((void *)dst);
-out:
- return rc;
+ return 0;
}
#define dcache_clean_range(start, end) __flush_dcache_area(start, (end - start))
@@ -482,7 +470,7 @@ static int copy_page_tables(pgd_t *dst_pgdp, unsigned long start,
*/
int swsusp_arch_resume(void)
{
- int rc = 0;
+ int rc;
void *zero_page;
size_t exit_size;
pgd_t *tmp_pg_dir;
@@ -498,12 +486,11 @@ int swsusp_arch_resume(void)
tmp_pg_dir = (pgd_t *)get_safe_page(GFP_ATOMIC);
if (!tmp_pg_dir) {
pr_err("Failed to allocate memory for temporary page tables.\n");
- rc = -ENOMEM;
- goto out;
+ return -ENOMEM;
}
rc = copy_page_tables(tmp_pg_dir, PAGE_OFFSET, PAGE_END);
if (rc)
- goto out;
+ return rc;
/*
* We need a zero page that is zero before & after resume in order to
@@ -512,8 +499,7 @@ int swsusp_arch_resume(void)
zero_page = (void *)get_safe_page(GFP_ATOMIC);
if (!zero_page) {
pr_err("Failed to allocate zero page.\n");
- rc = -ENOMEM;
- goto out;
+ return -ENOMEM;
}
/*
@@ -531,7 +517,7 @@ int swsusp_arch_resume(void)
&phys_hibernate_exit);
if (rc) {
pr_err("Failed to create safe executable page for hibernate_exit code.\n");
- goto out;
+ return rc;
}
/*
@@ -558,8 +544,7 @@ int swsusp_arch_resume(void)
resume_hdr.reenter_kernel, restore_pblist,
resume_hdr.__hyp_stub_vectors, virt_to_phys(zero_page));
-out:
- return rc;
+ return 0;
}
int hibernate_resume_nonboot_cpu_disable(void)
--
2.23.0
next prev parent reply other threads:[~2019-09-23 20:34 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 ` Pavel Tatashin [this message]
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
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=20190923203427.294286-6-pasha.tatashin@soleen.com \
--to=pasha.tatashin@soleen.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=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).