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=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 E1FE1C10DCE for ; Wed, 18 Mar 2020 15:37:03 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9F18920724 for ; Wed, 18 Mar 2020 15:37:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="fuPOmc1E" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9F18920724 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=fb.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 368796B0037; Wed, 18 Mar 2020 11:37:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 318186B0071; Wed, 18 Mar 2020 11:37:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 22E8A6B007D; Wed, 18 Mar 2020 11:37:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0222.hostedemail.com [216.40.44.222]) by kanga.kvack.org (Postfix) with ESMTP id 090C16B0037 for ; Wed, 18 Mar 2020 11:37:03 -0400 (EDT) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id AF19E824C739 for ; Wed, 18 Mar 2020 15:37:02 +0000 (UTC) X-FDA: 76608886284.05.shock81_77a404f64762e X-HE-Tag: shock81_77a404f64762e X-Filterd-Recvd-Size: 4249 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf48.hostedemail.com (Postfix) with ESMTP for ; Wed, 18 Mar 2020 15:37:01 +0000 (UTC) Received: from pps.filterd (m0109332.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 02IFKuT0016580 for ; Wed, 18 Mar 2020 08:37:01 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=facebook; bh=+yz4DHezlozLlFDk3shF3Kxk5JxdSo+PMN929xv25Dw=; b=fuPOmc1E3E0EEhL9Lxv/UZmYXQ9DFvfit03pdieqi7Ba3yBTgWp9TKyDyFb7EtlXwF65 De0iFauC3FBAnwNy+NRvxiWJPdvtIQwn/ZZDMvi7LGJRbS+MW9liOtJotARQL5hqB7pr toamGxqNhwp2Vsg/Q0gxupIOv1CBgvmFhw8= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com with ESMTP id 2yu9mhu1jf-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 18 Mar 2020 08:37:01 -0700 Received: from intmgw002.06.prn3.facebook.com (2620:10d:c085:108::4) by mail.thefacebook.com (2620:10d:c085:11d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1847.3; Wed, 18 Mar 2020 08:36:58 -0700 Received: by devvm2643.prn2.facebook.com (Postfix, from userid 111017) id 435063BB121B2; Wed, 18 Mar 2020 08:34:26 -0700 (PDT) Smtp-Origin-Hostprefix: devvm From: Roman Gushchin Smtp-Origin-Hostname: devvm2643.prn2.facebook.com To: Andrew Morton CC: Michal Hocko , , , , Rik van Riel , Andreas Schaufler , Mike Kravetz , =?UTF-8?q?Guido=20G=C3=BCnther?= , Naresh Kamboju , Roman Gushchin Smtp-Origin-Cluster: prn2c23 Subject: [PATCH] mm: hugetlb: fix hugetlb_cma_reserve() if CONFIG_NUMA isn't set Date: Wed, 18 Mar 2020 08:34:24 -0700 Message-ID: <20200318153424.3202304-1-guro@fb.com> X-Mailer: git-send-email 2.17.1 X-FB-Internal: Safe MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.645 definitions=2020-03-18_07:2020-03-18,2020-03-18 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 lowpriorityscore=0 clxscore=1015 suspectscore=0 mlxscore=0 adultscore=0 priorityscore=1501 impostorscore=0 bulkscore=0 phishscore=0 mlxlogscore=850 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2003180073 X-FB-Internal: deliver 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: If CONFIG_NUMA isn't set, there is no need to ensure that the hugetlb cma area belongs to a specific numa node. min/max_low_pfn can be used for limiting the maximum size of the hugetlb_cma area. Also for_each_mem_pfn_range() is defined only if CONFIG_HAVE_MEMBLOCK_NODE_MAP is set, and on arm (unlike most other architectures) it depends on CONFIG_NUMA. This makes the build fail if CONFIG_NUMA isn't set. Signed-off-by: Roman Gushchin Reported-by: Andreas Schaufler --- mm/hugetlb.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 7a20cae7c77a..a6161239abde 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -5439,16 +5439,21 @@ void __init hugetlb_cma_reserve(int order) reserved = 0; for_each_node_state(nid, N_ONLINE) { - unsigned long start_pfn, end_pfn; unsigned long min_pfn = 0, max_pfn = 0; - int res, i; + int res; +#ifdef CONFIG_NUMA + unsigned long start_pfn, end_pfn; + int i; for_each_mem_pfn_range(i, nid, &start_pfn, &end_pfn, NULL) { if (!min_pfn) min_pfn = start_pfn; max_pfn = end_pfn; } - +#else + min_pfn = min_low_pfn; + max_pfn = max_low_pfn; +#endif size = max(per_node, hugetlb_cma_size - reserved); size = round_up(size, PAGE_SIZE << order); -- 2.24.1