From patchwork Wed Aug 2 09:49:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Punit Agrawal X-Patchwork-Id: 9876483 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 EEDCC60390 for ; Wed, 2 Aug 2017 09:52:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D583F28795 for ; Wed, 2 Aug 2017 09:52:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C7CD428794; Wed, 2 Aug 2017 09:52:20 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE 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 4623C28794 for ; Wed, 2 Aug 2017 09:52:20 +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=Bh5+YCi1E6ACtw5SwOMcqS+RIy9rGt7c64nd4QqYgKg=; b=JzYdR11wN3ikUbyjuoXfelK5/U L0u+1emNvyYz7H9bySgn4PW4Gh8TUJyFsDOPWyE4+LNqj9gXVV/GjjuHRkc3aWzAvl6YcysjmHj01 tNqDSRHXju85KV0X/+yyL9d/+WwotNCVxn4w1S4+MOwfS1BR70kLDksH4TFYQ6SHGknqQp/L2iYCa p7FYgmq5Bg+AsQ6ocf8fgqQuTDBY1kK0NikY4fUHItVYgblhbVua868423+wDLeJ4Fukgeu/WJI5V 2Gtz23ohzVe/VSagTXzvPPTq9k7jBsWOlw+zousUJ5EwGnOXTj1JvNTePoWV2gaibBfRi8OwGWfWS Jc+y/gHg==; 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 1dcqK7-0002U7-U8; Wed, 02 Aug 2017 09:52:15 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dcqJi-0002Cu-NO for linux-arm-kernel@bombadil.infradead.org; Wed, 02 Aug 2017 09:51:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.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=X1kRSy2BUxKvLFE31a3HYS+22dNL4xmcxAnv4eW/Xt0=; b=R30C5x9/JzWOWTLVA+buAA9gM M0cv7XHhpqpNk3IkeyuayPDEgTqrkIwT5ZmlROCA4vs3lHc2d2RV5qP27pWhSmWwnSARjZ2+cg7r0 GsGdrfMKK1jjJlAJ1pBVRWmPGkRSZXRk1o6VnQhz8zRoK/bC8h7b9p8O7E5AUjOzc6Kj4Vky+NoaU wZ8qEl3jZLZMKa4eJ+H/E0+99kGSVfc6PlCj0G2ysxVOyDnASV8XZDlsmzyael8BkoktA6+UZ6Afy u7LhQ4DHu+VrvHGb3C4gxG5B+n05C5KKBSlIOLJDoTZUcnvkZywgCHPrRLxSRqVXMr3U4A1qiF0M/ ris7/J0XA==; Received: from foss.arm.com ([217.140.101.70]) by merlin.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dcqJc-0001sG-Fr for linux-arm-kernel@lists.infradead.org; Wed, 02 Aug 2017 09:51:45 +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 E2D9F15B2; Wed, 2 Aug 2017 02:51:22 -0700 (PDT) Received: from localhost (e105922-lin.cambridge.arm.com [10.1.207.56]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 61A713F3E1; Wed, 2 Aug 2017 02:51:22 -0700 (PDT) From: Punit Agrawal To: will.deacon@arm.com, catalin.marinas@arm.com Subject: [PATCH v5 8/9] arm64: Re-enable support for contiguous hugepages Date: Wed, 2 Aug 2017 10:49:03 +0100 Message-Id: <20170802094904.27749-9-punit.agrawal@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170802094904.27749-1-punit.agrawal@arm.com> References: <20170802094904.27749-1-punit.agrawal@arm.com> X-ARM-No-Footer: FoSSMail 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, linux-mm@kvack.org, Punit Agrawal , linux-arm-kernel@lists.infradead.org, steve.capper@arm.com 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 also known as - Revert "Revert "Revert "arm64: hugetlb: partial revert of 66b3923a1a0f""" Now that our hugetlb implementation is compliant with the break-before-make requirements of the architecture and we have addressed some of the issues in core code required for properly dealing with hardware poisoning of contiguous hugepages let's re-enable support for contiguous hugepages. This reverts commit 6ae979ab39a368c18ceb0424bf824d172d6ab56f. Signed-off-by: Punit Agrawal --- arch/arm64/mm/hugetlbpage.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 3e78673b1bcb..a10dfbd0ffd5 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -385,6 +385,10 @@ static __init int setup_hugepagesz(char *opt) 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); @@ -393,3 +397,13 @@ static __init int setup_hugepagesz(char *opt) return 1; } __setup("hugepagesz=", setup_hugepagesz); + +#ifdef CONFIG_ARM64_64K_PAGES +static __init int add_default_hugepagesz(void) +{ + if (size_to_hstate(CONT_PTES * PAGE_SIZE) == NULL) + hugetlb_add_hstate(CONT_PTE_SHIFT); + return 0; +} +arch_initcall(add_default_hugepagesz); +#endif