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 25CB3C25B0C for ; Tue, 9 Aug 2022 17:25:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8BC848E0003; Tue, 9 Aug 2022 13:25:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 869238E0001; Tue, 9 Aug 2022 13:25:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 730A18E0003; Tue, 9 Aug 2022 13:25:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 5337C8E0001 for ; Tue, 9 Aug 2022 13:25:44 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 22B90AB7AA for ; Tue, 9 Aug 2022 17:25:44 +0000 (UTC) X-FDA: 79780731408.22.35348A7 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf07.hostedemail.com (Postfix) with ESMTP id 931B84016F for ; Tue, 9 Aug 2022 17:25:43 +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=c3f049yogUA2811FNCEzLRrsfYegp/x8MSYGuMt5U7s=; b=OKWqfq0aDPQQcfvq9EimI3VnTf sKosR4jNUR1uqwzg4hn2LWJqEGhnEt8vvfE2MbLgmKPQPoxTqwNHzUdGJ9OrVmpnV/oDyQLAKgqOs 4Q8pApmII9hGf6LE1pnoN8tBhAnVeLH3LQr78G4u95XTIMnfRnRt7OfRuP5G6qfXhlWaXTbi2uOV8 Ib6TygmaRUBq1q6Q/YVZRyARJ8Z8aMcQyRWOP9Vn/lUpmKYx1GBkADBDa/ePb12dF1PiX+kj5qTaf Utd82KngFqd4+9RSUC9zOAZUZT/SfrsEAKbW6lAOQzs6vSeQeZQBY6viDmpWcIdFAGWzQF1a+vALB 789mXx9Q==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oLSsd-00FdFP-Md; Tue, 09 Aug 2022 17:18:59 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH v2 10/16] mm/page_alloc: Move set_page_refcounted() to callers of __alloc_pages_direct_reclaim() Date: Tue, 9 Aug 2022 18:18:48 +0100 Message-Id: <20220809171854.3725722-11-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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660065943; 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=c3f049yogUA2811FNCEzLRrsfYegp/x8MSYGuMt5U7s=; b=i3ajjY2uJdcnredcOF4ZCoAzTN1EFx5uhev5IUS7IEXYvhpSK7JR0iiCbH6Broh9Aglupj byzssqK0TIKHtvdZ1tFXt7fNNRX9nP69U0X2mspirgV9anhfaVSeksHHZsoakVBGlYH2Mv sbxRa1rz+OKKs0NJj3ayMHh3E9FpNmg= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=OKWqfq0a; dmarc=none; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660065943; a=rsa-sha256; cv=none; b=7YOkncEUAfoB8sVLx32mjETon5WRjDF72utR8u+USnfxoz0e1Yf9rG3mlS9CdeP4yX703v Nr1ac70Yf3XNV5Jxs1T1R6HKuuQgnPAxGMWP5TOtx3jyt2M+I2JaKpgDJZLhTgRI3vO/m9 S31xoA3KGDwns1W6lvcH9IlwCtnn6jA= Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=OKWqfq0a; dmarc=none; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspamd-Server: rspam02 X-Stat-Signature: yw5xs6mbcp3fazz56d1odep4pg9myu6y X-Rspamd-Queue-Id: 931B84016F X-Rspam-User: X-HE-Tag: 1660065943-691542 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_reclaim(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/page_alloc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 555409f04d49..7c306231b336 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -4762,7 +4762,6 @@ __alloc_pages_direct_reclaim(gfp_t gfp_mask, unsigned int order, drained = true; goto retry; } - set_page_refcounted(page); out: psi_memstall_leave(&pflags); @@ -5156,8 +5155,10 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, /* Try direct reclaim and then allocating */ page = __alloc_pages_direct_reclaim(gfp_mask, order, alloc_flags, ac, &did_some_progress); - if (page) + if (page) { + set_page_refcounted(page); goto got_pg; + } /* Try direct compaction and then allocating */ page = __alloc_pages_direct_compact(gfp_mask, order, alloc_flags, ac, -- 2.35.1