From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9743EC43381 for ; Thu, 14 Mar 2019 11:44:07 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 182332184C for ; Thu, 14 Mar 2019 11:44:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 182332184C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ghiti.fr Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id AE3538E0003; Thu, 14 Mar 2019 07:44:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A90A88E0001; Thu, 14 Mar 2019 07:44:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9593E8E0003; Thu, 14 Mar 2019 07:44:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by kanga.kvack.org (Postfix) with ESMTP id 3BFB78E0001 for ; Thu, 14 Mar 2019 07:44:05 -0400 (EDT) Received: by mail-ed1-f70.google.com with SMTP id r7so2238227eds.18 for ; Thu, 14 Mar 2019 04:44:05 -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:subject:to :references:from:message-id:date:user-agent:mime-version:in-reply-to :content-transfer-encoding:content-language; bh=V+Y/CITrpVm8+YQbiDpJkDwB+caOdkgx9ndtaCYizto=; b=GgVvaGdPKqRjB9w61HP3sU1p/8BBxMIMUhuwBh6foIGdD8SiF3ah2wjV1LjmcmfRU6 L89Ldu/+WvAXMIik34R7sMLArTtUDFO08KSYa7J3Yr5m7roG/N553CftV9wvaW9BTfBL sKGy7HXk2OvmH1utA1CnyckHlDB2kYg0rCR+DBN8rnRBqJlfBWXnw+BqRXv/zwXkI+pf /z25q2h1tlAcdVgKh0cc+94ZPLX/lxXbjQRMJbgEp2yjKwkX0Z0NUC+eX5jtN6xpOGJt Ho1ewuCFZkKQiWZ/p7xcXrkiJdofngGJA0GZUUxD5ez4HM55RPKO7AFRymrXVY/VSL7+ xxpg== X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 217.70.178.231 is neither permitted nor denied by best guess record for domain of alex@ghiti.fr) smtp.mailfrom=alex@ghiti.fr X-Gm-Message-State: APjAAAWZdEX4tCpk70efYa41B3K37rNppsQyUxYEsktoSSCTGVX8KPkD C9bjQwBEj8KK3MKDItVSNwlI7jtR3AWGgESEeYJa6/7rX91Yz3Q3I4f6K6qE+QLKzIokkyXP/al gT8Z3XQulWnVJnXNLew531dnQuHZciGOt6ByiiIq4m/Oa7rajJZfXXzXKjeHWZN4= X-Received: by 2002:aa7:c149:: with SMTP id r9mr11383683edp.232.1552563844761; Thu, 14 Mar 2019 04:44:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqxIKM/INlUaP8Xih2kqbwbYpb/vPu3FWgvx1hsWwoNNkf6zrbZfn9aZYURIlNUUmwDY3V+2 X-Received: by 2002:aa7:c149:: with SMTP id r9mr11383613edp.232.1552563843582; Thu, 14 Mar 2019 04:44:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552563843; cv=none; d=google.com; s=arc-20160816; b=RhWbixyW1G1ZwOfV9SC+QfZiuy4zL4d3DDCrznF6V7YEKs54JTFj37b0y/SQkP3CYq 0pmno366jVOfd9sidw+vZTXV7tckjvGM8y01P/WrS3+KaApro1kS6cCL4hJhec++vf6w JjV9mGM4PKZPTGuGuc07VMEcRsTboBqQWlxbeqaZ92kQMICRkYLggsncluRa79lSqDSe jwkIiG156sROxtJ4hSmiTSbNoxNSguWXSGFlp7jrBFhhUMnwwph7Jts94NtPWSTGzOOs sqL+StqStbtjp5LV/ou3Gge8WPWj5sHV7pktL2gSifdfQsXDW/VOvkK7ZnRZtKdX8bL4 IDnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-language:content-transfer-encoding:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject; bh=V+Y/CITrpVm8+YQbiDpJkDwB+caOdkgx9ndtaCYizto=; b=OWFnECtRzqS7E3a8JQipI0W8ZgVziBqh9FqSzJRMwIc/xKb/FbMw1fstQftQOADLz5 bhOvSOd1sHeMWZY5vPLSolxF2N6v3+zj1Bk6UOowZ5JX7IvqFDGNPS1isuOB9lixmwW1 MuGT3HRtMCDtvUlKzSeAiiVh8nudFBLVe3FZMsGLOJ0HWBYvpuxgRKC0/3IIsDSj7nah qgevpxl+CVb7UruD2HrHPu71CZ9ei0C8LK67oXYQXuO4U24orkOhfcDkI11fYNn7w1BN GW/w12yNYL4ffO0EXhMdiCCiiC6yBvSlqn0xfm4fACBctXJjnq71HJBK8hODrNZJwvBA lIyw== ARC-Authentication-Results: i=1; mx.google.com; spf=neutral (google.com: 217.70.178.231 is neither permitted nor denied by best guess record for domain of alex@ghiti.fr) smtp.mailfrom=alex@ghiti.fr Received: from relay11.mail.gandi.net (relay11.mail.gandi.net. [217.70.178.231]) by mx.google.com with ESMTPS id f20si1860777edd.56.2019.03.14.04.44.03 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Mar 2019 04:44:03 -0700 (PDT) Received-SPF: neutral (google.com: 217.70.178.231 is neither permitted nor denied by best guess record for domain of alex@ghiti.fr) client-ip=217.70.178.231; Authentication-Results: mx.google.com; spf=neutral (google.com: 217.70.178.231 is neither permitted nor denied by best guess record for domain of alex@ghiti.fr) smtp.mailfrom=alex@ghiti.fr Received: from [10.30.1.20] (lneuilly-657-1-5-103.w81-250.abo.wanadoo.fr [81.250.144.103]) (Authenticated sender: alex@ghiti.fr) by relay11.mail.gandi.net (Postfix) with ESMTPSA id A44A6100009; Thu, 14 Mar 2019 11:43:51 +0000 (UTC) Subject: Re: [PATCH v6 4/4] hugetlb: allow to free gigantic pages regardless of the configuration To: "Aneesh Kumar K.V" , Andrew Morton , Vlastimil Babka , Catalin Marinas , Will Deacon , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Martin Schwidefsky , Heiko Carstens , Yoshinori Sato , Rich Felker , "David S . Miller" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H . Peter Anvin" , x86@kernel.org, Dave Hansen , Andy Lutomirski , Peter Zijlstra , Mike Kravetz , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-mm@kvack.org References: <20190307132015.26970-1-alex@ghiti.fr> <20190307132015.26970-5-alex@ghiti.fr> <87va0movdh.fsf@linux.ibm.com> From: Alexandre Ghiti Message-ID: Date: Thu, 14 Mar 2019 12:43:51 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 MIME-Version: 1.0 In-Reply-To: <87va0movdh.fsf@linux.ibm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: fr 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: On 03/14/2019 06:52 AM, Aneesh Kumar K.V wrote: > Alexandre Ghiti writes: > >> On systems without CONTIG_ALLOC activated but that support gigantic pages, >> boottime reserved gigantic pages can not be freed at all. This patch >> simply enables the possibility to hand back those pages to memory >> allocator. >> >> Signed-off-by: Alexandre Ghiti >> Acked-by: David S. Miller [sparc] >> --- >> arch/arm64/Kconfig | 2 +- >> arch/arm64/include/asm/hugetlb.h | 4 -- >> arch/powerpc/include/asm/book3s/64/hugetlb.h | 7 --- >> arch/powerpc/platforms/Kconfig.cputype | 2 +- >> arch/s390/Kconfig | 2 +- >> arch/s390/include/asm/hugetlb.h | 3 -- >> arch/sh/Kconfig | 2 +- >> arch/sparc/Kconfig | 2 +- >> arch/x86/Kconfig | 2 +- >> arch/x86/include/asm/hugetlb.h | 4 -- >> include/linux/gfp.h | 2 +- >> mm/hugetlb.c | 57 ++++++++++++-------- >> mm/page_alloc.c | 4 +- >> 13 files changed, 44 insertions(+), 49 deletions(-) >> >> diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig >> index 091a513b93e9..af687eff884a 100644 >> --- a/arch/arm64/Kconfig >> +++ b/arch/arm64/Kconfig >> @@ -18,7 +18,7 @@ config ARM64 >> select ARCH_HAS_FAST_MULTIPLIER >> select ARCH_HAS_FORTIFY_SOURCE >> select ARCH_HAS_GCOV_PROFILE_ALL >> - select ARCH_HAS_GIGANTIC_PAGE if CONTIG_ALLOC >> + select ARCH_HAS_GIGANTIC_PAGE >> select ARCH_HAS_KCOV >> select ARCH_HAS_MEMBARRIER_SYNC_CORE >> select ARCH_HAS_PTE_SPECIAL >> diff --git a/arch/arm64/include/asm/hugetlb.h b/arch/arm64/include/asm/hugetlb.h >> index fb6609875455..59893e766824 100644 >> --- a/arch/arm64/include/asm/hugetlb.h >> +++ b/arch/arm64/include/asm/hugetlb.h >> @@ -65,8 +65,4 @@ extern void set_huge_swap_pte_at(struct mm_struct *mm, unsigned long addr, >> >> #include >> >> -#ifdef CONFIG_ARCH_HAS_GIGANTIC_PAGE >> -static inline bool gigantic_page_supported(void) { return true; } >> -#endif >> - >> #endif /* __ASM_HUGETLB_H */ >> diff --git a/arch/powerpc/include/asm/book3s/64/hugetlb.h b/arch/powerpc/include/asm/book3s/64/hugetlb.h >> index 5b0177733994..d04a0bcc2f1c 100644 >> --- a/arch/powerpc/include/asm/book3s/64/hugetlb.h >> +++ b/arch/powerpc/include/asm/book3s/64/hugetlb.h >> @@ -32,13 +32,6 @@ static inline int hstate_get_psize(struct hstate *hstate) >> } >> } >> >> -#ifdef CONFIG_ARCH_HAS_GIGANTIC_PAGE >> -static inline bool gigantic_page_supported(void) >> -{ >> - return true; >> -} >> -#endif >> - >> /* hugepd entry valid bit */ >> #define HUGEPD_VAL_BITS (0x8000000000000000UL) >> > As explained in https://patchwork.ozlabs.org/patch/1047003/ > architectures like ppc64 have a hypervisor assisted mechanism to indicate > where to find gigantic huge pages(16G pages). At this point, we don't use this > reserved pages for anything other than hugetlb backing and hence there > is no runtime free of this pages needed ( Also we don't do > runtime allocation of them). > > I guess you can still achieve what you want to do in this patch by > keeping gigantic_page_supported()? > > NOTE: We should rename gigantic_page_supported to be more specific to > support for runtime_alloc/free of gigantic pages > > -aneesh > Thanks for noticing Aneesh. I can't find a better solution than bringing back gigantic_page_supported check, since it is must be done at runtime in your case. I'm not sure of one thing though: you say that freeing boottime gigantic pages is not needed, but is it forbidden ? Just to know where the check and what its new name should be. Is something like that (on top of this series) ok for you (and everyone else) before I send a v7: diff --git a/arch/powerpc/include/asm/book3s/64/hugetlb.h b/arch/powerpc/include/asm/book3s/64/hugetlb.h index d04a0bc..d121559 100644 --- a/arch/powerpc/include/asm/book3s/64/hugetlb.h +++ b/arch/powerpc/include/asm/book3s/64/hugetlb.h @@ -35,4 +35,20 @@ static inline int hstate_get_psize(struct hstate *hstate)  /* hugepd entry valid bit */  #define HUGEPD_VAL_BITS                (0x8000000000000000UL) +#ifdef CONFIG_ARCH_HAS_GIGANTIC_PAGE +#define __HAVE_ARCH_GIGANTIC_PAGE_SUPPORTED +static inline bool gigantic_page_supported(void) +{ +       /* +        * We used gigantic page reservation with hypervisor assist in some case. +        * We cannot use runtime allocation of gigantic pages in those platforms +        * This is hash translation mode LPARs. +        */ +       if (firmware_has_feature(FW_FEATURE_LPAR) && !radix_enabled()) +               return false; + +       return true; +} +#endif +  #endif diff --git a/include/asm-generic/hugetlb.h b/include/asm-generic/hugetlb.h index 71d7b77..7d12e73 100644 --- a/include/asm-generic/hugetlb.h +++ b/include/asm-generic/hugetlb.h @@ -126,4 +126,18 @@ static inline pte_t huge_ptep_get(pte_t *ptep)  }  #endif +#ifndef __HAVE_ARCH_GIGANTIC_PAGE_SUPPORTED +#ifdef CONFIG_ARCH_HAS_GIGANTIC_PAGE +static inline bool gigantic_page_supported(void) +{ +        return true; +} +#else +static inline bool gigantic_page_supported(void) +{ +        return false; +} +#endif /* CONFIG_ARCH_HAS_GIGANTIC_PAGE */ +#endif /* __HAVE_ARCH_GIGANTIC_PAGE_SUPPORTED */ +  #endif /* _ASM_GENERIC_HUGETLB_H */ diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 9fc96ef..cfbbafe 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2425,6 +2425,11 @@ static ssize_t __nr_hugepages_store_common(bool obey_mempolicy,         int err;         NODEMASK_ALLOC(nodemask_t, nodes_allowed, GFP_KERNEL | __GFP_NORETRY); +       if (hstate_is_gigantic(h) && !gigantic_page_supported()) { +               err = -EINVAL; +               goto out; +       } +         if (nid == NUMA_NO_NODE) {                 /*                  * global hstate attribute @@ -2446,6 +2451,7 @@ static ssize_t __nr_hugepages_store_common(bool obey_mempolicy,         err = set_max_huge_pages(h, count, nodes_allowed); +out:         if (nodes_allowed != &node_states[N_MEMORY])                 NODEMASK_FREE(nodes_allowed);