From patchwork Tue Aug 22 10:42:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Punit Agrawal X-Patchwork-Id: 9914885 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2DF8E603F9 for ; Tue, 22 Aug 2017 11:02:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0FB8F28844 for ; Tue, 22 Aug 2017 11:02:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0361428865; Tue, 22 Aug 2017 11:02:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7F2DA28844 for ; Tue, 22 Aug 2017 11:02:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=r7nVR+iu16C+hMWVOgi7fHBLZlnDxPKOgFOK6SSPIJE=; b=qxiYtp4XVeBMPsyPVqiyB/NWuD wXrnHZwKnSFeyWX2osNFQftb+ueKRTJg4ZDZgPHpooeTd49JwbNB9ijryIXOJ9LcO/6W0WOMy5cIt doAG8uhh3DTiFTzz7Y7SybNT4lQ/0RxahiEl/nBzUqcQ9Tkn28LPFUaGgkyMoOgxg7eM7RP1HHOLM DYTe5hMWiR7wZTNaLiGwz+VF0xteg6l4fqBQqsJDa8W//BdSwYb6kgWSipNz9Rg6146I1jhhHHnda CB0qhgbmjG206opqdFThgmWPGJvxikS7JBrZGlL48J6AnvX59SA+18GSLVm3Jv37ksp9S+y05bh1t wGaB+T1w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dk6x0-0005rV-Qb; Tue, 22 Aug 2017 11:02:26 +0000 Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dk6wh-0005TS-HB for linux-arm-kernel@bombadil.infradead.org; Tue, 22 Aug 2017 11:02:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=gBR0yGuGAW426i+7op+LucrrV2DsKo3UYPTAZm+tyTw=; b=cduGO5Gcn32EdviTkMN1DJA/k 55nNcHqTahsRHf3Ez7Lb4pI6gsBJSEgRWVZNsfXp5EJkKMNg/uUTARnBK+IngqY7CNl+ZAE7ldMET JQjkSE0pp+c3OzgZ9MLOrHLr6d3Nu+bZwewllWkvvzYKHAMr8YSssyBABW8aYNn+S/6Q828pVWN8W MIBOZzIkLcLk2LY0sImamYnPbzNKJyt7I8h1DK+Ei6j08k43EvjhT6l4r58kw54XRaD9JxF6T/Mkg DhLeRHiZeYa5WEFz2j0y5eFc8c1J9h0/C/Uncbymi78kxAZTrU1/8T/7KYblkxHQskT6d6F025qCG jZf4vKY1A==; Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70] helo=foss.arm.com) by casper.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dk6gE-0003yv-Gd for linux-arm-kernel@lists.infradead.org; Tue, 22 Aug 2017 10:45:08 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 49F98169F; Tue, 22 Aug 2017 03:44:49 -0700 (PDT) Received: from localhost (e105922-lin.cambridge.arm.com [10.1.206.107]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E28CD3F577; Tue, 22 Aug 2017 03:44:48 -0700 (PDT) From: Punit Agrawal To: will.deacon@arm.com, catalin.marinas@arm.com Subject: [PATCH v7 9/9] arm64: hugetlb: Cleanup setup_hugepagesz Date: Tue, 22 Aug 2017 11:42:49 +0100 Message-Id: <20170822104249.2189-10-punit.agrawal@arm.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170822104249.2189-1-punit.agrawal@arm.com> References: <20170822104249.2189-1-punit.agrawal@arm.com> X-ARM-No-Footer: FoSSMail X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170822_114506_699490_8E1643BD X-CRM114-Status: GOOD ( 10.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, David Woods , Steve Capper , Punit Agrawal , stable@vger.kernel.org, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Steve Capper Replace a lot of if statements with switch and case labels to make it much clearer which huge page sizes are supported. Also, we prevent PUD_SIZE from being used on systems not running with 4KB PAGE_SIZE. Before if one supplied PUD_SIZE in these circumstances, then unusuable huge page sizes would be in use. Fixes: 084bd29810a5 ("ARM64: mm: HugeTLB support.") Cc: David Woods Cc: Signed-off-by: Steve Capper Signed-off-by: Punit Agrawal Reviewed-by: Mark Rutland --- arch/arm64/mm/hugetlbpage.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index b5e9c5b5e897..19f6604018dd 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -406,20 +406,20 @@ static __init int setup_hugepagesz(char *opt) { unsigned long ps = memparse(opt, &opt); - if (ps == PMD_SIZE) { - hugetlb_add_hstate(PMD_SHIFT - PAGE_SHIFT); - } else if (ps == PUD_SIZE) { - hugetlb_add_hstate(PUD_SHIFT - PAGE_SHIFT); - } else if (ps == (PAGE_SIZE * CONT_PTES)) { - hugetlb_add_hstate(CONT_PTE_SHIFT); - } else if (ps == (PMD_SIZE * CONT_PMDS)) { - hugetlb_add_hstate((PMD_SHIFT + CONT_PMD_SHIFT) - PAGE_SHIFT); - } else { - hugetlb_bad_size(); - pr_err("hugepagesz: Unsupported page size %lu K\n", ps >> 10); - return 0; + switch (ps) { +#ifdef CONFIG_ARM64_4K_PAGES + case PUD_SIZE: +#endif + case PMD_SIZE * CONT_PMDS: + case PMD_SIZE: + case PAGE_SIZE * CONT_PTES: + hugetlb_add_hstate(ilog2(ps) - PAGE_SHIFT); + return 1; } - return 1; + + hugetlb_bad_size(); + pr_err("hugepagesz: Unsupported page size %lu K\n", ps >> 10); + return 0; } __setup("hugepagesz=", setup_hugepagesz);