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 DB740C25B0C for ; Tue, 9 Aug 2022 17:19:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CD20D8E0009; Tue, 9 Aug 2022 13:19:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B4EB38E000C; Tue, 9 Aug 2022 13:19:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7A4608E0005; Tue, 9 Aug 2022 13:19:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 542E18E0005 for ; Tue, 9 Aug 2022 13:19:02 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 326231A112C for ; Tue, 9 Aug 2022 17:19:02 +0000 (UTC) X-FDA: 79780714524.09.B85996D Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf09.hostedemail.com (Postfix) with ESMTP id 03918140184 for ; Tue, 9 Aug 2022 17:19:00 +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=nOJf/cG0X/ep4z8GVny+whYO3b0PQeCXpId4P36xPhc=; b=q+QsQquTjcm4etbVuDuct0D43t D8XS8OpeGO0erblzyDSwv/Dm1403DcnmRMoMCwBczU73gnZHruwOZkmYxRlzyd26gWWmNsgxpA+qp T89TfSBWPbgC26ybtoVC0wEzDA41huzimfU6lKEMw5UpSKNg8to+flT1HWFH/n0O5FfmZkCFi+OOF 91x46rnrPOB0eX5KoI4HQDz2gpklXJQx2uwcf8PcaefDok4rtp1Bo9qQjIrWOGpunYfi+9XiXqkez Gv/2DeAae+lJ0S+vejeFVTq4OXRXYHRxTI2feR3MeZsozTaUrH+1xwUb+Ipal0nL6MquxrDoNwZ+X EgGJXEWw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oLSsd-00FdFK-IX; Tue, 09 Aug 2022 17:18:59 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH v2 09/16] mm/page_alloc: Move set_page_refcounted() to callers of __alloc_pages_direct_compact() Date: Tue, 9 Aug 2022 18:18:47 +0100 Message-Id: <20220809171854.3725722-10-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=1660065541; a=rsa-sha256; cv=none; b=eTuKa6iIqbB13wJjnTLbu6izp2DBM+fq83ZtDvi+ac+vvQuXrJteIfW4OcrzYUO5kWTfFW TZycdho39QegzfLIY4vdkZV7EX2TVT1yowZlknW7PwlOkySng/wwdJGlVwfoZTl5RGkJgI Tfoz1yPStxvV8tLFFbB9enESV77by94= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=q+QsQquT; spf=none (imf09.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=1660065541; 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=nOJf/cG0X/ep4z8GVny+whYO3b0PQeCXpId4P36xPhc=; b=rgSOBHNkb7XbFSjlSVJfZ6f8LFKWb7ILyAfrKHfr0N7NRK095hN2eYVqeSRWjfX3g8dYbX 4BPM262R4FPwu6PQmsGOVFm6K3B9563ZQlCdkchfjBx3x+SqUOf5dbHglfcPRLr1zC1sxw EUsvy5xs9IJfh0zZvDv5rYHZVlls7zM= X-Rspamd-Server: rspam06 X-Rspam-User: X-Stat-Signature: ggtw57i9ab9imfuycgpb4f8rw9oxjhp1 X-Rspamd-Queue-Id: 03918140184 Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=q+QsQquT; spf=none (imf09.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: 1660065540-14984 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: In preparation for allocating frozen pages, stop initialising the page refcount in __alloc_pages_direct_compact(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/page_alloc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 8222cc6ce7dd..555409f04d49 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -4513,7 +4513,6 @@ __alloc_pages_direct_compact(gfp_t gfp_mask, unsigned int order, if (page) { struct zone *zone = page_zone(page); - set_page_refcounted(page); zone->compact_blockskip_flush = false; compaction_defer_reset(zone, order, true); count_vm_event(COMPACTSUCCESS); @@ -5079,8 +5078,10 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, alloc_flags, ac, INIT_COMPACT_PRIORITY, &compact_result); - if (page) + if (page) { + set_page_refcounted(page); goto got_pg; + } /* * Checks for costly allocations with __GFP_NORETRY, which @@ -5161,8 +5162,10 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, /* Try direct compaction and then allocating */ page = __alloc_pages_direct_compact(gfp_mask, order, alloc_flags, ac, compact_priority, &compact_result); - if (page) + if (page) { + set_page_refcounted(page); goto got_pg; + } /* Do not loop if specifically requested */ if (gfp_mask & __GFP_NORETRY) -- 2.35.1