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,URIBL_BLOCKED, USER_AGENT_GIT 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 F415BC10DCE for ; Mon, 23 Mar 2020 22:14:20 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B939720774 for ; Mon, 23 Mar 2020 22:14:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="Ase+58t8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B939720774 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 78B526B000C; Mon, 23 Mar 2020 18:14:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 73B4C6B000E; Mon, 23 Mar 2020 18:14:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 603116B0010; Mon, 23 Mar 2020 18:14:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0246.hostedemail.com [216.40.44.246]) by kanga.kvack.org (Postfix) with ESMTP id 455046B000C for ; Mon, 23 Mar 2020 18:14:19 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 1240582DBF for ; Mon, 23 Mar 2020 22:14:19 +0000 (UTC) X-FDA: 76628031438.06.blade83_5fd72d8b52418 X-HE-Tag: blade83_5fd72d8b52418 X-Filterd-Recvd-Size: 4071 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by imf08.hostedemail.com (Postfix) with ESMTP for ; Mon, 23 Mar 2020 22:14:18 +0000 (UTC) Received: from pps.filterd (m0148461.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 02NM8dIl015328 for ; Mon, 23 Mar 2020 15:14:17 -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=erPXsWmd23fd3W9Xuv20sBNJ3NxEkbQhYsmOpbVq2AI=; b=Ase+58t8NRI2h/zfLau/NM4sVfVwV1hDnIRfl6k7hlOH5NZuhtjQudVOJDWzjb5ECvVS iUlPQnTbnOWrAAgxx4xoTWqnLc+iTEscNnLyAQJUDuHzp4lzyryyL7rhkGmIt1ffhLvz k6iewYo3GuMCj6jvz1azNim6a67PYY4xfcA= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com with ESMTP id 2yx2udykne-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 23 Mar 2020 15:14:17 -0700 Received: from intmgw003.06.prn3.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::f) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1847.3; Mon, 23 Mar 2020 15:14:15 -0700 Received: by devvm2643.prn2.facebook.com (Postfix, from userid 111017) id 274BD3BEB983D; Mon, 23 Mar 2020 15:14:12 -0700 (PDT) Smtp-Origin-Hostprefix: devvm From: Roman Gushchin Smtp-Origin-Hostname: devvm2643.prn2.facebook.com To: Andrew Morton CC: Aslan Barkirov , Michal Hocko , , , , Rik van Riel , Mike Kravetz , Roman Gushchin Smtp-Origin-Cluster: prn2c23 Subject: [PATCH] mm: hugetlb: fix per-node size calculation for hugetlb_cma Date: Mon, 23 Mar 2020 15:14:11 -0700 Message-ID: <20200323221411.2152675-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-23_09:2020-03-23,2020-03-23 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 malwarescore=0 lowpriorityscore=0 bulkscore=0 clxscore=1015 phishscore=0 priorityscore=1501 impostorscore=0 adultscore=0 mlxlogscore=999 mlxscore=0 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2003230110 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: Aslan found a bug in the per-node hugetlb_cma area size calculation: the total remaining size should cap the per-node area size instead of be the minimal possible allocation. Without the fix: [ 0.004136] hugetlb_cma: reserve 2048 MiB, up to 1024 MiB per node [ 0.004138] cma: Reserved 2048 MiB at 0x0000000180000000 [ 0.004139] hugetlb_cma: reserved 2048 MiB on node 0 With the fix: [ 0.006780] hugetlb_cma: reserve 2048 MiB, up to 1024 MiB per node [ 0.006786] cma: Reserved 1024 MiB at 0x00000001c0000000 [ 0.006787] hugetlb_cma: reserved 1024 MiB on node 0 [ 0.006788] cma: Reserved 1024 MiB at 0x00000003c0000000 [ 0.006789] hugetlb_cma: reserved 1024 MiB on node 1 Reported-by: Aslan Barkirov Signed-off-by: Roman Gushchin --- mm/hugetlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 456f4c010fea..44b47c2b6fab 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -5590,7 +5590,7 @@ void __init hugetlb_cma_reserve(int order) min_pfn = min_low_pfn; max_pfn = max_low_pfn; #endif - size = max(per_node, hugetlb_cma_size - reserved); + size = min(per_node, hugetlb_cma_size - reserved); size = round_up(size, PAGE_SIZE << order); if (size > ((max_pfn - min_pfn) << PAGE_SHIFT) / 2) { -- 2.25.1