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 AE1F8C43381 for ; Thu, 14 Mar 2019 13:52:54 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5BCE02184C for ; Thu, 14 Mar 2019 13:52:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5BCE02184C 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 EC7B98E0003; Thu, 14 Mar 2019 09:52:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E9F858E0001; Thu, 14 Mar 2019 09:52:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D68DF8E0003; Thu, 14 Mar 2019 09:52:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by kanga.kvack.org (Postfix) with ESMTP id 79B908E0001 for ; Thu, 14 Mar 2019 09:52:53 -0400 (EDT) Received: by mail-ed1-f69.google.com with SMTP id t4so2298969eds.1 for ; Thu, 14 Mar 2019 06:52:53 -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=9s60Wk9wneRYIxD8j7SkO36X5RJVNwkj0p0Ufv88kow=; b=p2lve0JBQcIYZXGlsGsv4GknmbDZaCWOuVQwIO6mk/nNK5riHpcR3T9qKtFAXci1lg PCtxr/5xIIz06S81tQDE+0Sxt9uvjmnMU7PBn2o6Wp+iRU0oq6+BFC41Stqum7uGWtUi gbwuL57CJthv7dp+lG+wJ0x/yRs6ieuNk0kvPvnxOCWlK07SeRScXfgLuuSle1niC/1H TzlhbXmUZpEyK8YBLH9DJJyti6TzawXfpuX3rChpE2gBseEGgLwwBX16nn/3iwkhfGFY ePqX1HF/JVmVdilBj8BxxvDgh23PJIBuMdrLlV6X21thvInAwPuaZtIdXEYYjaOl7aAI o5Rg== X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 217.70.183.195 is neither permitted nor denied by best guess record for domain of alex@ghiti.fr) smtp.mailfrom=alex@ghiti.fr X-Gm-Message-State: APjAAAVmUlmCshzE/ccX4kIFffBe70cuigsR6R8TeZUIsSoOCG/IVL2m YuG+2dD21roe1NNAX47ChrUtDmn/xbt3d2IPtd8JIwzqwrVEo96ZfoJVmP8sOJmt6jTP2IgOTjD f/IjdV1sKld5Nh7ICyVmU67Z2k6zUXIB1RM4anQueJh7ZMGBomm0KDLD0/tWlVQs= X-Received: by 2002:a17:906:32ca:: with SMTP id k10mr14218255ejk.115.1552571573029; Thu, 14 Mar 2019 06:52:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqxvfPUZPUIWVFpW1Vk8FYEt0HvDv9ZutA5tH9+D+r6RdjqsZzxPMEjsVrmVzz0D+lqFm/TP X-Received: by 2002:a17:906:32ca:: with SMTP id k10mr14218187ejk.115.1552571571641; Thu, 14 Mar 2019 06:52:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552571571; cv=none; d=google.com; s=arc-20160816; b=ZTGUt2wlnVm59oR/ynYTKrTCKuhdYqLHfREjlK6E76vvi/Q4H/4+Uu2zBYalP2e84B CZ832EZyrdS4bjcJpLzQX1klOqs2FNhbg5u6TjmwM+BPdEAxoIYGpwHeh9cAoyrhhmJa rZkHVRSa5CkJg6bY6voyZ6YtpS+8jbCbccNJtNd3ZW7LSdO2ycu4FT792lm/JJATV++T QVuhYz/aZK4xybuOrH76849xTnv4pytVSnL74mX2nT9pBCv0J4/CIvYeOKZZls/3uLLL uffSo+u3BxsaLK1ZpzfmoXkEJrk8PCTv6MuqpM82AIJM/9VYXR6K0IoHBR4GucMxtc6h mLcg== 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=9s60Wk9wneRYIxD8j7SkO36X5RJVNwkj0p0Ufv88kow=; b=jV0l3GUsFFLQIVDzgKSsczkE9VH8LX3cWVq7yKbwmjdjFGX9J3RyNIkiG53iyX8QYq dWMRZltPJKquDvRvRPn7Kaqtqu2AHw/J6ut2R3yu5gl4ZNVFakWoQxJ6/90yYd9HMvba C2Wc3G/YdLhdOomsZYn75c1G15qfFtZyDr7DLgGwsuzSWDh8RX+wOiSJFXdVzb/Oebwu lAzkftV7pSJVNDzUCFzd3+vXoISfx7MGZAl+YKsr0LUn26uKnoYrEMZCctnM074snjU/ wpMhyF2ci/CyaE390Vw7MZLHlkdT78qWn1IHFBTbhz8MlMvlmp4cvFmx2HhGMDvWAcag LoRw== ARC-Authentication-Results: i=1; mx.google.com; spf=neutral (google.com: 217.70.183.195 is neither permitted nor denied by best guess record for domain of alex@ghiti.fr) smtp.mailfrom=alex@ghiti.fr Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net. [217.70.183.195]) by mx.google.com with ESMTPS id m10si1997521edp.421.2019.03.14.06.52.51 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Mar 2019 06:52:51 -0700 (PDT) Received-SPF: neutral (google.com: 217.70.183.195 is neither permitted nor denied by best guess record for domain of alex@ghiti.fr) client-ip=217.70.183.195; Authentication-Results: mx.google.com; spf=neutral (google.com: 217.70.183.195 is neither permitted nor denied by best guess record for domain of alex@ghiti.fr) smtp.mailfrom=alex@ghiti.fr X-Originating-IP: 81.250.144.103 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 relay3-d.mail.gandi.net (Postfix) with ESMTPSA id D087E60011; Thu, 14 Mar 2019 13:52:41 +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> <972208b7-5c05-cc05-efbf-0d48bff4cf77@linux.ibm.com> From: Alexandre Ghiti Message-ID: Date: Thu, 14 Mar 2019 14:52:41 +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: <972208b7-5c05-cc05-efbf-0d48bff4cf77@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 02:17 PM, Aneesh Kumar K.V wrote: > On 3/14/19 5:13 PM, Alexandre Ghiti wrote: >> 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. You did not answer this question: is freeing boottime gigantic pages "forbidden" or just not needed ? >> 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 > > > The pattern i like is > > #ifndef gigantic_page_supported > #define gigantic_page_supported gigantic_page_supported > > static inline bool gigantic_page_supported(void) > { >         return true; > } > > #endif > > instead of _HAVE_ARCH_GIGANTIC_PAGE_SUPPORTED. > I see, that avoids a new define. However, it is not consistent with the rest of function definitions in generic hugetlb.h. What do you think ? Should I follow the same format ? Or use yours ? > >> +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; >> +       } > > > you should restore other users of gigantic_page_supported() not just > this. That will just make your earlier patch as removing > gigantic_page_supported from every architecture other than ppc64 and > have a generic version as above. > > I'll restore the check in update_and_free_page too depending on your answer to the above question, since adding this check back would not allow to free boottime gigantic pages. >> + >>          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); >> >> >> >> > > -aneesh. >