From patchwork Tue Aug 22 10:42:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Punit Agrawal X-Patchwork-Id: 9914873 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 AA97D60381 for ; Tue, 22 Aug 2017 10:49:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 89CAF2883C for ; Tue, 22 Aug 2017 10:49:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7C7F92884C; Tue, 22 Aug 2017 10:49:14 +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 086E32883C for ; Tue, 22 Aug 2017 10:49:14 +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=lWGVFGbjBziraJA3FMZVrZYKs4kX/Cmq24RFlCWaVkE=; b=h8rqV5tat8WBAF9PtWOgOJA463 zzxTvcAUO0/oW5HhIodkyaRSCPvw+KbPYYvwYjogWvytxoqr682dO75zEQNnCjb52f7WcY+JQXOov G2L5KZCPsf/5EEzSVyxTEcOmsOuIDFFTdboEmsool29Rb3AwzLN7c4vlFo3UKITzVgUuexK/vJw2X WbVEoTf+j2zHLVu1S0eKKmOJGsNM7DKxghGM7A6qASmUgmJFdpHu2MTgE0nQNgWN2+YUgXZbI2OQ2 kUiy0ZeZDz0pr6rmRpnoMmAwEsjfFS3EUSxYS7++Hc3YKKbfrWE4Xwjo3ny6OcB2jv0/+R2UY9f5b wTr1e9fg==; 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 1dk6kA-0005EW-Hs; Tue, 22 Aug 2017 10:49:10 +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 1dk6gH-0002DZ-Hs for linux-arm-kernel@bombadil.infradead.org; Tue, 22 Aug 2017 10:45:09 +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=AnaO7oLXVP/bP57el7+YQRqk9JrNGKb9C30SakQToYc=; b=oAQDfCpqqmIg0JQD32PG5gcEr m8y+SC1Hpb1HodH6C7wpkIsxaq0xuYEYYs+ISmKHghvZISgm7Y936zHgWB5/wAZxIs0iPpv4Gj+Yk ORF9S46FOkoCOU3BadaKtv9fS3yYslHiwrxs+MH9zgxHQ3ZVOyvDoKhSKz4EkoJN6gppZJduje4eV a+Bt6LVb/AfNqXU5vj+rpd8CZZMN2P/i6vKWKLssluS31zI6DgfNPTpuRG+lQyJmqFPP0JLJNBBts gRDKzJz0QYYS/BpZGws76nDQCShCgFIXdmhW6vSE/EGcBWXFj9bSLD7pXeNwE+MsdxY3KtisvcJoX ZLVhvcjog==; Received: from foss.arm.com ([217.140.101.70]) by merlin.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dk6gE-0008Cf-U3 for linux-arm-kernel@lists.infradead.org; Tue, 22 Aug 2017 10:45:07 +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 55CE8169E; Tue, 22 Aug 2017 03:44:45 -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 EE5EC3F577; Tue, 22 Aug 2017 03:44:44 -0700 (PDT) From: Punit Agrawal To: will.deacon@arm.com, catalin.marinas@arm.com Subject: [PATCH v7 8/9] arm64: Re-enable support for contiguous hugepages Date: Tue, 22 Aug 2017 11:42:48 +0100 Message-Id: <20170822104249.2189-9-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-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 "commit 66b3923a1a0f ("arm64: hugetlb: add support for PTE contiguous bit")""" 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 01f0d7e8a8d8..b5e9c5b5e897 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -410,6 +410,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); @@ -418,3 +422,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