From patchwork Fri Apr 3 10:18:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aslan Bakirov X-Patchwork-Id: 11472489 Return-Path: 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 7FDDF81 for ; Fri, 3 Apr 2020 10:19:15 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 38D47208E4 for ; Fri, 3 Apr 2020 10:19:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="cBpmgtTF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 38D47208E4 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 61E898E0008; Fri, 3 Apr 2020 06:19:14 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 5CEDA8E0007; Fri, 3 Apr 2020 06:19:14 -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 4E4978E0008; Fri, 3 Apr 2020 06:19:14 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 331598E0007 for ; Fri, 3 Apr 2020 06:19:14 -0400 (EDT) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id DF883181AEF15 for ; Fri, 3 Apr 2020 10:19:13 +0000 (UTC) X-FDA: 76666146186.09.badge40_1650c1c5db10f X-Spam-Summary: 2,0,0,ee56796b322f6cfa,d41d8cd98f00b204,prvs=1362849eaa=aslan@fb.com,,RULES_HIT:2:41:355:379:541:800:960:966:973:988:989:1260:1261:1277:1311:1313:1314:1345:1431:1437:1513:1515:1516:1518:1521:1535:1605:1606:1730:1747:1777:1792:2196:2198:2199:2200:2393:2559:2562:2693:2899:3138:3139:3140:3141:3142:3865:3866:3867:3868:3870:3871:3872:3874:4119:4250:4321:4385:4605:5007:6119:6261:6653:7875:7903:8603:9163:10004:11026:11473:11658:11914:12043:12296:12297:12438:12555:12663:12895:12986:14096:14097:14394:21067:21080:21324:21451:21627:21740:21990:30003:30012:30029:30054:30064,0,RBL:67.231.145.42:@fb.com:.lbl8.mailshell.net-62.12.0.100 64.201.201.201,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:24,LUA_SUMMARY:none X-HE-Tag: badge40_1650c1c5db10f X-Filterd-Recvd-Size: 8179 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by imf36.hostedemail.com (Postfix) with ESMTP for ; Fri, 3 Apr 2020 10:19:13 +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 033AIUm3004360 for ; Fri, 3 Apr 2020 03:19:12 -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-transfer-encoding : content-type; s=facebook; bh=cDoB0ichWZYA+VpWqPf6KR4QQ008FhSwewof75iV/qU=; b=cBpmgtTFjhxzG4lSunIl1V5dpuxX/Jo14yMJHcaL11nAT7DgvU3Q56xWA7TJBopq0RZk i0r8OKMR8pCo0kICyIbpb5wM1pwMg4PsYrD2A8UYKN6XBLXPJWl2I5eXtpm5N4Tu0jz1 krmiPPm9svU6onoGHQx2t3nCO7XIbs7V/sk= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com with ESMTP id 3053438c45-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 03 Apr 2020 03:19:11 -0700 Received: from intmgw001.03.ash8.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c085:11d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1847.3; Fri, 3 Apr 2020 03:19:11 -0700 Received: by devbig020.ftw1.facebook.com (Postfix, from userid 179119) id C0F7358C2D29; Fri, 3 Apr 2020 03:19:08 -0700 (PDT) Smtp-Origin-Hostprefix: devbig From: Aslan Bakirov Smtp-Origin-Hostname: devbig020.ftw1.facebook.com To: CC: , , , , , , , Aslan Bakirov Smtp-Origin-Cluster: ftw1c07 Subject: [PATCH 1/2] mm: cma: NUMA node interface Date: Fri, 3 Apr 2020 03:18:42 -0700 Message-ID: <20200403101843.406634-1-aslan@fb.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.676 definitions=2020-04-03_07:2020-04-02,2020-04-03 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 lowpriorityscore=0 suspectscore=1 clxscore=1015 phishscore=0 impostorscore=0 spamscore=0 adultscore=0 priorityscore=1501 mlxscore=0 malwarescore=0 mlxlogscore=999 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004030090 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: I've noticed that there is no interfaces exposed by CMA which would let me to declare contigous memory on particular NUMA node. This patchset adds the ability to try to allocate contiguous memory on specific node. It will fallback to other nodes if the specified one doesn't work. Implement a new method for declaring contigous memory on particular node and keep cma_declare_contiguous() as a wrapper. Signed-off-by: Aslan Bakirov --- include/linux/cma.h | 13 +++++++++++-- include/linux/memblock.h | 3 +++ mm/cma.c | 16 +++++++++------- mm/memblock.c | 2 +- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/include/linux/cma.h b/include/linux/cma.h index 190184b5ff32..eae834c2162f 100644 --- a/include/linux/cma.h +++ b/include/linux/cma.h @@ -24,10 +24,19 @@ extern phys_addr_t cma_get_base(const struct cma *cma); extern unsigned long cma_get_size(const struct cma *cma); extern const char *cma_get_name(const struct cma *cma); -extern int __init cma_declare_contiguous(phys_addr_t base, +extern int __init cma_declare_contiguous_nid(phys_addr_t base, phys_addr_t size, phys_addr_t limit, phys_addr_t alignment, unsigned int order_per_bit, - bool fixed, const char *name, struct cma **res_cma); + bool fixed, const char *name, struct cma **res_cma, + int nid); +static inline int __init cma_declare_contiguous(phys_addr_t base, + phys_addr_t size, phys_addr_t limit, + phys_addr_t alignment, unsigned int order_per_bit, + bool fixed, const char *name, struct cma **res_cma) +{ + return cma_declare_contiguous_nid(base, size, limit, alignment, + order_per_bit, fixed, name, res_cma, NUMA_NO_NODE); +} extern int cma_init_reserved_mem(phys_addr_t base, phys_addr_t size, unsigned int order_per_bit, const char *name, diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 079d17d96410..6bc37a731d27 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -348,6 +348,9 @@ static inline int memblock_get_region_node(const struct memblock_region *r) phys_addr_t memblock_phys_alloc_range(phys_addr_t size, phys_addr_t align, phys_addr_t start, phys_addr_t end); +phys_addr_t memblock_alloc_range_nid(phys_addr_t size, + phys_addr_t align, phys_addr_t start, + phys_addr_t end, int nid, bool exact_nid); phys_addr_t memblock_phys_alloc_try_nid(phys_addr_t size, phys_addr_t align, int nid); static inline phys_addr_t memblock_phys_alloc(phys_addr_t size, diff --git a/mm/cma.c b/mm/cma.c index be55d1988c67..6405af3dc118 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -220,7 +220,7 @@ int __init cma_init_reserved_mem(phys_addr_t base, phys_addr_t size, } /** - * cma_declare_contiguous() - reserve custom contiguous area + * cma_declare_contiguous_nid() - reserve custom contiguous area * @base: Base address of the reserved area optional, use 0 for any * @size: Size of the reserved area (in bytes), * @limit: End address of the reserved memory (optional, 0 for any). @@ -229,6 +229,7 @@ int __init cma_init_reserved_mem(phys_addr_t base, phys_addr_t size, * @fixed: hint about where to place the reserved area * @name: The name of the area. See function cma_init_reserved_mem() * @res_cma: Pointer to store the created cma region. + * @nid: nid of the free area to find, %NUMA_NO_NODE for any node * * This function reserves memory from early allocator. It should be * called by arch specific code once the early allocator (memblock or bootmem) @@ -238,10 +239,11 @@ int __init cma_init_reserved_mem(phys_addr_t base, phys_addr_t size, * If @fixed is true, reserve contiguous area at exactly @base. If false, * reserve in range from @base to @limit. */ -int __init cma_declare_contiguous(phys_addr_t base, +int __init cma_declare_contiguous_nid(phys_addr_t base, phys_addr_t size, phys_addr_t limit, phys_addr_t alignment, unsigned int order_per_bit, - bool fixed, const char *name, struct cma **res_cma) + bool fixed, const char *name, struct cma **res_cma, + int nid) { phys_addr_t memblock_end = memblock_end_of_DRAM(); phys_addr_t highmem_start; @@ -336,14 +338,14 @@ int __init cma_declare_contiguous(phys_addr_t base, * memory in case of failure. */ if (base < highmem_start && limit > highmem_start) { - addr = memblock_phys_alloc_range(size, alignment, - highmem_start, limit); + addr = memblock_alloc_range_nid(size, alignment, + highmem_start, limit, nid, false); limit = highmem_start; } if (!addr) { - addr = memblock_phys_alloc_range(size, alignment, base, - limit); + addr = memblock_alloc_range_nid(size, alignment, base, + alimit, nid, false); if (!addr) { ret = -ENOMEM; goto err; diff --git a/mm/memblock.c b/mm/memblock.c index 4d06bbaded0f..c79ba6f9920c 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1349,7 +1349,7 @@ __next_mem_pfn_range_in_zone(u64 *idx, struct zone *zone, * Return: * Physical address of allocated memory block on success, %0 on failure. */ -static phys_addr_t __init memblock_alloc_range_nid(phys_addr_t size, +phys_addr_t __init memblock_alloc_range_nid(phys_addr_t size, phys_addr_t align, phys_addr_t start, phys_addr_t end, int nid, bool exact_nid) From patchwork Fri Apr 3 10:18:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aslan Bakirov X-Patchwork-Id: 11472491 Return-Path: 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 CB7D217EA for ; Fri, 3 Apr 2020 10:19:20 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8EC102073B for ; Fri, 3 Apr 2020 10:19:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="HYsGJJVr" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8EC102073B 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 C60818E0009; Fri, 3 Apr 2020 06:19:19 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C10228E0007; Fri, 3 Apr 2020 06:19: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 B26C28E0009; Fri, 3 Apr 2020 06:19:19 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0134.hostedemail.com [216.40.44.134]) by kanga.kvack.org (Postfix) with ESMTP id 9C7CF8E0007 for ; Fri, 3 Apr 2020 06:19:19 -0400 (EDT) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 5F564349B for ; Fri, 3 Apr 2020 10:19:19 +0000 (UTC) X-FDA: 76666146438.20.bat26_1725460cbae3c X-Spam-Summary: 2,0,0,c791aa2d190169d3,d41d8cd98f00b204,prvs=1362849eaa=aslan@fb.com,,RULES_HIT:41:69:355:379:541:800:960:973:988:989:1260:1261:1277:1311:1313:1314:1345:1359:1431:1437:1513:1515:1516:1518:1521:1535:1542:1711:1730:1747:1777:1792:2194:2198:2199:2200:2393:2559:2562:2693:2731:3138:3139:3140:3141:3142:3354:3865:3866:3867:3868:3870:3871:3872:3874:4250:4321:5007:6119:6261:6653:7875:7903:8603:9592:10004:10400:10946:11026:11233:11473:11658:11914:12043:12296:12297:12438:12555:12683:12895:12986:14181:14394:14721:14819:21080:21324:21451:21627:21796:30003:30036:30054:30056:30064:30070,0,RBL:67.231.153.30:@fb.com:.lbl8.mailshell.net-62.12.0.100 64.201.201.201,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: bat26_1725460cbae3c X-Filterd-Recvd-Size: 5428 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf12.hostedemail.com (Postfix) with ESMTP for ; Fri, 3 Apr 2020 10:19:18 +0000 (UTC) Received: from pps.filterd (m0089730.ppops.net [127.0.0.1]) by m0089730.ppops.net (8.16.0.42/8.16.0.42) with SMTP id 033AF9Rc017530 for ; Fri, 3 Apr 2020 03:19:18 -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-transfer-encoding : content-type; s=facebook; bh=rYLNhGZMyqhovJovjX76P2bG2KmXlNxofH857A2yacM=; b=HYsGJJVr6ex8PCN4Lq6zrZ0SsNcrC0cNwPbtcUO1VOnNw+uW2Nljb45wAaW2iSq/dnqV KL+UpuirHl4pIHdxh8hOCEbkkkV2bKkuLYMcei0EcfpdkgdszxHbsWmilU/ElNgcJT20 wLwsKkj9KzyreeByioQl80tuPqb4PL/ZRw8= Received: from mail.thefacebook.com ([163.114.132.120]) by m0089730.ppops.net with ESMTP id 304hrud5gg-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 03 Apr 2020 03:19:18 -0700 Received: from intmgw003.03.ash8.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c085:21d::4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1847.3; Fri, 3 Apr 2020 03:19:16 -0700 Received: by devbig020.ftw1.facebook.com (Postfix, from userid 179119) id A5B6058C2D29; Fri, 3 Apr 2020 03:19:13 -0700 (PDT) Smtp-Origin-Hostprefix: devbig From: Aslan Bakirov Smtp-Origin-Hostname: devbig020.ftw1.facebook.com To: CC: , , , , , , , Aslan Bakirov Smtp-Origin-Cluster: ftw1c07 Subject: [PATCH 2/2] mm: hugetlb: Use node interface of cma Date: Fri, 3 Apr 2020 03:18:43 -0700 Message-ID: <20200403101843.406634-2-aslan@fb.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200403101843.406634-1-aslan@fb.com> References: <20200403101843.406634-1-aslan@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.676 definitions=2020-04-03_07:2020-04-02,2020-04-03 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 malwarescore=0 adultscore=0 priorityscore=1501 clxscore=1015 spamscore=0 impostorscore=0 mlxlogscore=999 suspectscore=1 bulkscore=0 phishscore=0 lowpriorityscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004030089 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: With introduction of numa node interface for CMA, this patch is for using that interface for allocating memory on numa nodes if NUMA is configured. This will be more efficient and cleaner because first, instead of iterating mem range of each numa node, cma_declare_contigueous_nid() will do its own address finding if we pass 0 for both min_pfn and max_pfn, second, it can also handle caseswhere NUMA is not configured by passing NUMA_NO_NODE as an argument. In addition, checking if desired size of memory is available or not, is happening in cma_declare_contiguous_nid() because base and limit will be determined there, since 0(any) for base and 0(any) for limit is passed as argument to the function. Signed-off-by: Aslan Bakirov Acked-by: Michal Hocko --- mm/hugetlb.c | 40 +++++++++++----------------------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index b9f0c903c4cf..62989220c4ff 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -5573,42 +5573,24 @@ void __init hugetlb_cma_reserve(int order) reserved = 0; for_each_node_state(nid, N_ONLINE) { - unsigned long min_pfn = 0, max_pfn = 0; 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 = min(per_node, hugetlb_cma_size - reserved); size = round_up(size, PAGE_SIZE << order); - - if (size > ((max_pfn - min_pfn) << PAGE_SHIFT) / 2) { - pr_warn("hugetlb_cma: cma_area is too big, please try less than %lu MiB\n", - round_down(((max_pfn - min_pfn) << PAGE_SHIFT) * - nr_online_nodes / 2 / SZ_1M, - PAGE_SIZE << order)); - break; - } - - res = cma_declare_contiguous(PFN_PHYS(min_pfn), size, - PFN_PHYS(max_pfn), + + +#ifndef CONFIG_NUMA + nid = NUMA_NO_NODE +#endif + res = cma_declare_contiguous_nid(0, size, + 0, PAGE_SIZE << order, 0, false, - "hugetlb", &hugetlb_cma[nid]); + "hugetlb", &hugetlb_cma[nid], nid); + if (res) { - phys_addr_t begpa = PFN_PHYS(min_pfn); - phys_addr_t endpa = PFN_PHYS(max_pfn); - pr_warn("%s: reservation failed: err %d, node %d, [%pap, %pap)\n", - __func__, res, nid, &begpa, &endpa); + pr_warn("%s: reservation failed: err %d, node %d\n", + __func__, res, nid); break; }