From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756663AbcBJI45 (ORCPT ); Wed, 10 Feb 2016 03:56:57 -0500 Received: from e34.co.us.ibm.com ([32.97.110.152]:48080 "EHLO e34.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753276AbcBJI4z (ORCPT ); Wed, 10 Feb 2016 03:56:55 -0500 X-IBM-Helo: d03dlp03.boulder.ibm.com X-IBM-MailFrom: aneesh.kumar@linux.vnet.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org From: "Aneesh Kumar K.V" To: David Gibson , mpe@ellerman.id.au, paulus@samba.org, benh@kernel.crashing.org Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, David Gibson Subject: Re: [PATCH 1/4] powerpc/mm: Clean up error handling for htab_remove_mapping In-Reply-To: <1454988763-5580-2-git-send-email-david@gibson.dropbear.id.au> References: <1454988763-5580-1-git-send-email-david@gibson.dropbear.id.au> <1454988763-5580-2-git-send-email-david@gibson.dropbear.id.au> User-Agent: Notmuch/0.20.2 (http://notmuchmail.org) Emacs/24.5.1 (x86_64-pc-linux-gnu) Date: Wed, 10 Feb 2016 14:26:46 +0530 Message-ID: <87a8n9x7sh.fsf@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16021008-0017-0000-0000-000011FA3CDF Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org David Gibson writes: > 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 redundant, 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. > Reviewed-by: Aneesh Kumar K.V > Signed-off-by: David Gibson > --- > 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