From patchwork Tue Dec 17 16:31:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 13912194 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B0B5E77187 for ; Tue, 17 Dec 2024 16:32:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 037146B0095; Tue, 17 Dec 2024 11:32:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F05486B0092; Tue, 17 Dec 2024 11:32:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DA1506B0093; Tue, 17 Dec 2024 11:32:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id BA70F6B008A for ; Tue, 17 Dec 2024 11:32:10 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 4BF6C14084C for ; Tue, 17 Dec 2024 16:32:10 +0000 (UTC) X-FDA: 82904992002.25.A55DB66 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf30.hostedemail.com (Postfix) with ESMTP id B97D88001C for ; Tue, 17 Dec 2024 16:31:09 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fvLblSz7; spf=pass (imf30.hostedemail.com: domain of luizcap@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=luizcap@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1734453114; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=7NUAQoNwo5XXzNDpj09lIN28JPTSdFaKuqaRHwfJFHA=; b=zx/EjgRcj/NgFvPkPwTwLxqBQ+naw4ZfCRk6zv5dv71obkdx0N4M9/otEhFr/DxKNKHRGr rtlDd9pJhP06aVRcQ2unhSvqfDePuzXIn9YtJ0fWSoTK1DSKaV+FqyI5WnePFp0GHcRhwp U9jP2O3FIQh+2/lG16kR19eTOU3ggEs= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fvLblSz7; spf=pass (imf30.hostedemail.com: domain of luizcap@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=luizcap@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1734453114; a=rsa-sha256; cv=none; b=S9H0YO9e7uHWhqvAS7TTOZRmiFDC1w8WlXiOgUH/5csG1zoHoRNdLKEfZ4wQ+uqXoSeNKP 4pINTbVk7/SVY6jEl0de6gU9oIZo2tYHFhVaM5NdP4OWohFeHob7GEIgrs63IyUMKaLgO9 KodF62XGaDpOy2w/IBWXdIYyVbDDdJc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734453127; 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=7NUAQoNwo5XXzNDpj09lIN28JPTSdFaKuqaRHwfJFHA=; b=fvLblSz7YsIF1At6UW0ErO4MBWWa4ytty+y4vsFGatCFBePjSoHtJqgYl5OxngbTaVuEzN yL9JsubZ5GY2OhuFxOJwsj3AqUGVApyFMQjTZA9keGi5bXpL/a/cuFo3jlrtGCGlJuMhYp HQNqRcEfhMJcwMy7ck8ovq7aHQUGgz0= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-592-NCpwGDC-NsGbWT0tUETwQA-1; Tue, 17 Dec 2024 11:32:04 -0500 X-MC-Unique: NCpwGDC-NsGbWT0tUETwQA-1 X-Mimecast-MFC-AGG-ID: NCpwGDC-NsGbWT0tUETwQA Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7876B195604F; Tue, 17 Dec 2024 16:32:02 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.22.65.20]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 91E8E300F9B9; Tue, 17 Dec 2024 16:32:00 +0000 (UTC) From: Luiz Capitulino To: linux-mm@kvack.org, mgorman@techsingularity.net, willy@infradead.org Cc: david@redhat.com, linux-kernel@vger.kernel.org, lcapitulino@gmail.com Subject: [PATCH 1/2] mm: alloc_pages_bulk_noprof: drop page_list argument Date: Tue, 17 Dec 2024 11:31:27 -0500 Message-ID: <4d3041315d1032e9acbe50971f952e716e8f4089.1734453061.git.luizcap@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Rspamd-Queue-Id: B97D88001C X-Stat-Signature: 78uxtxmdmzmm1exnwu3udtcyi7hpab45 X-Rspam-User: X-Rspamd-Server: rspam11 X-HE-Tag: 1734453069-442352 X-HE-Meta: U2FsdGVkX190kTVwY1/pb5Dvddkdz8BmlfNBB3476Zg4dpJ4MQWAtvJUGOjZligOPw4YFSMlkica1s7u5B0ghMTRMICjbI2Bju5Q2sDIzAGmbK7o/6QrTxrLGMYBehVVXWRoEMs/eYoq+I5G+3KPevD/ToHsajCrbcx86h5A1Z4M3fiLuYRVdkLu0BfqmoX0Ams6sAlJRJvVM0pUeQqfwFEvIahsnMazewy0yKgns7/pDYwEZtfbUtCM+RtAMuYU35p/rofuG35bbDh1XoOg6y83yhFfcagEujE/oK3BD+DRITzU+nLOD2bhJAFyDKqLLGu6e/v36JoNjLYy225sFnL8+EXTagWTq4yBQhDGA2jMSvEeCRefAwpjZ+Vf0BBH2BRsSlgLDA3y00FHR2e23e+l1Gqpa3+pgdTw0ur2OvoGKn8KOide2cVo6mAyB0YWj/fZphgtMSJNUl2gch7Sn/P6/lRygKKhRos9x3on7tbJrc2AtPYSIjempqLkGdkEDnpQIk7WGYovNweUKMSttberNNqB2n9HAZkUF/0ACFBdXHfayLWyVWPm69uvKgoDnls52C8Q+MFoANurgsgw2lMHMf8bKEDbdcoZ5nMxy7zjkmfLmNuedFSIdHm+P82MSSTR09zfGRWW+dqeWLf5XUgtgInW0RdK9cug5JsoTooE41qKv9raFvZfu6emM1BKSX6jC6iEb8tMb/97CuWwjvaKsxguabaMtQ7wS8XHDxB4IXMAVUVJbjD7UJpttXmigf7zpAP0yCZYbEdR6IIA7mLFfVwYayaq+qmhlG0ikocCri3bGLx1BrlWMJgVWKDK1PndrhvErGuFfYFPpRy2wfHm/XLjhleYUjCgK3vhm8nzcbTUsME+qFVYTav4bUHfachaq8h1vknZYJ5n0mP2KZN18efxJttQnnPwNuzqCD+g7aw+LPmtBDEaM5LF+55uDcRG4uy4pRHZggP4tmy wLUh6EzZ XfB7VI0T4WU0WCrnmJ3d5dHb5B7T302trdq7C6cXAPkxbyeEe09caONZwzBi6QQcserVh+M1C7LU5YClHW3Jhe/HRYkiKw1SJ8hpQqt355IAfz2bFVKiqkxZ6RvjHkrAABt358GV0tFX6a49guwq5Ks+HA+SXNuojpwSjOdXL+p+F6kGr7BWiPc46dWlYScO08lMjHdGG2YxDWIlS23AxDFUp2liAPzZxt8cG5PvXJGEibnO9Ag8Xh+9VtfPjzyWatd41lURLjsaeAoQBKtmVdczuL9wh1ZVoSmU545QB5p21i13/c+2xmDHrPZ886foKGX6a8aF/UR3rJ34mWs+hcnesFg76OqmMvFnS2LGi9OTeTVr1laWAgGxNLnLtRJ4W7MpKKPrwcGD5XeBp9AIOJnrutA== 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: List-Subscribe: List-Unsubscribe: The commit 387ba26fb1cb added __alloc_pages_bulk() along with the page_list argument. The next commit 0f87d9d30f21 added the array-based argument. As it turns out, the page_list argument has no users in the current tree (if it ever had any). Dropping it allows for a slight simplification and eliminates some unnecessary checks, now that page_array is required. Signed-off-by: Luiz Capitulino Acked-by: David Hildenbrand --- include/linux/gfp.h | 8 ++------ mm/mempolicy.c | 14 +++++++------- mm/page_alloc.c | 39 ++++++++++++--------------------------- 3 files changed, 21 insertions(+), 40 deletions(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index b0fe9f62d15b6..eebed36443b35 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -212,7 +212,6 @@ struct folio *__folio_alloc_noprof(gfp_t gfp, unsigned int order, int preferred_ unsigned long alloc_pages_bulk_noprof(gfp_t gfp, int preferred_nid, nodemask_t *nodemask, int nr_pages, - struct list_head *page_list, struct page **page_array); #define __alloc_pages_bulk(...) alloc_hooks(alloc_pages_bulk_noprof(__VA_ARGS__)) @@ -223,11 +222,8 @@ unsigned long alloc_pages_bulk_array_mempolicy_noprof(gfp_t gfp, alloc_hooks(alloc_pages_bulk_array_mempolicy_noprof(__VA_ARGS__)) /* Bulk allocate order-0 pages */ -#define alloc_pages_bulk_list(_gfp, _nr_pages, _list) \ - __alloc_pages_bulk(_gfp, numa_mem_id(), NULL, _nr_pages, _list, NULL) - #define alloc_pages_bulk_array(_gfp, _nr_pages, _page_array) \ - __alloc_pages_bulk(_gfp, numa_mem_id(), NULL, _nr_pages, NULL, _page_array) + __alloc_pages_bulk(_gfp, numa_mem_id(), NULL, _nr_pages, _page_array) static inline unsigned long alloc_pages_bulk_array_node_noprof(gfp_t gfp, int nid, unsigned long nr_pages, @@ -236,7 +232,7 @@ alloc_pages_bulk_array_node_noprof(gfp_t gfp, int nid, unsigned long nr_pages, if (nid == NUMA_NO_NODE) nid = numa_mem_id(); - return alloc_pages_bulk_noprof(gfp, nid, NULL, nr_pages, NULL, page_array); + return alloc_pages_bulk_noprof(gfp, nid, NULL, nr_pages, page_array); } #define alloc_pages_bulk_array_node(...) \ diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 04f35659717ae..42a7b07ccc15a 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -2375,13 +2375,13 @@ static unsigned long alloc_pages_bulk_array_interleave(gfp_t gfp, if (delta) { nr_allocated = alloc_pages_bulk_noprof(gfp, interleave_nodes(pol), NULL, - nr_pages_per_node + 1, NULL, + nr_pages_per_node + 1, page_array); delta--; } else { nr_allocated = alloc_pages_bulk_noprof(gfp, interleave_nodes(pol), NULL, - nr_pages_per_node, NULL, page_array); + nr_pages_per_node, page_array); } page_array += nr_allocated; @@ -2430,7 +2430,7 @@ static unsigned long alloc_pages_bulk_array_weighted_interleave(gfp_t gfp, if (weight && node_isset(node, nodes)) { node_pages = min(rem_pages, weight); nr_allocated = __alloc_pages_bulk(gfp, node, NULL, node_pages, - NULL, page_array); + page_array); page_array += nr_allocated; total_allocated += nr_allocated; /* if that's all the pages, no need to interleave */ @@ -2493,7 +2493,7 @@ static unsigned long alloc_pages_bulk_array_weighted_interleave(gfp_t gfp, if (!node_pages) break; nr_allocated = __alloc_pages_bulk(gfp, node, NULL, node_pages, - NULL, page_array); + page_array); page_array += nr_allocated; total_allocated += nr_allocated; if (total_allocated == nr_pages) @@ -2517,11 +2517,11 @@ static unsigned long alloc_pages_bulk_array_preferred_many(gfp_t gfp, int nid, preferred_gfp &= ~(__GFP_DIRECT_RECLAIM | __GFP_NOFAIL); nr_allocated = alloc_pages_bulk_noprof(preferred_gfp, nid, &pol->nodes, - nr_pages, NULL, page_array); + nr_pages, page_array); if (nr_allocated < nr_pages) nr_allocated += alloc_pages_bulk_noprof(gfp, numa_node_id(), NULL, - nr_pages - nr_allocated, NULL, + nr_pages - nr_allocated, page_array + nr_allocated); return nr_allocated; } @@ -2557,7 +2557,7 @@ unsigned long alloc_pages_bulk_array_mempolicy_noprof(gfp_t gfp, nid = numa_node_id(); nodemask = policy_nodemask(gfp, pol, NO_INTERLEAVE_INDEX, &nid); return alloc_pages_bulk_noprof(gfp, nid, nodemask, - nr_pages, NULL, page_array); + nr_pages, page_array); } int vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 1cb4b8c8886d8..3ef6d902e2fea 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -4529,28 +4529,23 @@ static inline bool prepare_alloc_pages(gfp_t gfp_mask, unsigned int order, } /* - * __alloc_pages_bulk - Allocate a number of order-0 pages to a list or array + * __alloc_pages_bulk - Allocate a number of order-0 pages to an array * @gfp: GFP flags for the allocation * @preferred_nid: The preferred NUMA node ID to allocate from * @nodemask: Set of nodes to allocate from, may be NULL - * @nr_pages: The number of pages desired on the list or array - * @page_list: Optional list to store the allocated pages - * @page_array: Optional array to store the pages + * @nr_pages: The number of pages desired in the array + * @page_array: Array to store the pages * * This is a batched version of the page allocator that attempts to - * allocate nr_pages quickly. Pages are added to page_list if page_list - * is not NULL, otherwise it is assumed that the page_array is valid. + * allocate nr_pages quickly. Pages are added to the page_array. * - * For lists, nr_pages is the number of pages that should be allocated. - * - * For arrays, only NULL elements are populated with pages and nr_pages + * Note that only NULL elements are populated with pages and nr_pages * is the maximum number of pages that will be stored in the array. * - * Returns the number of pages on the list or array. + * Returns the number of pages in the array. */ unsigned long alloc_pages_bulk_noprof(gfp_t gfp, int preferred_nid, nodemask_t *nodemask, int nr_pages, - struct list_head *page_list, struct page **page_array) { struct page *page; @@ -4568,7 +4563,7 @@ unsigned long alloc_pages_bulk_noprof(gfp_t gfp, int preferred_nid, * Skip populated array elements to determine if any pages need * to be allocated before disabling IRQs. */ - while (page_array && nr_populated < nr_pages && page_array[nr_populated]) + while (nr_populated < nr_pages && page_array[nr_populated]) nr_populated++; /* No pages requested? */ @@ -4576,7 +4571,7 @@ unsigned long alloc_pages_bulk_noprof(gfp_t gfp, int preferred_nid, goto out; /* Already populated array? */ - if (unlikely(page_array && nr_pages - nr_populated == 0)) + if (unlikely(nr_pages - nr_populated == 0)) goto out; /* Bulk allocator does not support memcg accounting. */ @@ -4658,7 +4653,7 @@ unsigned long alloc_pages_bulk_noprof(gfp_t gfp, int preferred_nid, while (nr_populated < nr_pages) { /* Skip existing pages */ - if (page_array && page_array[nr_populated]) { + if (page_array[nr_populated]) { nr_populated++; continue; } @@ -4676,11 +4671,7 @@ unsigned long alloc_pages_bulk_noprof(gfp_t gfp, int preferred_nid, nr_account++; prep_new_page(page, 0, gfp, 0); - if (page_list) - list_add(&page->lru, page_list); - else - page_array[nr_populated] = page; - nr_populated++; + page_array[nr_populated++] = page; } pcp_spin_unlock(pcp); @@ -4697,14 +4688,8 @@ unsigned long alloc_pages_bulk_noprof(gfp_t gfp, int preferred_nid, failed: page = __alloc_pages_noprof(gfp, 0, preferred_nid, nodemask); - if (page) { - if (page_list) - list_add(&page->lru, page_list); - else - page_array[nr_populated] = page; - nr_populated++; - } - + if (page) + page_array[nr_populated++] = page; goto out; } EXPORT_SYMBOL_GPL(alloc_pages_bulk_noprof);