From patchwork Thu Jan 18 12:39:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gang Li X-Patchwork-Id: 189190 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp308764dyb; Thu, 18 Jan 2024 04:40:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IE0s/eSDix54eAM/xGMWZ/LudoMzaWPuhtZLKfrbj/N5K0RGKU+REGRRdmKg0reqfypl9J1 X-Received: by 2002:a17:902:c40d:b0:1d7:1342:64cd with SMTP id k13-20020a170902c40d00b001d7134264cdmr218058plk.10.1705581607568; Thu, 18 Jan 2024 04:40:07 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705581607; cv=pass; d=google.com; s=arc-20160816; b=BNzUVT02tf/NRWGn+ayc44zB0xVvS7e9wm5kcp3xN8FKqsYxJGBVUUgG/MPTvs7iNT CpZnk250ptEaVba4RIQhiuECmvIY9UGyc6KVTi6O0OuKXQdx/u9n0YvQm8K1WuolBwjk JYAWObI8fH0M2Thqj6NEOTHqZsl++R1aspPYpJVh66k2Dok72HHXDnltl2Y7W9sMyAJx 1aVBynqLW7Zo9njFf1EItTMt8YkIK4oOfo+b5pmRlKk3OEg2yCC7FB6svAAN4HU52KO1 oPuYQl8MVBJHnwXTlo3OngITIvZJKYhFMx76LoyqU6U4tUVAWqd8ith1nu8yS+sTlIP7 CnlQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=exgQQskroYsjKda3OrjICjnI9J6CYuerAViQBeWOcMM=; fh=5n5b5+XOwLgGNDePhvfXysty56rnkWOs9jaHEODdVeE=; b=T18kQD7stKkyCS6TuCafXo7LGmqFT430zmW6v9cjq+d8oa0CBi5yQA0ag9bHJv7cjL pYkVYvq2cyRl+npsVlGiXyf8tNt/tQu9k8h1EVsTK/K6MqUt3eA3xXvKQZNO9IKYbSny hddqPZCqKuggOEBRSpzWMQtEPjtXCn2OFPlGnYdZw136uDTMkOsU8Re6vUVH6zjFugJH ljGzL/NE1iz058XUwY6mtMZK4U3/ZNw851HpWIYYBMhzox09RNBZ/LoWfeDEm9F47ZU8 Om0amtH/SEQiU+Dqr16n/ZPQJdGblhiTQLwINI3HRdjiZxJAgT+8cQpAC/a4lgXlTZWO UAnQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b="ld/KqK0Y"; arc=pass (i=1 spf=pass spfdomain=linux.dev dkim=pass dkdomain=linux.dev dmarc=pass fromdomain=linux.dev); spf=pass (google.com: domain of linux-kernel+bounces-30105-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-30105-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id i2-20020a170902c94200b001d6f78ab42dsi1410333pla.220.2024.01.18.04.40.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 04:40:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-30105-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b="ld/KqK0Y"; arc=pass (i=1 spf=pass spfdomain=linux.dev dkim=pass dkdomain=linux.dev dmarc=pass fromdomain=linux.dev); spf=pass (google.com: domain of linux-kernel+bounces-30105-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-30105-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 563D9282C66 for ; Thu, 18 Jan 2024 12:40:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0C9B825630; Thu, 18 Jan 2024 12:39:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="ld/KqK0Y" Received: from out-187.mta1.migadu.com (out-187.mta1.migadu.com [95.215.58.187]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 706E424B5D for ; Thu, 18 Jan 2024 12:39:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.187 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705581569; cv=none; b=lytQXFQBAQi7zyvQEc/+r6IGvQSoy0g/0lFpN3fCTSM7xM01W0pYuRK1AeKtqIK8WoLEBkOEHyBGde3Z1eGc+0KVaF94OQBEOjl/zYYnNNNBvSgyHv9GzzRJmEIy5qNlyboA0bqMIYK9iBRYCYdxMEBPNVIJEBjAvFfRdaFK4KU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705581569; c=relaxed/simple; bh=agEAxC+FBmg84td8imvOGHG1bBv9SBt07p6snHTUA6A=; h=X-Report-Abuse:DKIM-Signature:From:To:Cc:Subject:Date:Message-Id: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding: X-Migadu-Flow; b=k3YmreX4J6MW9Yw2AkoDpG4duUDYbdVQFSyO96kFyzmO782sivIrJI9U5fYIBuSFN5DD52O/MBs/7SP7TRWav8WczCGgQfYFzDwLfcsnmBs1xuTO8fp/GOHGssh3lC1Z0Hn5JmWhv+YU2gq5pzLGFYeoZumPzvAG3a6br3Lzy5I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=ld/KqK0Y; arc=none smtp.client-ip=95.215.58.187 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1705581565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=exgQQskroYsjKda3OrjICjnI9J6CYuerAViQBeWOcMM=; b=ld/KqK0Y/Y1LeAn4Qe2WZTyW0NNi8VHKXK3BJy4hanIhJD9xMJcew8Ixgtb3eA8ERmqBdm R6owPfumyPNVF2jVKQgXfW5pFSDWHi8zv1dVKrAEAuDYAznW6a5/5K8zzpwJdwf/TCPvaW gqxmTHiFCvdVIZt/Zobafc1g1WxuGi4= From: Gang Li To: David Hildenbrand , David Rientjes , Mike Kravetz , Muchun Song , Andrew Morton , Tim Chen Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, ligang.bdlg@bytedance.com, Gang Li Subject: [PATCH v4 2/7] hugetlb: split hugetlb_hstate_alloc_pages Date: Thu, 18 Jan 2024 20:39:06 +0800 Message-Id: <20240118123911.88833-3-gang.li@linux.dev> In-Reply-To: <20240118123911.88833-1-gang.li@linux.dev> References: <20240118123911.88833-1-gang.li@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788431939782743032 X-GMAIL-MSGID: 1788431939782743032 1G and 2M huge pages have different allocation and initialization logic, which leads to subtle differences in parallelization. Therefore, it is appropriate to split hugetlb_hstate_alloc_pages into gigantic and non-gigantic. This patch has no functional changes. Signed-off-by: Gang Li Tested-by: David Rientjes Reviewed-by: Tim Chen Reviewed-by: Muchun Song --- mm/hugetlb.c | 87 ++++++++++++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 44 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index b8e4a6adefd6..98ae108e1fac 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3509,6 +3509,43 @@ static void __init hugetlb_hstate_alloc_pages_errcheck(unsigned long allocated, } } +static unsigned long __init hugetlb_gigantic_pages_alloc_boot(struct hstate *h) +{ + unsigned long i; + + for (i = 0; i < h->max_huge_pages; ++i) { + if (!alloc_bootmem_huge_page(h, NUMA_NO_NODE)) + break; + cond_resched(); + } + + return i; +} + +static unsigned long __init hugetlb_pages_alloc_boot(struct hstate *h) +{ + unsigned long i; + struct folio *folio; + LIST_HEAD(folio_list); + nodemask_t node_alloc_noretry; + + /* Bit mask controlling how hard we retry per-node allocations.*/ + nodes_clear(node_alloc_noretry); + + for (i = 0; i < h->max_huge_pages; ++i) { + folio = alloc_pool_huge_folio(h, &node_states[N_MEMORY], + &node_alloc_noretry); + if (!folio) + break; + list_add(&folio->lru, &folio_list); + cond_resched(); + } + + prep_and_add_allocated_folios(h, &folio_list); + + return i; +} + /* * NOTE: this routine is called in different contexts for gigantic and * non-gigantic pages. @@ -3522,10 +3559,7 @@ static void __init hugetlb_hstate_alloc_pages_errcheck(unsigned long allocated, */ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) { - unsigned long i; - struct folio *folio; - LIST_HEAD(folio_list); - nodemask_t *node_alloc_noretry; + unsigned long allocated; /* skip gigantic hugepages allocation if hugetlb_cma enabled */ if (hstate_is_gigantic(h) && hugetlb_cma_size) { @@ -3538,47 +3572,12 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) return; /* below will do all node balanced alloc */ - if (!hstate_is_gigantic(h)) { - /* - * Bit mask controlling how hard we retry per-node allocations. - * Ignore errors as lower level routines can deal with - * node_alloc_noretry == NULL. If this kmalloc fails at boot - * time, we are likely in bigger trouble. - */ - node_alloc_noretry = kmalloc(sizeof(*node_alloc_noretry), - GFP_KERNEL); - } else { - /* allocations done at boot time */ - node_alloc_noretry = NULL; - } - - /* bit mask controlling how hard we retry per-node allocations */ - if (node_alloc_noretry) - nodes_clear(*node_alloc_noretry); - - for (i = 0; i < h->max_huge_pages; ++i) { - if (hstate_is_gigantic(h)) { - /* - * gigantic pages not added to list as they are not - * added to pools now. - */ - if (!alloc_bootmem_huge_page(h, NUMA_NO_NODE)) - break; - } else { - folio = alloc_pool_huge_folio(h, &node_states[N_MEMORY], - node_alloc_noretry); - if (!folio) - break; - list_add(&folio->lru, &folio_list); - } - cond_resched(); - } - - /* list will be empty if hstate_is_gigantic */ - prep_and_add_allocated_folios(h, &folio_list); + if (hstate_is_gigantic(h)) + allocated = hugetlb_gigantic_pages_alloc_boot(h); + else + allocated = hugetlb_pages_alloc_boot(h); - hugetlb_hstate_alloc_pages_errcheck(i, h); - kfree(node_alloc_noretry); + hugetlb_hstate_alloc_pages_errcheck(allocated, h); } static void __init hugetlb_init_hstates(void)