From: David Gibson <david@gibson.dropbear.id.au>
To: paulus@samba.org, mpe@ellerman.id.au, benh@kernel.crashing.org
Cc: linuxppc-dev@lists.ozlabs.org, aik@ozlabs.ru, thuth@redhat.com,
lvivier@redhat.com, David Gibson <david@gibson.dropbear.id.au>
Subject: [RFCv2 2/9] arch/powerpc: Clean up error handling for htab_remove_mapping
Date: Fri, 29 Jan 2016 16:23:56 +1100 [thread overview]
Message-ID: <1454045043-25545-3-git-send-email-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <1454045043-25545-1-git-send-email-david@gibson.dropbear.id.au>
Currently, the only error that htab_remove_mapping() can report is -EINVAL,
if removal of bolted HPTEs isn't implemeted for this platform. We make
a few clean ups to the handling of this:
* EINVAL isn't really the right code - there's nothing wrong with the
function's arguments - use ENODEV instead
* We were also printing a warning message, but that's a decision better
left up to the callers, so remove it
* One caller is vmemmap_remove_mapping(), which will just BUG_ON() on
error, making the warning message irrelevant, so no change is needed
there.
* The other caller is remove_section_mapping(). This is called in the
memory hot remove path at a point after vmemmap_remove_mapping() so
if hpte_removebolted isn't implemented, we'd expect to have already
BUG()ed anyway. Put a WARN_ON() here, in lieu of a printk() since this
really shouldn't be happening.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
arch/powerpc/mm/hash_utils_64.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index ba59d59..9f7d727 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -273,11 +273,8 @@ int htab_remove_mapping(unsigned long vstart, unsigned long vend,
shift = mmu_psize_defs[psize].shift;
step = 1 << shift;
- if (!ppc_md.hpte_removebolted) {
- printk(KERN_WARNING "Platform doesn't implement "
- "hpte_removebolted\n");
- return -EINVAL;
- }
+ if (!ppc_md.hpte_removebolted)
+ return -ENODEV;
for (vaddr = vstart; vaddr < vend; vaddr += step)
ppc_md.hpte_removebolted(vaddr, psize, ssize);
@@ -641,8 +638,10 @@ int create_section_mapping(unsigned long start, unsigned long end)
int remove_section_mapping(unsigned long start, unsigned long end)
{
- return htab_remove_mapping(start, end, mmu_linear_psize,
- mmu_kernel_ssize);
+ int rc = htab_remove_mapping(start, end, mmu_linear_psize,
+ mmu_kernel_ssize);
+ WARN_ON(rc < 0);
+ return rc;
}
#endif /* CONFIG_MEMORY_HOTPLUG */
--
2.5.0
next prev parent reply other threads:[~2016-01-29 5:23 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-29 5:23 [RFCv2 0/9] PAPR hash page table resizing (guest side) David Gibson
2016-01-29 5:23 ` [RFCv2 1/9] memblock: Don't mark memblock_phys_mem_size() as __init David Gibson
2016-02-01 5:50 ` Anshuman Khandual
2016-02-08 2:46 ` Paul Mackerras
2016-01-29 5:23 ` David Gibson [this message]
2016-02-01 5:54 ` [RFCv2 2/9] arch/powerpc: Clean up error handling for htab_remove_mapping Anshuman Khandual
2016-02-08 2:48 ` Paul Mackerras
2016-01-29 5:23 ` [RFCv2 3/9] arch/powerpc: Handle removing maybe-present bolted HPTEs David Gibson
2016-02-01 5:58 ` Anshuman Khandual
2016-02-02 1:08 ` David Gibson
2016-02-02 13:49 ` Denis Kirjanov
2016-02-08 2:54 ` Paul Mackerras
2016-02-09 0:43 ` David Gibson
2016-01-29 5:23 ` [RFCv2 4/9] arch/powerpc: Clean up memory hotplug failure paths David Gibson
2016-02-01 6:29 ` Anshuman Khandual
2016-02-02 15:04 ` Nathan Fontenot
2016-02-03 4:31 ` David Gibson
2016-02-08 5:47 ` Paul Mackerras
2016-01-29 5:23 ` [RFCv2 5/9] arch/powerpc: Split hash page table sizing heuristic into a helper David Gibson
2016-02-01 7:04 ` Anshuman Khandual
2016-02-02 1:04 ` David Gibson
2016-02-04 10:56 ` Anshuman Khandual
2016-02-08 5:57 ` Paul Mackerras
2016-01-29 5:24 ` [RFCv2 6/9] pseries: Add hypercall wrappers for hash page table resizing David Gibson
2016-02-01 7:11 ` Anshuman Khandual
2016-02-02 0:58 ` David Gibson
2016-02-04 11:11 ` Anshuman Khandual
2016-02-07 22:33 ` David Gibson
2016-02-08 5:58 ` Paul Mackerras
2016-01-29 5:24 ` [RFCv2 7/9] pseries: Add support for hash " David Gibson
2016-02-01 8:31 ` Anshuman Khandual
2016-02-01 11:04 ` David Gibson
2016-02-08 5:59 ` Paul Mackerras
2016-01-29 5:24 ` [RFCv2 8/9] pseries: Advertise HPT resizing support via CAS David Gibson
2016-02-01 8:36 ` Anshuman Khandual
2016-02-08 6:00 ` Paul Mackerras
2016-01-29 5:24 ` [RFCv2 9/9] pseries: Automatically resize HPT for memory hot add/remove David Gibson
2016-02-01 8:51 ` Anshuman Khandual
2016-02-01 10:55 ` David Gibson
2016-02-08 6:01 ` Paul Mackerras
2016-02-01 5:50 ` [RFCv2 0/9] PAPR hash page table resizing (guest side) Anshuman Khandual
2016-02-02 0:57 ` David Gibson
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=1454045043-25545-3-git-send-email-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=aik@ozlabs.ru \
--cc=benh@kernel.crashing.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=lvivier@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--cc=thuth@redhat.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).