From patchwork Tue Oct 2 12:15:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anshuman Khandual X-Patchwork-Id: 10623579 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2EC31174A for ; Tue, 2 Oct 2018 12:16:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2520D28885 for ; Tue, 2 Oct 2018 12:16:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1920D2888A; Tue, 2 Oct 2018 12:16:01 +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.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A9F4428885 for ; Tue, 2 Oct 2018 12:16:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8F3E56B0266; Tue, 2 Oct 2018 08:15:59 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8A4E86B0269; Tue, 2 Oct 2018 08:15:59 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 76BBB6B026A; Tue, 2 Oct 2018 08:15:59 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ot1-f69.google.com (mail-ot1-f69.google.com [209.85.210.69]) by kanga.kvack.org (Postfix) with ESMTP id 4F8476B0266 for ; Tue, 2 Oct 2018 08:15:59 -0400 (EDT) Received: by mail-ot1-f69.google.com with SMTP id b5-v6so1150839otk.21 for ; Tue, 02 Oct 2018 05:15:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=dV4ZZ+OF10+FHjmP9McuZUPgFMx4CHiWj171IKMAXew=; b=DX2TeUX97Nj0ExXV3kyQW8nHS7HiGQ88dIam2VYvt2eF1d9IVQjW6r+o/oCw3qIszX 6BcI0ZfcQm/gf7RZ34ukay5hN3qTM61pjnklre1G2Zz84wgGs0HQVAxCap4Iqj62LeSi Wa3FE3D2pGzEoGKy3BGkTQ6dkKjNBC2sfLOooTHH7aYHHpfVNB5DKuZ3OFOcWqS8erdd bMTpVcwDVM6T1pazt51lg/XRK8OeM8/CDPRVLNfC/XYby3u9p0lFIkVsaT5BnE9s7XnW xSFN9BtG3w3CPhYk3kuTJyKgO9I6Kbukyfvz9XB9B1Ptv0+0t0m3Vno9VR1TQw9ETJOd IR7w== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of anshuman.khandual@arm.com designates 217.140.101.70 as permitted sender) smtp.mailfrom=anshuman.khandual@arm.com X-Gm-Message-State: ABuFfojkp4WkiUcstOCUs2MOJlpNpO6braBU07ygmIie0NZzDbk0tEBb ntaybsCyrcx1yHbbPMCwW0g/Rs1Qu+7ThMSMCWxhOrQw6t3sAj4UnNlwRvsuLb7UDiwZHLpow0C 9NlucT5xnd84g9ArBxMR+5zrvY2QzN8zr/mqJJeEZRgG0tOFJUeRglgWtJVyeGtY9nw== X-Received: by 2002:aca:dd08:: with SMTP id u8-v6mr571267oig.94.1538482559100; Tue, 02 Oct 2018 05:15:59 -0700 (PDT) X-Google-Smtp-Source: ACcGV61Y64nEZdqIGt6egYBStbX/1xOjtvDPDl5vrr2NAZYUkPC9NVp+uS9gCdBFAjwJhiJZcEVl X-Received: by 2002:aca:dd08:: with SMTP id u8-v6mr571241oig.94.1538482558367; Tue, 02 Oct 2018 05:15:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538482558; cv=none; d=google.com; s=arc-20160816; b=N7Miwm8uUErNmkbM/6btuvzOBF4vAVbwpdreU4Z/EI24/wOpuw/NXqK4otbtXh1r5E GcWlUyPt/KC5um9EbMoKPbSB6kpAgIgPLKAhTf3DqrYebK8y71t1hA2EgqGnvHH86EDD r0eDqqPD4kLoO8GXWaQn3/yph4QcNr4ZWRI9yarC4yXUWD7HKjHSUFyPoE9qCb6/2/Zc BLPK7QjVdCbyRIv2EqJDLsYQNYP2Sa81tKbj/5VqcUnxg+iXisJN0iGan1p3my5qU4Sy OgW9IOg2j4xylnMF3b2QeXcxmbSH8eJjSKsNBqh8TMZaFYwVWqDHE9TBeGRBZ0Up6Yl0 A6nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=dV4ZZ+OF10+FHjmP9McuZUPgFMx4CHiWj171IKMAXew=; b=UHIrJl3aSz1zm84cM/VWzOjy39ath5hxumbu0s/38DAvdgVT75vgXsD1ccb4PFfI6x LBCUK/6YrqRtQdc9DolEdHphX3g49HNd6JxHPZ8NVrzNVpsSJw5MRldaGPvHxWABhGTN dnuxi0Zpj6tD8h2LNrCRW7sT1DYVJJXiLsNv+a2c/hDI5Ib5U7i3GLbY2t8PVGBcdl4n +NEkU2cPSiR7n6WA2dRC+B3TovmDhylqfnCfIbP+DM2ql27wMe6tBZ0xcmMlVp1EZwmQ D/OuAYvY2T6TON/dmvzQtI6A9FILKvzNRDcMNcjyvmfU5U+8tyNlfzqs1LLaTUUbRvGT A/Pw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of anshuman.khandual@arm.com designates 217.140.101.70 as permitted sender) smtp.mailfrom=anshuman.khandual@arm.com Received: from foss.arm.com (foss.arm.com. [217.140.101.70]) by mx.google.com with ESMTP id a62-v6si7632488otc.86.2018.10.02.05.15.58 for ; Tue, 02 Oct 2018 05:15:58 -0700 (PDT) Received-SPF: pass (google.com: domain of anshuman.khandual@arm.com designates 217.140.101.70 as permitted sender) client-ip=217.140.101.70; Authentication-Results: mx.google.com; spf=pass (google.com: domain of anshuman.khandual@arm.com designates 217.140.101.70 as permitted sender) smtp.mailfrom=anshuman.khandual@arm.com 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 F34F71682; Tue, 2 Oct 2018 05:15:57 -0700 (PDT) Received: from p8cg001049571a15.arm.com (unknown [10.163.1.117]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 28E553F5B7; Tue, 2 Oct 2018 05:15:53 -0700 (PDT) From: Anshuman Khandual To: linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: suzuki.poulose@arm.com, punit.agrawal@arm.com, will.deacon@arm.com, Steven.Price@arm.com, catalin.marinas@arm.com, mhocko@kernel.org, mike.kravetz@oracle.com, n-horiguchi@ah.jp.nec.com Subject: [PATCH 4/4] arm64/mm: Enable HugeTLB migration for contiguous bit HugeTLB pages Date: Tue, 2 Oct 2018 17:45:31 +0530 Message-Id: <1538482531-26883-5-git-send-email-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1538482531-26883-1-git-send-email-anshuman.khandual@arm.com> References: <1538482531-26883-1-git-send-email-anshuman.khandual@arm.com> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Let arm64 subscribe to the previously added framework in which architecture can inform whether a given huge page size is supported for migration. This just overrides the default function arch_hugetlb_migration_supported() and enables migration for all possible HugeTLB page sizes on arm64. With this, HugeTLB migration support on arm64 now covers all possible HugeTLB options. CONT PTE PMD CONT PMD PUD -------- --- -------- --- 4K: 64K 2M 32M 1G 16K: 2M 32M 1G 64K: 2M 512M 16G Signed-off-by: Anshuman Khandual --- arch/arm64/include/asm/hugetlb.h | 5 +++++ arch/arm64/mm/hugetlbpage.c | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/arch/arm64/include/asm/hugetlb.h b/arch/arm64/include/asm/hugetlb.h index e73f685..656f70e 100644 --- a/arch/arm64/include/asm/hugetlb.h +++ b/arch/arm64/include/asm/hugetlb.h @@ -20,6 +20,11 @@ #include +#ifdef CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION +#define arch_hugetlb_migration_supported arch_hugetlb_migration_supported +extern bool arch_hugetlb_migration_supported(struct hstate *h); +#endif + static inline pte_t huge_ptep_get(pte_t *ptep) { return READ_ONCE(*ptep); diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 4eafd9f..28f4795 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -27,6 +27,26 @@ #include #include +#ifdef CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION +bool arch_hugetlb_migration_supported(struct hstate *h) +{ + size_t pagesize = huge_page_size(h); + + switch (pagesize) { +#ifdef CONFIG_ARM64_4K_PAGES + case PUD_SIZE: +#endif + case PMD_SIZE: + case CONT_PMD_SIZE: + case CONT_PTE_SIZE: + return true; + } + pr_warn("%s: unrecognized huge page size 0x%lx\n", + __func__, pagesize); + return false; +} +#endif + int pmd_huge(pmd_t pmd) { return pmd_val(pmd) && !(pmd_val(pmd) & PMD_TABLE_BIT);