Message ID | 20200323233411.2407279-1-guro@fb.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=t4Rs=5I=kvack.org=owner-linux-mm@kernel.org> Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A8931139A for <patchwork-linux-mm@patchwork.kernel.org>; Mon, 23 Mar 2020 23:34:20 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 77BAF20719 for <patchwork-linux-mm@patchwork.kernel.org>; Mon, 23 Mar 2020 23:34:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="feX6+u7u" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 77BAF20719 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 AD2A86B0005; Mon, 23 Mar 2020 19:34:19 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A82956B0006; Mon, 23 Mar 2020 19:34:19 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9989D6B0007; Mon, 23 Mar 2020 19:34:19 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0022.hostedemail.com [216.40.44.22]) by kanga.kvack.org (Postfix) with ESMTP id 7FF2D6B0005 for <linux-mm@kvack.org>; Mon, 23 Mar 2020 19:34:19 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 5BA2F83F6 for <linux-mm@kvack.org>; Mon, 23 Mar 2020 23:34:19 +0000 (UTC) X-FDA: 76628233038.11.ghost88_42c56f4b9f32b X-Spam-Summary: 2,0,0,8e6421e71860a04d,d41d8cd98f00b204,prvs=0351a6c36f=guro@fb.com,,RULES_HIT:41:355:379:421:541:800:960:973:988:989:1260:1261:1277:1313:1314:1345:1359:1431:1437:1516:1518:1534:1541:1711:1730:1747:1777:1792:2198:2199:2393:2559:2562:2731:3138:3139:3140:3141:3142:3352:3865:3866:3867:3870:4321:5007:6261:6653:7875:8603:10004:10400:11026:11658:11914:12296:12297:12555:12895:12986:13069:13161:13221:13229:13311:13357:14181:14394:14721:21080:21451:21627:30054:30064,0,RBL:67.231.145.42:@fb.com:.lbl8.mailshell.net-64.201.201.201 62.12.0.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:23,LUA_SUMMARY:none X-HE-Tag: ghost88_42c56f4b9f32b X-Filterd-Recvd-Size: 4203 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by imf27.hostedemail.com (Postfix) with ESMTP for <linux-mm@kvack.org>; Mon, 23 Mar 2020 23:34: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 02NNSeLF016645 for <linux-mm@kvack.org>; Mon, 23 Mar 2020 16:34:16 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=facebook; bh=TFuepEPf414fwKUx8fUSllPVzmQmzijzT+qxEdW3TSY=; b=feX6+u7uG9Xh1cq25YFpJYGEnbKg/mVvuYaAyn1oWb8fRA7mSr19JeW5VFyeDj1LLbzH pTcTfByWEyQ94Z9koUqryWee6UOqa+4kdzcIz5pM2ZhIwEB/Qz0Gr+IMM4YSap674S2i s3KINtSZxJ4aNvWLDe8J3H2xIciyW9jXHXs= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com with ESMTP id 2yx2udywr9-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for <linux-mm@kvack.org>; Mon, 23 Mar 2020 16:34:16 -0700 Received: from intmgw002.41.prn1.facebook.com (2620:10d:c085:108::4) by mail.thefacebook.com (2620:10d:c085:21d::6) 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 16:34:15 -0700 Received: by devvm2643.prn2.facebook.com (Postfix, from userid 111017) id 221B33BEC28CF; Mon, 23 Mar 2020 16:34:13 -0700 (PDT) Smtp-Origin-Hostprefix: devvm From: Roman Gushchin <guro@fb.com> Smtp-Origin-Hostname: devvm2643.prn2.facebook.com To: Andrew Morton <akpm@linux-foundation.org> CC: Aslan Bakirov <aslan@fb.com>, Michal Hocko <mhocko@kernel.org>, <linux-mm@kvack.org>, <kernel-team@fb.com>, <linux-kernel@vger.kernel.org>, Rik van Riel <riel@surriel.com>, Mike Kravetz <mike.kravetz@oracle.com>, Roman Gushchin <guro@fb.com> Smtp-Origin-Cluster: prn2c23 Subject: [PATCH v2] mm: hugetlb: fix per-node size calculation for hugetlb_cma Date: Mon, 23 Mar 2020 16:34:11 -0700 Message-ID: <20200323233411.2407279-1-guro@fb.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200323221411.2152675-1-guro@fb.com> References: <20200323221411.2152675-1-guro@fb.com> 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_10: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-2003230116 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: <linux-mm.kvack.org> |
Series |
[v2] mm: hugetlb: fix per-node size calculation for hugetlb_cma
|
expand
|
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) {
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 Bakirov <aslan@fb.com> Signed-off-by: Roman Gushchin <guro@fb.com> --- mm/hugetlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)