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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 B58E0C43381 for ; Thu, 14 Mar 2019 05:42:27 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 87F56217F5 for ; Thu, 14 Mar 2019 05:42:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="pb4PVEA6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 87F56217F5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Message-Id:MIME-Version:Date:References :In-Reply-To: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=OLuaRPiSrCCKoqA43P/ue6B7dcCls+DuYxsNL+WTD6E=; b=pb4PVEA67K9H6B n89YfSRPG+j/zl5PXbjmtm3dj9b4P7LMxdTVV/at5NR4EejPDqeZwAJmAl8A25YYcFsAm5i4YaNcb XcGlihKmqnHBsXLxDLL4mwGePrefpMvol3GlysmaPnEfxUmksbT6vgAXLk1hwj47iSKsrDo5n/4gJ 3sMlM59HJ17GxzZ+7FqE60fhw3trbNJkNPPub94YWlcWQ+obfzERPqCy0PETq31Eq1Era0teLvME2 OSN1vjRK4eWXY3u07WSHMUSQRYYrxiGQ9TF+rehvwGLWxmoSm1e4r64mSi/FWm8ut8uUP/JSTYKoB vi5UOc6SVxOhbqZWaU5g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h4J8F-0005J9-5I; Thu, 14 Mar 2019 05:42:19 +0000 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5] helo=mx0a-001b2d01.pphosted.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h4J8B-0005Ii-Tp for linux-arm-kernel@lists.infradead.org; Thu, 14 Mar 2019 05:42:17 +0000 Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x2E5dFpQ011301 for ; Thu, 14 Mar 2019 01:42:12 -0400 Received: from e06smtp02.uk.ibm.com (e06smtp02.uk.ibm.com [195.75.94.98]) by mx0b-001b2d01.pphosted.com with ESMTP id 2r7guj0dpw-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 14 Mar 2019 01:42:11 -0400 Received: from localhost by e06smtp02.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 14 Mar 2019 05:42:09 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp02.uk.ibm.com (192.168.101.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 14 Mar 2019 05:42:03 -0000 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x2E5g2cT35389534 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 14 Mar 2019 05:42:02 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E8E5E11C050; Thu, 14 Mar 2019 05:42:01 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2449111C04C; Thu, 14 Mar 2019 05:41:57 +0000 (GMT) Received: from skywalker.linux.ibm.com (unknown [9.124.31.88]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 14 Mar 2019 05:41:56 +0000 (GMT) X-Mailer: emacs 26.1 (via feedmail 11-beta-1 I) From: "Aneesh Kumar K.V" To: Alexandre Ghiti , 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 Subject: Re: [PATCH v6 3/4] mm: Simplify MEMORY_ISOLATION && COMPACTION || CMA into CONTIG_ALLOC In-Reply-To: <20190307132015.26970-4-alex@ghiti.fr> References: <20190307132015.26970-1-alex@ghiti.fr> <20190307132015.26970-4-alex@ghiti.fr> Date: Thu, 14 Mar 2019 11:11:55 +0530 MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 19031405-0008-0000-0000-000002CD1746 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19031405-0009-0000-0000-0000223917FF Message-Id: <87y35iovvg.fsf@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-03-14_02:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1903140036 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190313_224216_083442_CA916472 X-CRM114-Status: GOOD ( 26.41 ) 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: Alexandre Ghiti Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Alexandre Ghiti writes: > This condition allows to define alloc_contig_range, so simplify > it into a more accurate naming. Reviewed-by: Aneesh Kumar K.V > > Suggested-by: Vlastimil Babka > Signed-off-by: Alexandre Ghiti > Acked-by: Vlastimil Babka > --- > arch/arm64/Kconfig | 2 +- > arch/powerpc/platforms/Kconfig.cputype | 2 +- > arch/s390/Kconfig | 2 +- > arch/sh/Kconfig | 2 +- > arch/sparc/Kconfig | 2 +- > arch/x86/Kconfig | 2 +- > arch/x86/mm/hugetlbpage.c | 2 +- > include/linux/gfp.h | 2 +- > mm/Kconfig | 3 +++ > mm/page_alloc.c | 3 +-- > 10 files changed, 12 insertions(+), 10 deletions(-) > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index a4168d366127..091a513b93e9 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 (MEMORY_ISOLATION && COMPACTION) || CMA > + select ARCH_HAS_GIGANTIC_PAGE if CONTIG_ALLOC > select ARCH_HAS_KCOV > select ARCH_HAS_MEMBARRIER_SYNC_CORE > select ARCH_HAS_PTE_SPECIAL > diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype > index 8c7464c3f27f..f677c8974212 100644 > --- a/arch/powerpc/platforms/Kconfig.cputype > +++ b/arch/powerpc/platforms/Kconfig.cputype > @@ -319,7 +319,7 @@ config ARCH_ENABLE_SPLIT_PMD_PTLOCK > config PPC_RADIX_MMU > bool "Radix MMU Support" > depends on PPC_BOOK3S_64 > - select ARCH_HAS_GIGANTIC_PAGE if (MEMORY_ISOLATION && COMPACTION) || CMA > + select ARCH_HAS_GIGANTIC_PAGE if CONTIG_ALLOC > default y > help > Enable support for the Power ISA 3.0 Radix style MMU. Currently this > diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig > index ed554b09eb3f..1c57b83c76f5 100644 > --- a/arch/s390/Kconfig > +++ b/arch/s390/Kconfig > @@ -69,7 +69,7 @@ config S390 > select ARCH_HAS_ELF_RANDOMIZE > select ARCH_HAS_FORTIFY_SOURCE > select ARCH_HAS_GCOV_PROFILE_ALL > - select ARCH_HAS_GIGANTIC_PAGE if (MEMORY_ISOLATION && COMPACTION) || CMA > + select ARCH_HAS_GIGANTIC_PAGE if CONTIG_ALLOC > select ARCH_HAS_KCOV > select ARCH_HAS_PTE_SPECIAL > select ARCH_HAS_SET_MEMORY > diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig > index 299a17bed67c..c7266302691c 100644 > --- a/arch/sh/Kconfig > +++ b/arch/sh/Kconfig > @@ -53,7 +53,7 @@ config SUPERH > select HAVE_FUTEX_CMPXCHG if FUTEX > select HAVE_NMI > select NEED_SG_DMA_LENGTH > - select ARCH_HAS_GIGANTIC_PAGE if (MEMORY_ISOLATION && COMPACTION) || CMA > + select ARCH_HAS_GIGANTIC_PAGE if CONTIG_ALLOC > > help > The SuperH is a RISC processor targeted for use in embedded systems > diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig > index 0b7f0e0fefa5..ca33c80870e2 100644 > --- a/arch/sparc/Kconfig > +++ b/arch/sparc/Kconfig > @@ -90,7 +90,7 @@ config SPARC64 > select ARCH_CLOCKSOURCE_DATA > select ARCH_HAS_PTE_SPECIAL > select PCI_DOMAINS if PCI > - select ARCH_HAS_GIGANTIC_PAGE if (MEMORY_ISOLATION && COMPACTION) || CMA > + select ARCH_HAS_GIGANTIC_PAGE if CONTIG_ALLOC > > config ARCH_DEFCONFIG > string > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > index 68261430fe6e..8ba90f3e0038 100644 > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > @@ -23,7 +23,7 @@ config X86_64 > def_bool y > depends on 64BIT > # Options that are inherently 64-bit kernel only: > - select ARCH_HAS_GIGANTIC_PAGE if (MEMORY_ISOLATION && COMPACTION) || CMA > + select ARCH_HAS_GIGANTIC_PAGE if CONTIG_ALLOC > select ARCH_SUPPORTS_INT128 > select ARCH_USE_CMPXCHG_LOCKREF > select HAVE_ARCH_SOFT_DIRTY > diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c > index 92e4c4b85bba..fab095362c50 100644 > --- a/arch/x86/mm/hugetlbpage.c > +++ b/arch/x86/mm/hugetlbpage.c > @@ -203,7 +203,7 @@ static __init int setup_hugepagesz(char *opt) > } > __setup("hugepagesz=", setup_hugepagesz); > > -#if (defined(CONFIG_MEMORY_ISOLATION) && defined(CONFIG_COMPACTION)) || defined(CONFIG_CMA) > +#ifdef CONFIG_CONTIG_ALLOC > static __init int gigantic_pages_init(void) > { > /* With compaction or CMA we can allocate gigantic pages at runtime */ > diff --git a/include/linux/gfp.h b/include/linux/gfp.h > index 5f5e25fd6149..1f1ad9aeebb9 100644 > --- a/include/linux/gfp.h > +++ b/include/linux/gfp.h > @@ -585,7 +585,7 @@ static inline bool pm_suspended_storage(void) > } > #endif /* CONFIG_PM_SLEEP */ > > -#if (defined(CONFIG_MEMORY_ISOLATION) && defined(CONFIG_COMPACTION)) || defined(CONFIG_CMA) > +#ifdef CONFIG_CONTIG_ALLOC > /* The below functions must be run on a range from a single zone. */ > extern int alloc_contig_range(unsigned long start, unsigned long end, > unsigned migratetype, gfp_t gfp_mask); > diff --git a/mm/Kconfig b/mm/Kconfig > index 25c71eb8a7db..137eadc18732 100644 > --- a/mm/Kconfig > +++ b/mm/Kconfig > @@ -258,6 +258,9 @@ config ARCH_ENABLE_HUGEPAGE_MIGRATION > config ARCH_ENABLE_THP_MIGRATION > bool > > +config CONTIG_ALLOC > + def_bool (MEMORY_ISOLATION && COMPACTION) || CMA > + > config PHYS_ADDR_T_64BIT > def_bool 64BIT > > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index 35fdde041f5c..ac9c45ffb344 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -8024,8 +8024,7 @@ bool has_unmovable_pages(struct zone *zone, struct page *page, int count, > return true; > } > > -#if (defined(CONFIG_MEMORY_ISOLATION) && defined(CONFIG_COMPACTION)) || defined(CONFIG_CMA) > - > +#ifdef CONFIG_CONTIG_ALLOC > static unsigned long pfn_max_align_down(unsigned long pfn) > { > return pfn & ~(max_t(unsigned long, MAX_ORDER_NR_PAGES, > -- > 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel