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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91FD5C19F2D for ; Tue, 9 Aug 2022 17:19:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D1FF18E0010; Tue, 9 Aug 2022 13:19:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 386988E0011; Tue, 9 Aug 2022 13:19:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DA4058E000F; Tue, 9 Aug 2022 13:19:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 811668E0002 for ; Tue, 9 Aug 2022 13:19:02 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 671321A0466 for ; Tue, 9 Aug 2022 17:19:02 +0000 (UTC) X-FDA: 79780714524.06.13AFE3C Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf14.hostedemail.com (Postfix) with ESMTP id 5C87710009C for ; Tue, 9 Aug 2022 17:19:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=GYdJHf+FyjakrabPCiGAD802+uYJGJxziNBED91rots=; b=Ynshf0xZvS9ISz3Kg1i37t9BVI jyhMTPZkhHATm+2ZRRrN+GwJPstHFfeOxDNGEelTTUrw/UorZUNARwbMsmJFKbB1OuvWQ1w8Yzr7a fi+1T5kxgQml1Ani5MdcOh+8m2EzdNkwOvpSpVRi7EhqTCcov58WEtT0BIYkf2eQQA7cMdnIqZQtF SlBgLWZZswk/aVvs42NTZ1AS4FxjgEcYAiNfpfa1vj3Jd3UsZWzadIT0Of+Hmcuxxrus8Na7ccyaT GLMHHeHshZvmP0AxDU2+FLgaXdPi6njjP541h2m2vCBmLJr5/mLNnQ1UXAN7MS4CW1qnQISs2V5VW Qp533+UQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oLSse-00FdFg-2q; Tue, 09 Aug 2022 17:19:00 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH v2 13/16] mm/page_alloc: Add __alloc_frozen_pages() Date: Tue, 9 Aug 2022 18:18:51 +0100 Message-Id: <20220809171854.3725722-14-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220809171854.3725722-1-willy@infradead.org> References: <20220809171854.3725722-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660065542; a=rsa-sha256; cv=none; b=Ani76P16QLokWHntQkdAALSELz4plKb5oKbUKzSeY4AIINpmRsrx84Z5TOwbCe88S/oit9 HdlwuseWpqquidm1/z/pstpI/fE99F5MQcRagSEptet2ZLjEbLNtg0/FULdxi973mq0l8E R28YX+WNIrezyPvKXiMxj3wDx6577Aw= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Ynshf0xZ; spf=none (imf14.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660065542; 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=GYdJHf+FyjakrabPCiGAD802+uYJGJxziNBED91rots=; b=p4wI4K8IJP0Fj5Fa7aBU6zc35GqsgdRp0gRNhQtZfPkZXTw6RxsxojV4nW//Rw3zaLJpdi 4ZAVrjKTlmntGl+IPKJrFiAYjh/fRm+uCatK6ihdX9O+nsfkoGpArJd9CtTOM8yuRkeyeW 9QUSGLq0XNYxClTaoCS0+6a/nHYb678= X-Rspamd-Server: rspam06 X-Rspam-User: X-Stat-Signature: ptwfqs18z6btze5mzga9o33i5ptjx5dy X-Rspamd-Queue-Id: 5C87710009C Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Ynshf0xZ; spf=none (imf14.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-HE-Tag: 1660065541-944543 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: Defer the initialisation of the page refcount to the new __alloc_pages() wrapper and turn the old __alloc_pages() into __alloc_frozen_pages(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/internal.h | 2 ++ mm/page_alloc.c | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 08d0881223cf..7e6079216a17 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -362,6 +362,8 @@ extern void post_alloc_hook(struct page *page, unsigned int order, gfp_t gfp_flags); extern int user_min_free_kbytes; +struct page *__alloc_frozen_pages(gfp_t, unsigned int order, int nid, + nodemask_t *); void free_frozen_pages(struct page *, unsigned int order); void free_unref_page_list(struct list_head *list); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index f1b7fc657c74..359a92113152 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5476,8 +5476,8 @@ EXPORT_SYMBOL_GPL(__alloc_pages_bulk); /* * This is the 'heart' of the zoned buddy allocator. */ -struct page *__alloc_pages(gfp_t gfp, unsigned int order, int preferred_nid, - nodemask_t *nodemask) +struct page *__alloc_frozen_pages(gfp_t gfp, unsigned int order, + int preferred_nid, nodemask_t *nodemask) { struct page *page; unsigned int alloc_flags = ALLOC_WMARK_LOW; @@ -5533,13 +5533,22 @@ struct page *__alloc_pages(gfp_t gfp, unsigned int order, int preferred_nid, free_frozen_pages(page, order); page = NULL; } - if (page) - set_page_refcounted(page); trace_mm_page_alloc(page, order, alloc_gfp, ac.migratetype); return page; } + +struct page *__alloc_pages(gfp_t gfp, unsigned int order, int preferred_nid, + nodemask_t *nodemask) +{ + struct page *page; + + page = __alloc_frozen_pages(gfp, order, preferred_nid, nodemask); + if (page) + set_page_refcounted(page); + return page; +} EXPORT_SYMBOL(__alloc_pages); struct folio *__folio_alloc(gfp_t gfp, unsigned int order, int preferred_nid, -- 2.35.1